From: Jacek Konieczny Date: Mon, 3 Mar 2003 16:35:43 +0000 (+0000) Subject: - outdated X-Git-Tag: auto/ac/crossfire-1_5_0-2~19 X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcrossfire.git;a=commitdiff_plain;h=62543582ea0bbd387d1d4aab4774d00d47323e0e - outdated Changed files: crossfire-DESTDIR.patch -> 1.4 crossfire-directories.patch -> 1.5 crossfire-python.patch -> 1.2 crossfire-tmp_maps.patch -> 1.2 --- diff --git a/crossfire-DESTDIR.patch b/crossfire-DESTDIR.patch deleted file mode 100644 index adbcc04..0000000 --- a/crossfire-DESTDIR.patch +++ /dev/null @@ -1,212 +0,0 @@ ---- crossfire-1.3.0/random_maps/Makefile.in.wiget Tue Jul 2 01:18:12 2002 -+++ crossfire-1.3.0/random_maps/Makefile.in Mon Jul 8 21:19:04 2002 -@@ -125,10 +125,10 @@ - @echo $(SRCS) > .patchlist - - install:: random_map -- @if [ ! -d ${bindir} ]; then \ -- $(MKDIR) -p ${bindir}; \ -+ @if [ ! -d $(DESTDIR)${bindir} ]; then \ -+ $(MKDIR) -p $(DESTDIR)${bindir}; \ - fi -- $(INSTALL) random_map ${bindir}/random_map -+ $(INSTALL) random_map $(DESTDIR)${bindir}/random_map - - - ---- crossfire-1.3.0/server/Makefile.in.wiget Tue Jul 2 01:18:12 2002 -+++ crossfire-1.3.0/server/Makefile.in Mon Jul 8 21:19:04 2002 -@@ -139,7 +139,7 @@ - @echo $(SRCS) > .patchlist - - install:: crossfire -- @if [ ! -d ${bindir} ]; then \ -- $(MKDIR) -p ${bindir}; \ -+ @if [ ! -d $(DESTDIR)${bindir} ]; then \ -+ $(MKDIR) -p $(DESTDIR)${bindir}; \ - fi -- $(INSTALL) crossfire ${bindir}/crossfire -+ $(INSTALL) crossfire $(DESTDIR)${bindir}/crossfire ---- crossfire-1.3.0/lib/Makefile.in.wiget Tue Jul 2 01:18:12 2002 -+++ crossfire-1.3.0/lib/Makefile.in Mon Jul 8 21:25:19 2002 -@@ -131,58 +131,58 @@ - make collect - - install:: archetypes bmaps.paths crossfire.0 faces animations collect.pl util.pl -- @if [ ! -d $(datadir) ]; then \ -- $(MKDIR) -p $(datadir); \ -+ @if [ ! -d $(DESTDIR)$(datadir) ]; then \ -+ $(MKDIR) -p $(DESTDIR)$(datadir); \ - fi -- @if [ ! -d $(localdir) ]; then \ -- $(MKDIR) -p $(localdir); \ -+ @if [ ! -d $(DESTDIR)$(localdir) ]; then \ -+ $(MKDIR) -p $(DESTDIR)$(localdir); \ - fi - -- @if [ ! -d $(datadir)/help ]; then \ -- echo "Creating directory $(datadir)/help"; \ -- $(MKDIR) -p $(datadir)/help; \ -+ @if [ ! -d $(DESTDIR)$(datadir)/help ]; then \ -+ echo "Creating directory $(DESTDIR)$(datadir)/help"; \ -+ $(MKDIR) -p $(DESTDIR)$(datadir)/help; \ - fi; - @for i in $(FILES_HELP); do \ - echo "Installing $$i"; \ -- $(INSTALL) $(INSTALLFLAGS) $$i $(datadir)/help; \ -+ $(INSTALL) $(INSTALLFLAGS) $$i $(DESTDIR)$(datadir)/help; \ - done -- @if [ ! -d $(datadir)/wizhelp ]; then \ -- echo "Creating directory $(datadir)/wizhelp"; \ -- $(MKDIR) -p $(datadir)/wizhelp; \ -+ @if [ ! -d $(DESTDIR)$(datadir)/wizhelp ]; then \ -+ echo "Creating directory $(DESTDIR)$(datadir)/wizhelp"; \ -+ $(MKDIR) -p $(DESTDIR)$(datadir)/wizhelp; \ - fi; - @for i in $(FILES_WIZHELP); do \ - echo "Installing $$i"; \ -- $(INSTALL) $(INSTALLFLAGS) $$i $(datadir)/wizhelp; \ -+ $(INSTALL) $(INSTALLFLAGS) $$i $(DESTDIR)$(datadir)/wizhelp; \ - done - @for i in $(INSTALLFILES); do \ - echo "Installing $$i"; \ -- $(INSTALL) $(INSTALLFLAGS) $$i $(datadir); \ -+ $(INSTALL) $(INSTALLFLAGS) $$i $(DESTDIR)$(datadir); \ - done - - @for i in $(BININSTALL); do \ - echo "Installing $$i"; \ -- $(INSTALL) $(INSTALLFLAGS) $$i $(bindir); \ -+ $(INSTALL) $(INSTALLFLAGS) $$i $(DESTDIR)$(bindir); \ - done - -- @if [ ! -f $(datadir)/settings ]; then \ -- $(INSTALL) $(INSTALLFLAGS) settings $(datadir); \ -+ @if [ ! -f $(DESTDIR)$(datadir)/settings ]; then \ -+ $(INSTALL) $(INSTALLFLAGS) settings $(DESTDIR)$(datadir); \ - fi - - @for i in $(INSTALLNEWFILES); do \ -- if [ ! -f $(datadir)/$$i ]; then \ -+ if [ ! -f $(DESTDIR)$(datadir)/$$i ]; then \ - echo "Installing $$i"; \ -- $(INSTALL) $(INSTALLFLAGS) $$i $(datadir); \ -+ $(INSTALL) $(INSTALLFLAGS) $$i $(DESTDIR)$(datadir); \ - fi \ - done - -- touch $(localdir)/highscore -- touch $(localdir)/bookarch -- touch $(localdir)/temp.maps -+ touch $(DESTDIR)$(localdir)/highscore -+ touch $(DESTDIR)$(localdir)/bookarch -+ touch $(DESTDIR)$(localdir)/temp.maps - - @for i in players unique-items; do \ -- if [ ! -d $(localdir)/$$i ]; then \ -- echo "Creating directory $(localdir)/$$i"; \ -- $(MKDIR) -p $(localdir)/$$i; \ -+ if [ ! -d $(DESTDIR)$(localdir)/$$i ]; then \ -+ echo "Creating directory $(DESTDIR)$(localdir)/$$i"; \ -+ $(MKDIR) -p $(DESTDIR)$(localdir)/$$i; \ - fi; \ - done - ---- crossfire-1.3.0/utils/Makefile.in.wiget Tue Jul 2 01:18:21 2002 -+++ crossfire-1.3.0/utils/Makefile.in Mon Jul 8 21:27:34 2002 -@@ -20,22 +20,22 @@ - $(DEPEND) $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- $(SRCS) - - install: -- @if [ ! -d $(bindir) ]; then \ -- $(MKDIR) -p $(bindir); \ -+ @if [ ! -d $(DESTDIR)$(bindir) ]; then \ -+ $(MKDIR) -p $(DESTDIR)$(bindir); \ - fi -- rm -f $(bindir)/flushlocks -- sed s%xxxx%$(libdir)%g $(bindir)/flushlocks -- chmod 755 $(bindir)/flushlocks -- rm -f $(bindir)/crossloop.pl -- sed s%BINDIR%$(bindir)%g $(bindir)/crossloop.pl -- chmod 755 $(bindir)/crossloop.pl -- rm -f $(bindir)/crossloop -- sed s%BINDIR%$(bindir)%g $(bindir)/crossloop -- chmod 755 $(bindir)/crossloop -- $(INSTALL) $(INSTALLFLAGS) mktable.script $(bindir)/mktable -- $(INSTALL) $(INSTALLFLAGS) add_throw.perl $(bindir)/add_throw -- @if [ ! -f $(bindir)/crossloop.web ]; then \ -- $(INSTALL) $(INSTALLFLAGS) crossloop.web $(bindir)/crossloop.web; \ -+ rm -f $(DESTDIR)$(bindir)/flushlocks -+ sed s%xxxx%$(libdir)%g $(DESTDIR)$(bindir)/flushlocks -+ chmod 755 $(DESTDIR)$(bindir)/flushlocks -+ rm -f $(DESTDIR)$(bindir)/crossloop.pl -+ sed s%BINDIR%$(bindir)%g $(DESTDIR)$(bindir)/crossloop.pl -+ chmod 755 $(DESTDIR)$(bindir)/crossloop.pl -+ rm -f $(DESTDIR)$(bindir)/crossloop -+ sed s%BINDIR%$(bindir)%g $(DESTDIR)$(bindir)/crossloop -+ chmod 755 $(DESTDIR)$(bindir)/crossloop -+ $(INSTALL) $(INSTALLFLAGS) mktable.script $(DESTDIR)$(bindir)/mktable -+ $(INSTALL) $(INSTALLFLAGS) add_throw.perl $(DESTDIR)$(bindir)/add_throw -+ @if [ ! -f $(DESTDIR)$(bindir)/crossloop.web ]; then \ -+ $(INSTALL) $(INSTALLFLAGS) crossloop.web $(DESTDIR)$(bindir)/crossloop.web; \ - fi - - depend:: ---- crossfire-1.3.0/doc/Makefile.in.wiget Tue Jul 2 01:18:21 2002 -+++ crossfire-1.3.0/doc/Makefile.in Mon Jul 8 21:19:04 2002 -@@ -106,8 +106,8 @@ - $(RM) -rf $(DTOP) - - install:: -- @if [ ! -d $(MAN1) ]; then \ -- $(MKDIR) -p $(MAN1); \ -+ @if [ ! -d $(DESTDIR)$(MAN1) ]; then \ -+ $(MKDIR) -p $(DESTDIR)$(MAN1); \ - fi -- $(INSTALL) $(srcdir)/crossedit.man $(MAN1)/crossedit.$(MANSUFFIX) -- $(INSTALL) $(srcdir)/crossfire.man $(MAN1)/crossfire.$(MANSUFFIX) -+ $(INSTALL) $(srcdir)/crossedit.man $(DESTDIR)$(MAN1)/crossedit.$(MANSUFFIX) -+ $(INSTALL) $(srcdir)/crossfire.man $(DESTDIR)$(MAN1)/crossfire.$(MANSUFFIX) ---- crossfire-1.3.0/crossedit/Makefile.in.wiget Tue Jul 2 01:18:22 2002 -+++ crossfire-1.3.0/crossedit/Makefile.in Mon Jul 8 21:19:04 2002 -@@ -150,7 +150,7 @@ - - - install:: crossedit -- @if [ ! -d ${bindir} ]; then \ -- $(MKDIR) -p ${bindir}; \ -+ @if [ ! -d $(DESTDIR)${bindir} ]; then \ -+ $(MKDIR) -p $(DESTDIR)${bindir}; \ - fi -- $(INSTALL) crossedit ${bindir}/crossedit -+ $(INSTALL) crossedit $(DESTDIR)${bindir}/crossedit ---- crossfire-1.3.0/Makefile.in.wiget Tue Jul 2 01:18:12 2002 -+++ crossfire-1.3.0/Makefile.in Mon Jul 8 21:19:04 2002 -@@ -124,7 +124,7 @@ - - install:: - @if [ ! -d ${prefix} ]; then \ -- $(MKDIR) -p ${prefix}; \ -+ $(MKDIR) -p $(DESTDIR)${prefix}; \ - fi - @for dir in $(SUBDIRS); \ - do \ ---- crossfire-1.3.0/plugin/Makefile.in.destdir Mon Jul 8 21:43:03 2002 -+++ crossfire-1.3.0/plugin/Makefile.in Mon Jul 8 21:44:19 2002 -@@ -65,12 +65,12 @@ - # as such, if plugin target is set, then we install, otherwise - # we don't do anything. - install: -- @if [ ! -d $(CROSSFIRE_PATH)/plugins ]; then \ -- echo "Creating directory $(CROSSFIRE_PATH)/plugins"; \ -- $(MKDIR) -p $(CROSSFIRE_PATH)/plugins; \ -+ @if [ ! -d $(DESTDIR)$(CROSSFIRE_PATH)/plugins ]; then \ -+ echo "Creating directory $(DESTDIR)$(CROSSFIRE_PATH)/plugins"; \ -+ $(MKDIR) -p $(DESTDIR)$(CROSSFIRE_PATH)/plugins; \ - fi - @if [ "X$(PLUGIN_TARGET)" != "X" ]; then \ -- $(INSTALL) plugin_python.so.0.1 $(CROSSFIRE_PATH)/plugins; \ -+ $(INSTALL) plugin_python.so.0.1 $(DESTDIR)$(CROSSFIRE_PATH)/plugins; \ - fi - - plugin_python.so.0.1: $(OBJS) ../common/libcross.a diff --git a/crossfire-directories.patch b/crossfire-directories.patch deleted file mode 100644 index b7a509b..0000000 --- a/crossfire-directories.patch +++ /dev/null @@ -1,111 +0,0 @@ -diff -durN crossfire-1.1.0.orig/include/config.h crossfire-1.1.0/include/config.h ---- crossfire-1.1.0.orig/include/config.h Wed Mar 20 07:36:53 2002 -+++ crossfire-1.1.0/include/config.h Fri Mar 22 13:23:04 2002 -@@ -654,7 +654,7 @@ - #ifdef WIN32 /* change define path */ - #define LOGFILE "tmp\\cross.log" - #else --#define LOGFILE "/tmp/cross.log" -+#define LOGFILE "/var/log/crossfire" - #endif - #endif - -@@ -821,7 +821,7 @@ - #ifdef WIN32 /* change define path tmp */ - #define TMPDIR "tmp" - #else --#define TMPDIR "/tmp" -+#define TMPDIR "/var/lib/crossfire/tmp" - #endif - - -diff -durN crossfire-1.1.0.orig/server/ban.c crossfire-1.1.0/server/ban.c ---- crossfire-1.1.0.orig/server/ban.c Wed Mar 20 07:36:53 2002 -+++ crossfire-1.1.0/server/ban.c Fri Mar 22 13:23:04 2002 -@@ -34,7 +34,7 @@ - int num1; - int Hits=0; /* Hits==2 means we're banned */ - -- sprintf (buf, "%s/%s", settings.datadir, BANFILE); -+ sprintf (buf, "%s/%s", "/etc/crossfire", BANFILE); - if ((bannedfile = fopen(buf, "r")) == NULL) { - LOG (llevDebug, "Could not find file Banned file.\n"); - return(0); -diff -durN crossfire-1.1.0.orig/server/c_wiz.c crossfire-1.1.0/server/c_wiz.c ---- crossfire-1.1.0.orig/server/c_wiz.c Wed Mar 20 07:36:53 2002 -+++ crossfire-1.1.0/server/c_wiz.c Fri Mar 22 13:23:04 2002 -@@ -889,7 +889,7 @@ - *pl_name=op->name?op->name:"*"; - #endif - -- sprintf (buf, "%s/%s", settings.datadir, DMFILE); -+ sprintf (buf, "%s/%s", "/etc/crossfire", DMFILE); - if ((dmfile = fopen(buf, "r")) == NULL) { - LOG (llevDebug, "Could not find DM file.\n"); - return(0); -diff -durN crossfire-1.1.0.orig/server/init.c crossfire-1.1.0/server/init.c ---- crossfire-1.1.0.orig/server/init.c Wed Mar 20 07:36:53 2002 -+++ crossfire-1.1.0/server/init.c Fri Mar 22 13:23:04 2002 -@@ -225,7 +225,7 @@ - int has_val,comp; - FILE *fp; - -- sprintf(buf,"%s/settings",settings.datadir); -+ sprintf(buf,"%s/settings","/etc/crossfire"); - /* We don't require a settings file at current time, but down the road, - * there will probably be so many values that not having a settings file - * will not be a good thing. -@@ -504,7 +504,7 @@ - int comp; - - #ifdef SHUTDOWN_FILE -- sprintf(buf,"%s/%s",settings.datadir,SHUTDOWN_FILE); -+ sprintf(buf,"%s/%s","/etc/crossfire",SHUTDOWN_FILE); - if ((fp = open_and_uncompress(buf, 0, &comp)) != NULL) { - while (fgets(buf, MAX_BUF-1, fp) != NULL) - printf("%s", buf); -@@ -558,10 +558,10 @@ - printf("Datadir:\t\t%s\n",settings.datadir); - printf("Localdir:\t\t%s\n",settings.localdir); - #ifdef PERM_FILE -- printf("Perm file:\t/%s\n",PERM_FILE); -+ printf("Perm file:\t/etc/crossfire/%s\n",PERM_FILE); - #endif - #ifdef SHUTDOWN_FILE -- printf("Shutdown file:\t/%s\n",SHUTDOWN_FILE); -+ printf("Shutdown file:\t/etc/crossfire/%s\n",SHUTDOWN_FILE); - #endif - printf("Save player:\t\n"); - printf("Save mode:\t%4.4o\n",SAVE_MODE); -diff -durN crossfire-1.1.0.orig/server/main.c crossfire-1.1.0/server/main.c ---- crossfire-1.1.0.orig/server/main.c Wed Mar 20 07:36:53 2002 -+++ crossfire-1.1.0/server/main.c Fri Mar 22 13:23:43 2002 -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - #ifdef HAVE_DES_H - #include -@@ -1043,7 +1044,7 @@ - clock = time (NULL); - tm = (struct tm *) localtime (&clock); - -- sprintf (buf, "%s/%s", settings.datadir, PERM_FILE); -+ sprintf (buf, "%s/%s", "/etc/crossfire", PERM_FILE); - if ((fp = open_and_uncompress(buf, 0, &comp)) == NULL) - return 0; - -diff -durN crossfire-1.1.0.orig/server/player.c crossfire-1.1.0/server/player.c ---- crossfire-1.1.0.orig/server/player.c Wed Mar 20 07:36:53 2002 -+++ crossfire-1.1.0/server/player.c Fri Mar 22 13:23:04 2002 -@@ -57,7 +57,7 @@ - FILE *fp; - int comp; - -- sprintf(buf,"%s/%s",settings.datadir,MOTD); -+ sprintf(buf,"%s/%s","/etc/crossfire",MOTD); - if((fp=open_and_uncompress(buf,0,&comp))==NULL) { - return; - } diff --git a/crossfire-python.patch b/crossfire-python.patch deleted file mode 100644 index 66013fc..0000000 --- a/crossfire-python.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- crossfire-1.3.0/configure.in.python Mon Jul 8 22:13:02 2002 -+++ crossfire-1.3.0/configure.in Mon Jul 8 22:13:19 2002 -@@ -163,7 +163,7 @@ - dnl since it also relies on the previous detection of - dnl Python.h - echo -n "checking for python lib... " --PYTHON_LIB=`echo /usr/lib/python*/config/libpython*.a` -+PYTHON_LIB=`echo /usr/lib/libpython*.so` - if test ! -f $PYTHON_LIB ; then - echo "no" - PYTHON_LIB="" diff --git a/crossfire-tmp_maps.patch b/crossfire-tmp_maps.patch deleted file mode 100644 index ac92dc3..0000000 --- a/crossfire-tmp_maps.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -durN crossfire-0.98.0.orig/include/config.h crossfire-0.98.0/include/config.h ---- crossfire-0.98.0.orig/include/config.h Tue Apr 17 16:51:01 2001 -+++ crossfire-0.98.0/include/config.h Tue Apr 17 17:05:00 2001 -@@ -361,9 +361,9 @@ - * this to really work, the filename must be constant so the next run - * knows where to find the information. - */ --/* -+ - #define RECYCLE_TMP_MAPS --*/ -+ - - /* define RESURECTION if you want to let players bring other players - * back to life via some spells. If RESURRECTION is undefined, then a