diff options
| -rw-r--r-- | games/doom-data/Makefile | 10 | ||||
| -rw-r--r-- | games/doom-data/Makefile.include | 1 |
2 files changed, 5 insertions, 6 deletions
diff --git a/games/doom-data/Makefile b/games/doom-data/Makefile index 2ee02190b6c3..0a2ec16541f2 100644 --- a/games/doom-data/Makefile +++ b/games/doom-data/Makefile @@ -7,6 +7,7 @@ PORTNAME= data PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://www.ijs.si/~lesi/distfiles/doom/ PKGNAMEPREFIX= ${DMPKGNAMEPREFIX} @@ -27,7 +28,6 @@ OPTIONS= DOOM "Install Doom shareware data" on \ STRIFE "Install Strife shareware data" off SUB_FILES= pkg-message -PKGMESSAGE= ${WRKDIR}/pkg-message LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME} DATADIR= ${DMDIR} @@ -44,7 +44,7 @@ STRIFE_WAD= strife0.wad .include <bsd.port.pre.mk> .for f in ${LIST} -. if defined(WITH_${f}) +. if defined(WITH_${f}) || !defined(WITHOUT_${f}) DISTFILES+= ${${f}_WAD}${EXTRACT_SUFX} PLIST_SUB+= ${f}="" . else @@ -59,7 +59,7 @@ PLIST_SUB+= ${f}="@comment " do-extract: @${MKDIR} ${WRKDIR} .for f in ${LIST} -. if defined(WITH_${f}) +. if defined(WITH_${f}) || !defined(WITHOUT_${f}) @${BZIP2_CMD} -dc ${_DISTDIR}/${${f}_WAD}${EXTRACT_SUFX} > \ ${WRKDIR}/${${f}_WAD} . endif @@ -68,8 +68,8 @@ do-extract: do-install: @${MKDIR} ${DATADIR} .for f in ${LIST} -. if defined(WITH_${f}) - @${INSTALL_DATA} ${WRKSRC}/${${f}_WAD} ${DATADIR} +. if defined(WITH_${f}) || !defined(WITHOUT_${f}) + ${INSTALL_DATA} ${WRKSRC}/${${f}_WAD} ${DATADIR} . endif .endfor diff --git a/games/doom-data/Makefile.include b/games/doom-data/Makefile.include index 9e40dcf3489f..0f1b25de55f2 100644 --- a/games/doom-data/Makefile.include +++ b/games/doom-data/Makefile.include @@ -23,7 +23,6 @@ RUN_DEPENDS+= ${DMDIR}:${PORTSDIR}/games/doom-data . if defined(USE_ZIP) EXTRACT_BEFORE_ARGS= -aqo . else -USE_REINPLACE= yes pre-patch: @${FIND} ${WRKDIR} -type f -print0 | \ ${XARGS} -0 ${FILE} | ${GREP} 'CRLF' | \ |