diff options
author | danfe <danfe@FreeBSD.org> | 2013-03-17 20:18:23 +0800 |
---|---|---|
committer | danfe <danfe@FreeBSD.org> | 2013-03-17 20:18:23 +0800 |
commit | e788b764243cad3fda52f3ce66accc7b77b68723 (patch) | |
tree | a3bb05a44ba890d0741a63644a3f68662167fc19 /games/quake2-data | |
parent | 366c7bb953485d117f2e94ac61e21fe0c3daec8c (diff) | |
download | freebsd-ports-gnome-e788b764243cad3fda52f3ce66accc7b77b68723.tar.gz freebsd-ports-gnome-e788b764243cad3fda52f3ce66accc7b77b68723.tar.zst freebsd-ports-gnome-e788b764243cad3fda52f3ce66accc7b77b68723.zip |
- Makefile.include must be included before bsd.port.options.mk, otherwise
"make config", "make showconfig" will not work correctly
- Drop redundant PKGMESSAGE assignment, tighten PLIST_SUB's
- Make a few non-functional changes while here
Diffstat (limited to 'games/quake2-data')
-rw-r--r-- | games/quake2-data/Makefile | 21 | ||||
-rw-r--r-- | games/quake2-data/files/pkg-message.in | 2 |
2 files changed, 10 insertions, 13 deletions
diff --git a/games/quake2-data/Makefile b/games/quake2-data/Makefile index 141bc50f7cb4..94ebe8006293 100644 --- a/games/quake2-data/Makefile +++ b/games/quake2-data/Makefile @@ -22,8 +22,8 @@ NO_WRKSUBDIR= yes OPTIONS_DEFINE= MANUAL OPTIMIZED_CFLAGS SHAREWARE OPTIONS_DEFAULT= OPTIMIZED_CFLAGS -MANUAL_DESC= Install game HTML manual -SHAREWARE_DESC= Install demo version of the game data +MANUAL_DESC= Install game HTML manual +SHAREWARE_DESC= Install demo version of the game data LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME} DATADIR= ${Q2DIR} @@ -33,7 +33,7 @@ Q2_DEMO= q2-314-demo-x86.exe Q2_SRC= q2src${PORTVERSION:S/.//}.shar.Z Q2_UPDATE= q2-${PORTVERSION}-x86-full.exe -.include "Makefile.include" +.include "Makefile.include" # must be included before bsd.port.options.mk .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MMANUAL} || ${PORT_OPTIONS:MSHAREWARE} @@ -52,19 +52,16 @@ CFLAGS+= -ffast-math -funroll-loops -fomit-frame-pointer \ .endif .if ${PORT_OPTIONS:MSHAREWARE} -PLIST_SUB+= FULL="@comment " \ - SHAREWARE="" +PLIST_SUB+= FULL="@comment " SHAREWARE="" .else -PLIST_SUB+= FULL="" \ - SHAREWARE="@comment " +PLIST_SUB+= FULL="" SHAREWARE="@comment " SUB_FILES= pkg-message -PKGMESSAGE= ${WRKDIR}/pkg-message .endif do-extract: @${MKDIR} ${WRKDIR} - @cd ${WRKDIR} && \ - uncompress -c ${DISTDIR}/${Q2_SRC} | ${TAIL} +434 | ${SH} + @cd ${WRKDIR} && uncompress -c ${DISTDIR}/${Q2_SRC} | \ + ${TAIL} +434 | ${SH} @${UNZIP_CMD} -q -d ${WRKDIR} \ ${DISTDIR}/${Q2_UPDATE} baseq2/* -x *.dll .if ${PORT_OPTIONS:MMANUAL} @@ -86,10 +83,10 @@ post-patch: do-install: @${MKDIR} ${DATADIR}/baseq2 ${INSTALL_PROGRAM} ${WRKSRC}/game.so ${DATADIR}/baseq2 - ${CP} -R ${WRKSRC}/baseq2/* ${DATADIR}/baseq2 + ${CP} -a ${WRKSRC}/baseq2/* ${DATADIR}/baseq2 .if ${PORT_OPTIONS:MMANUAL} @${MKDIR} ${DOCSDIR} - ${CP} -R ${WRKSRC}/DOCS ${DOCSDIR}/manual + ${CP} -a ${WRKSRC}/DOCS ${DOCSDIR}/manual .endif post-install: diff --git a/games/quake2-data/files/pkg-message.in b/games/quake2-data/files/pkg-message.in index 367d30879069..8ac023de5318 100644 --- a/games/quake2-data/files/pkg-message.in +++ b/games/quake2-data/files/pkg-message.in @@ -2,6 +2,6 @@ To complete the installation of this port you need to copy the file "baseq2/pak0.pak" from the original Quake II distribution to -"%%DATADIR%%/baseq2". +%%DATADIR%%/baseq2. ============================================================================== |