diff options
author | ade <ade@FreeBSD.org> | 2000-10-14 19:44:37 +0000 |
---|---|---|
committer | ade <ade@FreeBSD.org> | 2000-10-14 19:44:37 +0000 |
commit | 2f36e4f8d64f6e55f00b64117a5e901814788cb1 (patch) | |
tree | b0daa50d0f2b3b5d2f6c86e13e0d337275183a40 | |
parent | d6b4fb89a379475fb4d5eb2ecaa372488e16166a (diff) | |
download | FreeBSD-ports-2f36e4f8d64f6e55f00b64117a5e901814788cb1.zip FreeBSD-ports-2f36e4f8d64f6e55f00b64117a5e901814788cb1.tar.gz |
Fix Imakefile breakage under XFree86 4.x
PR: 21968
Submitted by: Ports Fury
-rw-r--r-- | games/wmtimebomb/Makefile | 3 | ||||
-rw-r--r-- | games/wmtimebomb/files/patch-aa | 18 |
2 files changed, 11 insertions, 10 deletions
diff --git a/games/wmtimebomb/Makefile b/games/wmtimebomb/Makefile index 1026053..5582d13 100644 --- a/games/wmtimebomb/Makefile +++ b/games/wmtimebomb/Makefile @@ -19,9 +19,6 @@ WRKSRC= ${WRKDIR}/wmtimebomb.app USE_IMAKE= yes NO_INSTALL_MANPAGES= yes -post-patch: - @${PERL} -pi -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/Imakefile - post-install: @${MKDIR} ${PREFIX}/lib/X11/wmtimebomb ${INSTALL_DATA} ${WRKSRC}/example.modefile ${PREFIX}/lib/X11/wmtimebomb diff --git a/games/wmtimebomb/files/patch-aa b/games/wmtimebomb/files/patch-aa index 04ce523..a8684c0 100644 --- a/games/wmtimebomb/files/patch-aa +++ b/games/wmtimebomb/files/patch-aa @@ -1,14 +1,18 @@ --- Imakefile.orig Mon Nov 16 21:40:24 1998 -+++ Imakefile Thu Feb 17 23:02:07 2000 -@@ -1,7 +1,9 @@ --XPMLIB = -L/usr/X11R6/lib -lXpm -lm -ljpeg -lpng -lz -ltiff -lungif ++++ Imakefile Sat Oct 14 03:27:50 2000 +@@ -1,10 +1,12 @@ +-XPMLIB = -L/usr/X11R6/lib -lXpm -lm -ljpeg -lpng -lz -ltiff -lgif -WMAKER = -L/usr/local/lib -lWMaker -lWINGs -lwraster -lPropList -+XPMLIB = `get-wraster-flags --libs` -+WMAKER = -lWMaker -lWINGs -lPropList -L%%LOCALBASE%%/lib ++XPMLIB = `get-wraster-flags --ldflags` `get-wraster-flags --libs` ++WMAKER = -lWMaker -lWINGs -lPropList -L${LOCALBASE}/lib LOCAL_LIBRARIES = $(WMAKER) $(XPMLIB) $(XLIB) -+ -+EXTRA_INCLUDES= `get-wraster-flags --cflags` -I%%LOCALBASE%%/include ++EXTRA_INCLUDES= `get-wraster-flags --cflags` -I${LOCALBASE}/include ++ SRCS = timebomb.c OBJS = timebomb.o + +-ComplexProgramTarget(wmtimebomb) ++ComplexProgramTargetNoMan(wmtimebomb) + |