diff options
Diffstat (limited to 'games/wmtimebomb')
| -rw-r--r-- | games/wmtimebomb/Makefile | 7 | ||||
| -rw-r--r-- | games/wmtimebomb/files/patch-aa | 6 | ||||
| -rw-r--r-- | games/wmtimebomb/files/patch-ab | 13 |
3 files changed, 17 insertions, 9 deletions
diff --git a/games/wmtimebomb/Makefile b/games/wmtimebomb/Makefile index 7c2c8e357a20..1f27bc7064e5 100644 --- a/games/wmtimebomb/Makefile +++ b/games/wmtimebomb/Makefile @@ -6,7 +6,7 @@ PORTNAME= wmtimebomb PORTVERSION= 0.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games windowmaker MASTER_SITES= ftp://ftp.netmug.org/pub/FreeBSD/distfiles/ DISTNAME= wmtimebomb.20 @@ -14,10 +14,7 @@ DISTNAME= wmtimebomb.20 MAINTAINER= ports@FreeBSD.org COMMENT= A minesweeper for WindowMaker -BROKEN= "Does not build with new version of windowmaker" - -LIB_DEPENDS= PropList.2:${PORTSDIR}/devel/libPropList \ - wraster.4:${PORTSDIR}/x11-wm/windowmaker +LIB_DEPENDS= wraster.4:${PORTSDIR}/x11-wm/windowmaker WRKSRC= ${WRKDIR}/wmtimebomb.app USE_IMAKE= yes diff --git a/games/wmtimebomb/files/patch-aa b/games/wmtimebomb/files/patch-aa index 28d0e29de710..37475fcb9dbd 100644 --- a/games/wmtimebomb/files/patch-aa +++ b/games/wmtimebomb/files/patch-aa @@ -3,12 +3,12 @@ @@ -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 --ldflags` `get-wraster-flags --libs` -+WMAKER = -lWMaker -lWINGs -lPropList -L${LOCALBASE}/lib ++XPMLIB = `pkg-config --libs WINGs wmlib wrlib` ++WMAKER = -L${X11BASE}/lib -lWMaker LOCAL_LIBRARIES = $(WMAKER) $(XPMLIB) $(XLIB) -+EXTRA_INCLUDES= `get-wraster-flags --cflags` -I${LOCALBASE}/include -I${X11BASE}/include/WINGs ++EXTRA_INCLUDES= `pkg-config --cflags WINGs wmlib wrlib` -I${X11BASE}/include + SRCS = timebomb.c OBJS = timebomb.o diff --git a/games/wmtimebomb/files/patch-ab b/games/wmtimebomb/files/patch-ab index e9292ca0d3ca..2d66ede02209 100644 --- a/games/wmtimebomb/files/patch-ab +++ b/games/wmtimebomb/files/patch-ab @@ -2,7 +2,18 @@ $FreeBSD$ --- timebomb.c.orig Mon Nov 16 16:42:54 1998 -+++ timebomb.c Tue Aug 14 12:30:44 2001 ++++ timebomb.c Wed Nov 17 23:13:48 2004 +@@ -4,8 +4,8 @@ + #include <X11/xpm.h> + #include <X11/Xproto.h> + #include <WMaker.h> +-#include <WINGs.h> +-#include "WINGsP.h" ++#include <WINGs/WINGs.h> ++#include <WINGs/WINGsP.h> + #include <wraster.h> + #include <signal.h> + #include "xlibgeneral.h" @@ -94,7 +94,7 @@ XpmIcon rbuttonb; XpmIcon id; |