diff options
Diffstat (limited to 'games/xpat2/patches/patch-aa')
| -rw-r--r-- | games/xpat2/patches/patch-aa | 37 |
1 files changed, 6 insertions, 31 deletions
diff --git a/games/xpat2/patches/patch-aa b/games/xpat2/patches/patch-aa index 6b68097dda9..c14458ffe19 100644 --- a/games/xpat2/patches/patch-aa +++ b/games/xpat2/patches/patch-aa @@ -1,34 +1,9 @@ -$NetBSD: patch-aa,v 1.1.1.1 2000/07/28 18:12:06 jlam Exp $ +$NetBSD: patch-aa,v 1.2 2004/12/03 13:28:22 wiz Exp $ ---- src/Imakefile.orig Sat May 15 15:02:56 1999 -+++ src/Imakefile Thu Jul 27 13:18:33 2000 -@@ -49,9 +49,9 @@ - # BINDIR and LIBDIR should be predefined by the templates - # BINDIR = /usr/bin/X11 - # LIBDIR = /usr/lib/X11 --XPATLIBDIR = /usr/games/lib/xpat -+XPATLIBDIR = $(LIBDIR)/xpat - APPDEFSDIR = $(LIBDIR) --XPATMANDIR = /usr/man/man6 -+XPATMANDIR = $(PREFIX)/man/man6 - - # This is the name of the log-file, where solved games are stored: - # an alternative path would be $(XPATLIBDIR)/xpat.log -@@ -64,8 +64,10 @@ - LAPPDEFSDIR = $(HOME) - - # xpat2 needs to know where the xpm library resides (if needed) --XPMLIB = -L$(USRLIBDIR) -lXpm --XPMINCLUDE = -I $(INCDIR) -+XPMLIB = -Wl,-R${XPMDIR}/lib -lXpm -+XPMINCLUDE = -I$(XPMDIR)/include/X11 -+ -+CFLAGS += -DNO_CUSERID - - # for the Qt interface, the following paths are needed - QTDIR = /usr/local/qt -@@ -204,12 +206,12 @@ - install:: $(MYPROGS) +--- src/Imakefile.orig 2000-11-05 20:05:10.000000000 +0100 ++++ src/Imakefile 2004-12-02 23:49:15.000000000 +0100 +@@ -207,12 +207,12 @@ + install:: $(MYPROGS) mkdirhier $(XPATLIBDIR) chmod 755 $(XPATLIBDIR) - for f in $(LANGUAGES); do \ @@ -46,7 +21,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/07/28 18:12:06 jlam Exp $ (cd ../lib; tar cf - * | (cd $(XPATLIBDIR); tar xf -)) chown -R root $(XPATLIBDIR) chmod -R a+r $(XPATLIBDIR) -@@ -217,8 +219,8 @@ +@@ -220,8 +220,8 @@ chmod 755 $(XPATLIBDIR)/$$f; \ done mkdirhier $(XPATMANDIR) |