summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Alonso Cardenas Marquez <acm@FreeBSD.org>2006-09-22 22:15:14 +0000
committerJose Alonso Cardenas Marquez <acm@FreeBSD.org>2006-09-22 22:15:14 +0000
commit06ecbc9194da5adb98791670d633849fb0d07da9 (patch)
treea0461a5ccd837206391dd0ea630dd15dc69d300a
parentFix whitespace and a typo. (diff)
- Fix installation problem
- Remove USE_X_PREFIX - Remove CONFLICTS PR: 103370 Approved by: Guido Falsi <mad__at__madpilot.net> (maintainer via email)
Notes
Notes: svn path=/head/; revision=173620
-rw-r--r--games/netpanzer-data/Makefile3
-rw-r--r--games/netpanzer/Makefile9
2 files changed, 4 insertions, 8 deletions
diff --git a/games/netpanzer-data/Makefile b/games/netpanzer-data/Makefile
index d0decdd1fe19..e9d082626982 100644
--- a/games/netpanzer-data/Makefile
+++ b/games/netpanzer-data/Makefile
@@ -7,7 +7,7 @@
PORTNAME= data
PORTVERSION= 0.8
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_BERLIOS}
MASTER_SITE_SUBDIR= ${PKGNAMEPREFIX:S/-//}
@@ -26,7 +26,6 @@ CONFIGURE_ARGS+= --with-libphysfs=${LOCALBASE} \
CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" \
CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
-USE_X_PREFIX= yes
USE_BZIP2= yes
USE_SDL= sdl net mixer image
USE_GNOME= libxml2
diff --git a/games/netpanzer/Makefile b/games/netpanzer/Makefile
index 80df8562cfe3..c71a5b917117 100644
--- a/games/netpanzer/Makefile
+++ b/games/netpanzer/Makefile
@@ -7,7 +7,7 @@
PORTNAME= netpanzer
PORTVERSION= 0.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games
MASTER_SITES= http://download.berlios.de/netpanzer/
@@ -16,16 +16,13 @@ COMMENT= Real time, isometric view, tank multiplayer strategy game
LIB_DEPENDS= physfs-1.0.1:${PORTSDIR}/devel/physfs
BUILD_DEPENDS= jam:${PORTSDIR}/devel/jam
-RUN_DEPENDS= ${X11BASE}/share/netpanzer/wads/netp.act:${PORTSDIR}/games/netpanzer-data
-
-CONFLICTS= netpanzerdata*
+RUN_DEPENDS= ${LOCALBASE}/share/netpanzer/wads/netp.act:${PORTSDIR}/games/netpanzer-data
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-libphysfs=${LOCALBASE} --without-wx-config
CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" \
CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
-USE_X_PREFIX= yes
USE_BZIP2= yes
USE_SDL= sdl net mixer image ttf
USE_GNOME= libxml2
@@ -47,6 +44,6 @@ do-build:
@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} jam)
do-install:
- @(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} jam ${INSTALL_TARGET})
+ @(cd ${INSTALL_WRKSRC} && jam ${INSTALL_TARGET})
.include <bsd.port.mk>