- Change optional dependency quake2-retexture (not existent) to quake2-extras.
Responsible Changed From-To: freebsd-ports-bugs->danfe Over to maintainer
This new diff allows the user to disable aRts and svga when they are installed (currently it forces them in this case). Index: quake2lnx/Makefile =================================================================== RCS file: /home/pcvs/ports/games/quake2lnx/Makefile,v retrieving revision 1.24 diff -u -r1.24 Makefile --- quake2lnx/Makefile 20 Sep 2006 11:21:22 -0000 1.24 +++ quake2lnx/Makefile 26 Dec 2006 03:33:38 -0000 @@ -107,7 +107,7 @@ PLIST_SUB+= SDLCLIENT="@comment " .endif -.if ${ARCH} == "i386" && (defined(WITH_SVGA) || exists(${LOCALBASE}/lib/libvga.so.1)) +.if ${ARCH} == "i386" && defined(WITH_SVGA) LIB_DEPENDS+= vga.1:${PORTSDIR}/graphics/svgalib MAKE_ARGS+= BUILD_SVGA=YES REF_TARGETS+= soft @@ -116,7 +116,7 @@ PLIST_SUB+= SVGA="@comment " .endif -.if defined(WITH_AA) || exists(${LOCALBASE}/lib/libaa.so.1) +.if defined(WITH_AA) LIB_DEPENDS+= aa.1:${PORTSDIR}/graphics/aalib MAKE_ARGS+= BUILD_AA=YES REF_TARGETS+= softaa @@ -165,7 +165,7 @@ .if defined(WITH_RETEXTURE) MAKE_ARGS+= BUILD_RETEXTURE=YES -RUN_DEPENDS+= ${Q2DIR}/baseq2/pak10.pak:${PORTSDIR}/games/quake2-retexture +RUN_DEPENDS+= ${Q2DIR}/baseq2/pak10.pak:${PORTSDIR}/games/quake2-extras .endif .if defined(WITH_JOYSTICK) @@ -180,7 +180,7 @@ MAKE_ARGS+= HAVE_IPV6=YES .endif -.if defined(WITH_ARTS) || exists (${LOCALBASE}/lib/libartsc.so.0) +.if defined(WITH_ARTS) LIB_DEPENDS+= artsc.0:${PORTSDIR}/audio/arts MAKE_ARGS+= BUILD_ARTS=YES .endif
This new diff also removes the unconditional use of SDL when it is installed (I missed HAVE_SDL constructs), and removes the second site (a redirect to the first one), together with "icc" group specification since it is the only one. Index: quake2lnx/Makefile =================================================================== RCS file: /home/pcvs/ports/games/quake2lnx/Makefile,v retrieving revision 1.24 diff -u -r1.24 Makefile --- quake2lnx/Makefile 20 Sep 2006 11:21:22 -0000 1.24 +++ quake2lnx/Makefile 30 Dec 2006 02:32:51 -0000 @@ -9,10 +9,9 @@ PORTVERSION= 0.16.2 PORTREVISION= 4 CATEGORIES= games -MASTER_SITES= http://offload1.icculus.org/quake2/files/:icc \ - http://www.icculus.org/quake2/files/:icc +MASTER_SITES= http://offload1.icculus.org/quake2/files/ DISTNAME= quake2-r${PORTVERSION} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:icc +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} DIST_SUBDIR= ${PORTNAME} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} @@ -74,7 +73,7 @@ .endif .if defined(WITH_EYECANDY) -DISTFILES+= maxpak.pak:icc +DISTFILES+= maxpak.pak LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg MAKE_ARGS+= BUILD_QMAX=YES PLIST_SUB+= QMAX="" @@ -82,7 +81,7 @@ PLIST_SUB+= QMAX="@comment " .endif -.if defined(WITH_SDL) || ${HAVE_SDL:Msdl} != "" +.if defined(WITH_SDL) USE_SDL= sdl MAKE_ARGS+= BUILD_SDL=YES REF_TARGETS+= softsdl @@ -91,7 +90,7 @@ PLIST_SUB+= SDL="@comment " .endif -.if defined(WITH_SDLGL) && (defined(WITH_SDL) || ${HAVE_SDL:Msdl} != "") +.if defined(WITH_SDLGL) && defined(WITH_SDL) MAKE_ARGS+= BUILD_SDLGL=YES REF_TARGETS+= sdlgl PLIST_SUB+= SDLGL="" @@ -99,7 +98,7 @@ PLIST_SUB+= SDLGL="@comment " .endif -.if defined(WITH_SDLCLIENT) && (defined(WITH_SDL) || ${HAVE_SDL:Msdl} != "") +.if defined(WITH_SDLCLIENT) && defined(WITH_SDL) MAKE_ARGS+= BUILD_SDLQUAKE2=YES EXE_TARGETS+= quake2-sdl PLIST_SUB+= SDLCLIENT="" @@ -107,7 +106,7 @@ PLIST_SUB+= SDLCLIENT="@comment " .endif -.if ${ARCH} == "i386" && (defined(WITH_SVGA) || exists(${LOCALBASE}/lib/libvga.so.1)) +.if ${ARCH} == "i386" && defined(WITH_SVGA) LIB_DEPENDS+= vga.1:${PORTSDIR}/graphics/svgalib MAKE_ARGS+= BUILD_SVGA=YES REF_TARGETS+= soft @@ -116,7 +115,7 @@ PLIST_SUB+= SVGA="@comment " .endif -.if defined(WITH_AA) || exists(${LOCALBASE}/lib/libaa.so.1) +.if defined(WITH_AA) LIB_DEPENDS+= aa.1:${PORTSDIR}/graphics/aalib MAKE_ARGS+= BUILD_AA=YES REF_TARGETS+= softaa @@ -165,7 +164,7 @@ .if defined(WITH_RETEXTURE) MAKE_ARGS+= BUILD_RETEXTURE=YES -RUN_DEPENDS+= ${Q2DIR}/baseq2/pak10.pak:${PORTSDIR}/games/quake2-retexture +RUN_DEPENDS+= ${Q2DIR}/baseq2/pak10.pak:${PORTSDIR}/games/quake2-extras .endif .if defined(WITH_JOYSTICK) @@ -180,7 +179,7 @@ MAKE_ARGS+= HAVE_IPV6=YES .endif -.if defined(WITH_ARTS) || exists (${LOCALBASE}/lib/libartsc.so.0) +.if defined(WITH_ARTS) LIB_DEPENDS+= artsc.0:${PORTSDIR}/audio/arts MAKE_ARGS+= BUILD_ARTS=YES .endif
alepulver 2007-01-03 16:31:05 UTC FreeBSD ports repository Modified files: games/quake2lnx Makefile Log: - Remove invalid entry from MASTER_SITE (is a redirect to the other one). - Remove unneeded ":icc" group. - Remove unavoidable autodetection of installed libraries to use them. - Change nonexistent dependency games/quake2-retexture to games/quake2-extras. PR: 107199 Submitted by: alepulver (myself) Approved by: maintainer (timeout) Revision Changes Path 1.25 +10 -11 ports/games/quake2lnx/Makefile _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed. Thanks!