Sat Mar 5 11:44:55 2011 UTC ()
Pullup ticket #3375 - requested by taca
www/typo3: dependence fix

Revisions pulled up:
- www/typo3/Makefile						1.32
---
Module Name:	pkgsrc
Committed By:	bouyer
Date:		Wed Mar	2 19:06:09 UTC 2011

Modified Files:
	pkgsrc/www/typo3: Makefile

Log Message:
This requires php-json


(tron)
diff -r1.28.2.1 -r1.28.2.2 pkgsrc/www/typo3/Makefile
cvs diff -r1.28.2.1 -r1.28.2.2 pkgsrc/www/typo3/Attic/Makefile (switch to unified diff)

--- pkgsrc/www/typo3/Attic/Makefile 2011/02/22 15:12:59 1.28.2.1
+++ pkgsrc/www/typo3/Attic/Makefile 2011/03/05 11:44:54 1.28.2.2
@@ -1,98 +1,100 @@ @@ -1,98 +1,100 @@
1# $NetBSD: Makefile,v 1.28.2.1 2011/02/22 15:12:59 tron Exp $ 1# $NetBSD: Makefile,v 1.28.2.2 2011/03/05 11:44:54 tron Exp $
2# 2#
3 3
4DISTNAME= ${TYPO3NAME} 4DISTNAME= ${TYPO3NAME}
5PKGNAME= typo3-${VER} 5PKGNAME= typo3-${VER}
 6PKGREVISION= 1
6CATEGORIES= www 7CATEGORIES= www
7MASTER_SITES= http://dl1.typo3.org/TYPO3_${VER}/ 8MASTER_SITES= http://dl1.typo3.org/TYPO3_${VER}/
8#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=typo3/} 9#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=typo3/}
9DISTFILES= ${TYPO3NAME}${EXTRACT_SUFX} ${SITESRC}${EXTRACT_SUFX} 10DISTFILES= ${TYPO3NAME}${EXTRACT_SUFX} ${SITESRC}${EXTRACT_SUFX}
10 11
11MAINTAINER= taca@NetBSD.org 12MAINTAINER= taca@NetBSD.org
12HOMEPAGE= http://typo3.com/ 13HOMEPAGE= http://typo3.com/
13COMMENT= The typo3 content management system 14COMMENT= The typo3 content management system
14LICENSE= gnu-gpl-v2 15LICENSE= gnu-gpl-v2
15 16
16DEPENDS+= ${PHP_PKG_PREFIX}-{mysql,pgsql}>=5.1.0:../../databases/php-mysql 17DEPENDS+= ${PHP_PKG_PREFIX}-{mysql,pgsql}>=5.1.0:../../databases/php-mysql
17DEPENDS+= ${PHP_PKG_PREFIX}-zlib>=5.2.0:../../archivers/php-zlib/ 18DEPENDS+= ${PHP_PKG_PREFIX}-zlib>=5.2.0:../../archivers/php-zlib/
 19DEPENDS+= ${PHP_PKG_PREFIX}-json>=5.2.0:../../textproc/php-json
