diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
| commit | 3e4ed01146cfe2bdca465bd0e4d199341f62a0b6 (patch) | |
| tree | d573ea09b2bf6be67cb497df199932da9e2707c4 /games/doom | |
| parent | 40049f4af2200d0dcf33596508688623fc75f764 (diff) | |
| download | ports-3e4ed01146cfe2bdca465bd0e4d199341f62a0b6.tar.gz ports-3e4ed01146cfe2bdca465bd0e4d199341f62a0b6.zip | |
- Remove unneeded dependency from gtk12/gtk20 [1]
- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG
- Remove X11BASE support in favor of LOCALBASE or PREFIX
- Use USE_LDCONFIG instead of INSTALLS_SHLIB
- Remove unneeded USE_GCC 3.4+
Thanks to all Helpers:
Dmitry Marakasov, Chess Griffin, beech@, dinoex, rafan, gahr,
ehaupt, nox, itetcu, flz, pav
PR: 116263
Tested on: pointyhat
Approved by: portmgr (pav)
Notes
Notes:
svn path=/head/; revision=211584
Diffstat (limited to 'games/doom')
| -rw-r--r-- | games/doom/Makefile | 9 | ||||
| -rw-r--r-- | games/doom/files/patch-ab | 4 |
2 files changed, 6 insertions, 7 deletions
diff --git a/games/doom/Makefile b/games/doom/Makefile index ac5bdd274773..b5706e100ffa 100644 --- a/games/doom/Makefile +++ b/games/doom/Makefile @@ -7,10 +7,9 @@ PORTNAME= doom PORTVERSION= 1.10 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_IDSOFTWARE} -MASTER_SITE_SUBDIR= source +MASTER_SITES= SF/source DISTNAME= doomsrc MAINTAINER= jmz@FreeBSD.org @@ -21,8 +20,8 @@ NO_CDROM= requested by IDsoftware ONLY_FOR_ARCHS= i386 USE_GMAKE= yes -USE_XLIB= yes USE_ZIP= yes +USE_XORG= x11 NO_WRKSUBDIR= yes DATADIR= ${DMDIR} @@ -35,7 +34,7 @@ post-patch: -E -e 's|#include +<malloc.h>|#include <stdlib.h>|g' do-build: - @cd ${WRKDIR}/linuxdoom-1.10 && ${GMAKE} X11BASE=${X11BASE} + @cd ${WRKDIR}/linuxdoom-1.10 && ${GMAKE} X11BASE=${LOCALBASE} @cd ${WRKDIR}/sndserv && ${GMAKE} do-install: diff --git a/games/doom/files/patch-ab b/games/doom/files/patch-ab index c5e6617c9531..65a772bbd986 100644 --- a/games/doom/files/patch-ab +++ b/games/doom/files/patch-ab @@ -11,8 +11,8 @@ -LDFLAGS=-L/usr/X11R6/lib -LIBS=-lXext -lX11 -lnsl -lm +CFLAGS?= -O -+CFLAGS+=-g -I${X11BASE}/include -Wall -DNORMALUNIX -DSNDSERV -DSNDSRV # -DUSEASM -+LDFLAGS=-L${X11BASE}/lib ++CFLAGS+=-g -I${LOCALBASE}/include -Wall -DNORMALUNIX -DSNDSERV -DSNDSRV # -DUSEASM ++LDFLAGS=-L${LOCALBASE}/lib +LIBS=-lXext -lX11 -lm # subdirectory for objects |