Date: Thu, 23 Sep 2004 19:15:27 GMT From: Thierry Thomas <thierry@FreeBSD.org> To: ip@doom.homeunix.org, thierry@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org, thierry@FreeBSD.org Subject: Re: ports/72002: Update port: graphics/deng dependency fix Message-ID: <200409231915.i8NJFRKA049951@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
Synopsis: Update port: graphics/deng dependency fix
State-Changed-From-To: open->feedback
State-Changed-By: thierry
State-Changed-When: Thu Sep 23 19:10:58 GMT 2004
State-Changed-Why:
- this port uses LIBTOOL;
- <bsd.port.pre.mk> is no more required;
- fix WITH_OPENAL case.
I propose you the following patch:
--- deng.diff begins here ---
diff -urN games/deng.orig/Makefile games/deng/Makefile
--- games/deng.orig/Makefile Thu Sep 23 20:27:13 2004
+++ games/deng/Makefile Thu Sep 23 21:03:43 2004
@@ -14,28 +14,25 @@
MAINTAINER= ip@doom.homeunix.org
COMMENT= An enhanced Doom, Heretic and Hexen source port
+LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png
RUN_DEPENDS= ${LOCALBASE}/bin/timidity:${PORTSDIR}/audio/timidity
-BROKEN= Missing dependency
-
USE_REINPLACE= yes
REINPLACE_ARGS= -i ""
-GNU_CONFIGURE= yes
+USE_LIBTOOL_VER= 15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CFLAGS="${CFLAGS} `${SDL_CONFIG} --cflags` -I${LOCALBASE}/include -I${X11BASE}/include" \
CPPFLAGS="`${SDL_CONFIG} --cflags` -I${LOCALBASE}/include -I${X11BASE}/include"
USE_SDL= sdl mixer net
USE_GL= yes
INSTALLS_SHLIB= yes
+NOT_FOR_ARCHS= amd64
PKGMESSAGE= ${WRKDIR}/pkg-message
-.include <bsd.port.pre.mk>
-
-.if exists(${LOCALBASE}/lib/libopenal.so.0)
+.if exists(${LOCALBASE}/lib/libopenal.so.0) || defined(WITH_OPENAL)
WITH_OPENAL= yes
-BUILD_DEPENDS= ${LOCALBASE}/lib/libopenal.so.0:${PORTSDIR}/audio/openal
-RUN_DEPENDS= ${LOCALBASE}/lib/libopenal.so.0:${PORTSDIR}/audio/openal
+LIB_DEPENDS+= openal.0:${PORTSDIR}/audio/openal
.endif
.if !defined(WITH_OPENAL)
@@ -69,4 +66,4 @@
@(${SED} -e 's|%%PREFIX%%|${PREFIX}|; s|%%DOCSDIR%%|${DOCSDIR}|' \
<pkg-message >${PKGMESSAGE} && ${CAT} ${PKGMESSAGE})
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -urN games/deng.orig/pkg-plist games/deng/pkg-plist
--- games/deng.orig/pkg-plist Thu Sep 23 20:27:13 2004
+++ games/deng/pkg-plist Thu Sep 23 20:59:22 2004
@@ -1,34 +1,20 @@
bin/doomsday
lib/libdpdehread.a
-lib/libdpdehread.la
lib/libdpdehread.so
lib/libdpdehread.so.0
lib/libdpmapload.a
-lib/libdpmapload.la
lib/libdpmapload.so
lib/libdpmapload.so.0
-lib/libdropengl.a
-lib/libdropengl.la
lib/libdropengl.so
lib/libdropengl.so.0
-%%WITH_OPENAL%%lib/libdsopenal.a
-%%WITH_OPENAL%%lib/libdsopenal.la
%%WITH_OPENAL%%lib/libdsopenal.so
%%WITH_OPENAL%%lib/libdsopenal.so.0
-lib/libdssdlmixer.a
-lib/libdssdlmixer.la
lib/libdssdlmixer.so
lib/libdssdlmixer.so.0
-lib/libjdoom.a
-lib/libjdoom.la
lib/libjdoom.so
lib/libjdoom.so.0
-lib/libjheretic.a
-lib/libjheretic.la
lib/libjheretic.so
lib/libjheretic.so.0
-lib/libjhexen.a
-lib/libjhexen.la
lib/libjhexen.so
lib/libjhexen.so.0
%%DATADIR%%/Data/Doomsday.wad
--- deng.diff ends here ---
Responsible-Changed-From-To: freebsd-ports-bugs->thierry
Responsible-Changed-By: thierry
Responsible-Changed-When: Thu Sep 23 19:10:58 GMT 2004
Responsible-Changed-Why:
Take it.
http://www.freebsd.org/cgi/query-pr.cgi?pr=72002
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200409231915.i8NJFRKA049951>