18 20
19PKG_DESTDIR_SUPPORT= user-destdir 21PKG_DESTDIR_SUPPORT= user-destdir
20 22
21VER= 4.5.0 23VER= 4.5.0
22NO_BUILD= yes 24NO_BUILD= yes
23USE_TOOLS= pax 25USE_TOOLS= pax
24 26
25TYPO3NAME= typo3_src-${VER} 27TYPO3NAME= typo3_src-${VER}
26SITESRC= dummy-${VER} 28SITESRC= dummy-${VER}
27 29
28# maybe resides in lang/php/phpversion.mk 30# maybe resides in lang/php/phpversion.mk
29REPLACE_INTERPRETER+= php 31REPLACE_INTERPRETER+= php
30REPLACE.php.old= .*php[^ ]* 32REPLACE.php.old= .*php[^ ]*
31REPLACE.php.new= ${PREFIX}/bin/php 33REPLACE.php.new= ${PREFIX}/bin/php
32REPLACE_FILES.php= typo3/cli_dispatch.phpsh \ 34REPLACE_FILES.php= typo3/cli_dispatch.phpsh \
33 typo3/mod/user/ws/cli/ws_cli.phpsh \ 35 typo3/mod/user/ws/cli/ws_cli.phpsh \
34 typo3/sysext/indexed_search/cli/indexer_cli.phpsh 36 typo3/sysext/indexed_search/cli/indexer_cli.phpsh
35 37
36TYPO3DATADIR= fileadmin fileadmin/_temp_ fileadmin/user_upload \ 38TYPO3DATADIR= fileadmin fileadmin/_temp_ fileadmin/user_upload \
37 typo3conf typo3conf/ext typo3conf/l10n typo3temp uploads \ 39 typo3conf typo3conf/ext typo3conf/l10n typo3temp uploads \
38 uploads/media uploads/pics uploads/tf 40 uploads/media uploads/pics uploads/tf
39 41
40BUILD_DEFS+= APACHE_GROUP 42BUILD_DEFS+= APACHE_GROUP
41 43
42FILES_SUBST+= TYPO3DIR=${TYPO3DIR:Q} SITEDIR=${SITEDIR:Q} 44FILES_SUBST+= TYPO3DIR=${TYPO3DIR:Q} SITEDIR=${SITEDIR:Q}
43PLIST_SUBST+= EGDIR=${EGDIR:Q} SITEDIR=${SITEDIR:Q} \ 45PLIST_SUBST+= EGDIR=${EGDIR:Q} SITEDIR=${SITEDIR:Q} \
44 TYPO3DIR=${TYPO3DIR:Q} TYPO3NAME=${TYPO3NAME:Q} 46 TYPO3DIR=${TYPO3DIR:Q} TYPO3NAME=${TYPO3NAME:Q}
45 47
46EGDIR= share/examples/typo3 48EGDIR= share/examples/typo3
47 49
48INSTALLATION_DIRS+= ${EGDIR} ${TYPO3DIR}/${SITEDIR} ${TYPO3DIR}/${TYPO3NAME} 50INSTALLATION_DIRS+= ${EGDIR} ${TYPO3DIR}/${SITEDIR} ${TYPO3DIR}/${TYPO3NAME}
49 51
50CONF_FILES_PERMS+= ${EGDIR}/localconf.php \ 52CONF_FILES_PERMS+= ${EGDIR}/localconf.php \
51 ${TYPO3DIR}/${SITEDIR}/typo3conf/localconf.php \ 53 ${TYPO3DIR}/${SITEDIR}/typo3conf/localconf.php \
52 ${REAL_ROOT_USER} ${APACHE_GROUP} 0660 54 ${REAL_ROOT_USER} ${APACHE_GROUP} 0660
53 55
54.for d in ${TYPO3DATADIR} 56.for d in ${TYPO3DATADIR}
55OWN_DIRS_PERMS+= ${TYPO3DIR}/${SITEDIR}/${d} ${REAL_ROOT_USER} \ 57OWN_DIRS_PERMS+= ${TYPO3DIR}/${SITEDIR}/${d} ${REAL_ROOT_USER} \
56 ${APACHE_GROUP} 0770 58 ${APACHE_GROUP} 0770
57CHECK_PERMS_SKIP+= ${TYPO3DIR}/${SITEDIR}/${d} 59CHECK_PERMS_SKIP+= ${TYPO3DIR}/${SITEDIR}/${d}
58.endfor 60.endfor
59 61
60SUBST_CLASSES+= conf 62SUBST_CLASSES+= conf
61SUBST_FILES.conf+= ${WRKDIR}/README 63SUBST_FILES.conf+= ${WRKDIR}/README
62SUBST_FILES.conf+= ${WRKSRC}/t3lib/config_default.php 64SUBST_FILES.conf+= ${WRKSRC}/t3lib/config_default.php
63SUBST_SED.conf+= -e 's|@PREFIX@|${PREFIX:Q}|g' 65SUBST_SED.conf+= -e 's|@PREFIX@|${PREFIX:Q}|g'
64SUBST_SED.conf+= -e 's|@TYPO3DIR@|${TYPO3DIR:Q}|g' 66SUBST_SED.conf+= -e 's|@TYPO3DIR@|${TYPO3DIR:Q}|g'
65SUBST_SED.conf+= -e 's|@SITEDIR@|${SITEDIR:Q}|g' 67SUBST_SED.conf+= -e 's|@SITEDIR@|${SITEDIR:Q}|g'
66SUBST_STAGE.conf= post-configure 68SUBST_STAGE.conf= post-configure
67 69
68PRINT_PLIST_AWK+= /^${EGDIR:S|/|\\/|g}/ \ 70PRINT_PLIST_AWK+= /^${EGDIR:S|/|\\/|g}/ \
69 { gsub(/${EGDIR:S|/|\\/|g}/, "$${EGDIR}") } 71 { gsub(/${EGDIR:S|/|\\/|g}/, "$${EGDIR}") }
70PRINT_PLIST_AWK+= /^${TYPO3DIR:S|/|\\/|g}\/${TYPO3NAME}/ \ 72PRINT_PLIST_AWK+= /^${TYPO3DIR:S|/|\\/|g}\/${TYPO3NAME}/ \
71 { gsub(/${TYPO3DIR:S|/|\\/|g}\/${TYPO3NAME}/, \ 73 { gsub(/${TYPO3DIR:S|/|\\/|g}\/${TYPO3NAME}/, \
72 "$${TYPO3DIR}/$${TYPO3NAME}") } 74 "$${TYPO3DIR}/$${TYPO3NAME}") }
73PRINT_PLIST_AWK+= /^${TYPO3DIR:S|/|\\/|g}\/${SITEDIR}/ \ 75PRINT_PLIST_AWK+= /^${TYPO3DIR:S|/|\\/|g}\/${SITEDIR}/ \
74 { gsub(/${TYPO3DIR:S|/|\\/|g}\/${SITEDIR}/, \ 76 { gsub(/${TYPO3DIR:S|/|\\/|g}\/${SITEDIR}/, \
75 "$${TYPO3DIR}/$${SITEDIR}") } 77 "$${TYPO3DIR}/$${SITEDIR}") }
76 78
77.include "../../mk/bsd.prefs.mk" 79.include "../../mk/bsd.prefs.mk"
78 80
79SITEDIR?= www 81SITEDIR?= www
80TYPO3DIR?= share/typo3 82TYPO3DIR?= share/typo3
81 83
82post-extract: 84post-extract:
83 ${CP} ${FILESDIR}/README ${WRKDIR} 85 ${CP} ${FILESDIR}/README ${WRKDIR}
84 86
85pre-install: 87pre-install:
86 ${FIND} ${WRKSRC:Q} -name "*.orig*" -exec ${RM} -f {} \; 88 ${FIND} ${WRKSRC:Q} -name "*.orig*" -exec ${RM} -f {} \;
87 89
88do-install: 90do-install:
89 cd ${WRKSRC}; \ 91 cd ${WRKSRC}; \
90 pax -rw . ${DESTDIR}${PREFIX}/${TYPO3DIR}/${TYPO3NAME} 92 pax -rw . ${DESTDIR}${PREFIX}/${TYPO3DIR}/${TYPO3NAME}
91 cd ${WRKDIR}/${SITESRC}; \ 93 cd ${WRKDIR}/${SITESRC}; \
92 pax -rw . ${DESTDIR}${PREFIX}/${TYPO3DIR}/${SITEDIR} 94 pax -rw . ${DESTDIR}${PREFIX}/${TYPO3DIR}/${SITEDIR}
93 ${RM} -f ${DESTDIR}${PREFIX}/${TYPO3DIR}/${SITEDIR}/typo3conf/localconf.php 95 ${RM} -f ${DESTDIR}${PREFIX}/${TYPO3DIR}/${SITEDIR}/typo3conf/localconf.php
94 ${INSTALL_DATA} ${WRKDIR}/${SITESRC}/typo3conf/localconf.php \ 96 ${INSTALL_DATA} ${WRKDIR}/${SITESRC}/typo3conf/localconf.php \
95 ${DESTDIR}${PREFIX}/${EGDIR} 97 ${DESTDIR}${PREFIX}/${EGDIR}
96 98
97.include "../../lang/php/phpversion.mk" 99.include "../../lang/php/phpversion.mk"
98.include "../../mk/bsd.pkg.mk" 100.include "../../mk/bsd.pkg.mk"