diff options
| author | danfe <danfe@FreeBSD.org> | 2014-07-08 15:07:05 +0800 |
|---|---|---|
| committer | danfe <danfe@FreeBSD.org> | 2014-07-08 15:07:05 +0800 |
| commit | 56acd9af111627d9548df267679802d7dc5db0d5 (patch) | |
| tree | e7f7407d948bd0911275fba4439a460fb8d0317e /games | |
| parent | 7c1aafbaa4d8590203b1b198a3a868fe008f66c2 (diff) | |
| download | freebsd-ports-gnome-56acd9af111627d9548df267679802d7dc5db0d5.tar.gz freebsd-ports-gnome-56acd9af111627d9548df267679802d7dc5db0d5.tar.zst freebsd-ports-gnome-56acd9af111627d9548df267679802d7dc5db0d5.zip | |
- Cleanup, modernize MASTER_SITES and optimize away MASTER_SITE_SUBDIR
- Switch to using vertical bars as regex separators, since they do not
require escaping of the slash (when used as path separator)
- Move OPTIONS block where it belongs (closer to <bsd.port.options.mk>)
- Turn .error into IGNORE statement; reclaim maintainership back
Diffstat (limited to 'games')
| -rw-r--r-- | games/quake2-data/Makefile | 23 | ||||
| -rw-r--r-- | games/quake2-data/Makefile.include | 4 |
2 files changed, 12 insertions, 15 deletions
diff --git a/games/quake2-data/Makefile b/games/quake2-data/Makefile index ef262f783285..d90f2b6b0297 100644 --- a/games/quake2-data/Makefile +++ b/games/quake2-data/Makefile @@ -5,34 +5,31 @@ PORTNAME= data PORTVERSION= 3.20 PORTREVISION= 3 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_IDSOFTWARE:S|$|:data,src|} -MASTER_SITE_SUBDIR= quake2/:data \ - quake2/source/:src +MASTER_SITES= IDSOFTWARE/quake2/:data IDSOFTWARE/quake2/source/:src PKGNAMEPREFIX= ${Q2PKGNAMEPREFIX} -DISTFILES= ${Q2_UPDATE}:data \ - ${Q2_SRC}:src +DISTFILES= ${Q2_UPDATE}:data ${Q2_SRC}:src -MAINTAINER= ports@FreeBSD.org +MAINTAINER= danfe@FreeBSD.org COMMENT= Quake II data files # XXX we need info-unzip for q2-314-demo-x86.exe USES= zip:infozip 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 - LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME} DATADIR= ${Q2DIR} DOCSDIR= ${PREFIX}/share/doc/${LATEST_LINK} Q2_DEMO= q2-314-demo-x86.exe -Q2_SRC= q2src${PORTVERSION:S/.//}.shar.Z +Q2_SRC= q2src${PORTVERSION:S|.||}.shar.Z Q2_UPDATE= q2-${PORTVERSION}-x86-full.exe +OPTIONS_DEFINE= MANUAL OPTIMIZED_CFLAGS SHAREWARE +OPTIONS_DEFAULT= OPTIMIZED_CFLAGS + +MANUAL_DESC= Install the game HTML manual +SHAREWARE_DESC= Install demo version of the game data + .include "Makefile.include" # must be included before bsd.port.options.mk .include <bsd.port.options.mk> diff --git a/games/quake2-data/Makefile.include b/games/quake2-data/Makefile.include index 2ca2738744fe..3b83e37ccb4d 100644 --- a/games/quake2-data/Makefile.include +++ b/games/quake2-data/Makefile.include @@ -49,11 +49,11 @@ Q2PKGNAMEPREFIX?= quake2- Q2DIR?= ${LOCALBASE}/share/quake2 .if defined(PKGNAMEPREFIX) && ${PKGNAMEPREFIX} == "${Q2PKGNAMEPREFIX}" && defined(OPTIONSMKINCLUDED) -. error include before <bsd.port.options.mk> if using Q2PKGNAMEPREFIX +IGNORE= is using Q2PKGNAMEPREFIX, but <bsd.port.options.mk> included too early .endif MAKE_ENV+= Q2DIR="${Q2DIR}" -PLIST_SUB+= Q2DIR="${Q2DIR:S/${LOCALBASE}\///}" +PLIST_SUB+= Q2DIR="${Q2DIR:S|${LOCALBASE}/||}" SUB_LIST+= Q2DIR="${Q2DIR}" .if ${PORTNAME} != "data" |