diff options
author | taca <taca@pkgsrc.org> | 2011-12-30 23:21:00 +0000 |
---|---|---|
committer | taca <taca@pkgsrc.org> | 2011-12-30 23:21:00 +0000 |
commit | 302706856fcf5c378fd792900db1e86135334e78 (patch) | |
tree | 660d252387c0b39c7bc1c3b33083140f7837b6a6 /www/contao | |
parent | 9ee308719734b7ac7b12045115eae6bad18a6cdb (diff) | |
download | pkgsrc-302706856fcf5c378fd792900db1e86135334e78.tar.gz |
Deal with some distfile change.
Diffstat (limited to 'www/contao')
-rw-r--r-- | www/contao/Makefile.common | 11 | ||||
-rw-r--r-- | www/contao/Makefile.example | 4 |
2 files changed, 6 insertions, 9 deletions
diff --git a/www/contao/Makefile.common b/www/contao/Makefile.common index e6502ff4c8d..4ce9a731f16 100644 --- a/www/contao/Makefile.common +++ b/www/contao/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.6 2011/12/30 15:12:21 taca Exp $ +# $NetBSD: Makefile.common,v 1.7 2011/12/30 23:21:00 taca Exp $ # # used by www/contao29/Makefile # used by www/contao29-example/Makefile @@ -15,17 +15,14 @@ CT210_VERSION= 2.10.4 CT_VERS?= 210 .if ${CT_VERS} == "29" -CT_VERSION= ${CT29_VERSION} +CT_VERSION= ${CT29_VERSION} .elif ${CT_VERS} == "210" -CT_VERSION= ${CT210_VERSION} -CT_WRKSRC= contao-core-ef27969 +CT_VERSION= ${CT210_VERSION} +CT_DIST_SUBDIR= 201112300 .else .error "Illegal version specified: ${CT_VERS}" .endif -CT_WRKSRC?= ${DISTNAME} -WRKSRC?= ${WRKDIR}/${CT_WRKSRC} - CT_VER?= ${CT_VERSION:C/([0-9]+)\.([0-9]+)\..*/\1\2/} CT_PKGVER= ${CT_VERSION:S/.RC/rc/} diff --git a/www/contao/Makefile.example b/www/contao/Makefile.example index 14c54ee8746..181a2b2b722 100644 --- a/www/contao/Makefile.example +++ b/www/contao/Makefile.example @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.example,v 1.3 2011/12/30 15:12:21 taca Exp $ +# $NetBSD: Makefile.example,v 1.4 2011/12/30 23:21:00 taca Exp $ # # used by www/contao29-example/Makefile # @@ -26,7 +26,7 @@ WWW_EG_FILES?= tl_files/music_academy WWW_FILE?= templates/music_academy.sql .for f in ${WWW_EG_FILES} ${WWW_FILE} -EXTRACT_ELEMENTS+= ${CT_WRKSRC}/${f} +EXTRACT_ELEMENTS+= ${DISTNAME}/${f} .endfor PKG_GROUPS_VARS+= APACHE_GROUP |