pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www/typo3 * Correct some permission of directories/fil...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/e0fd4f95ffd5
branches:  trunk
changeset: 547615:e0fd4f95ffd5
user:      taca <taca%pkgsrc.org@localhost>
date:      Mon Sep 22 15:42:56 2008 +0000

description:
* Correct some permission of directories/files to make it work.
* Allow depends on php-pgsql.
* Handle ${TYPO3DIR}/${SITEDIR}/typo3conf/localconf.php as configuration
  file with CONF_FILES_PERMS.
* Install README file, very simple guide for set up.

Bump PKGREVISION.

diffstat:

 www/typo3/DEINSTALL    |   7 ++++++-
 www/typo3/Makefile     |  36 ++++++++++++++++++++++++++++--------
 www/typo3/PLIST        |  18 +++---------------
 www/typo3/files/README |  14 ++++++++++++++
 4 files changed, 51 insertions(+), 24 deletions(-)

diffs (161 lines):

diff -r e2a20d6ca77d -r e0fd4f95ffd5 www/typo3/DEINSTALL
--- a/www/typo3/DEINSTALL       Mon Sep 22 15:34:47 2008 +0000
+++ b/www/typo3/DEINSTALL       Mon Sep 22 15:42:56 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: DEINSTALL,v 1.1.1.1 2008/09/15 18:13:38 taca Exp $
+# $NetBSD: DEINSTALL,v 1.2 2008/09/22 15:42:56 taca Exp $
 
 DIR="@PREFIX@/@TYPO3DIR@/@SITEDIR@"
 TYPO3DIRS="uploads/tf uploads/pics uploads/media uploads typo3temp \
@@ -8,8 +8,13 @@
 
 case ${STAGE} in
 DEINSTALL)
+       (
+       cd ${DIR}
+       ${RM} -f typo3conf/temp*.php
+       ${RM} -rf typo3temp/*
        for d in ${TYPO3DIRS}; do
                ${RMDIR} $d 2>/dev/null
        done
+       )
        ;;
 esac
diff -r e2a20d6ca77d -r e0fd4f95ffd5 www/typo3/Makefile
--- a/www/typo3/Makefile        Mon Sep 22 15:34:47 2008 +0000
+++ b/www/typo3/Makefile        Mon Sep 22 15:42:56 2008 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2008/09/16 13:31:26 taca Exp $
+# $NetBSD: Makefile,v 1.4 2008/09/22 15:42:56 taca Exp $
 #
 
 DISTNAME=      ${TYPO3NAME}
 PKGNAME=       typo3-${VER}
+PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=typo3/}
 DISTFILES=     ${TYPO3NAME}${EXTRACT_SUFX} ${SITESRC}${EXTRACT_SUFX}
@@ -12,7 +13,7 @@
 COMMENT=       The typo3 content management system
 
 DEPENDS+=      ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=5.2.0:../../www/ap-php
-DEPENDS+=      ${PHP_PKG_PREFIX}-mysql>=5.2.0:../../databases/php-mysql
+DEPENDS+=      ${PHP_PKG_PREFIX}-{mysql,pgsql}>=5.1.0:../../databases/php-mysql
 DEPENDS+=      ${PHP_PKG_PREFIX}-zlib>=5.2.0:../../archivers/php-zlib/
 
 #PKG_DESTDIR_SUPPORT=  user-destdir
@@ -34,30 +35,49 @@
                        typo3/mod/user/ws/cli/ws_cli.phpsh \
                        typo3/sysext/indexed_search/cli/indexer_cli.phpsh
 
-TYPO3DATA=     fileadmin typo3conf typo3temp uploads
+TYPO3DATADIR=  fileadmin fileadmin/_temp_ fileadmin/user_upload \
+               typo3conf typo3conf/ext typo3conf/l10n typo3temp uploads \
+               uploads/media uploads/pics uploads/tf
 
 BUILD_DEFS+=   APACHE_GROUP
 
 FILES_SUBST+=  TYPO3DIR=${TYPO3DIR:Q} SITEDIR=${SITEDIR:Q}
-PLIST_SUBST+=  SITEDIR=${SITEDIR:Q} TYPO3DIR=${TYPO3DIR:Q} \
-               TYPO3NAME=${TYPO3NAME:Q}
+PLIST_SUBST+=  EGDIR=${EGDIR:Q} SITEDIR=${SITEDIR:Q} \
+               TYPO3DIR=${TYPO3DIR:Q} TYPO3NAME=${TYPO3NAME:Q}
+
+EGDIR=         share/examples/typo3
+
+INSTALLATION_DIRS+= ${EGDIR} ${TYPO3DIR}/${SITEDIR} ${TYPO3DIR}/${TYPO3NAME}
 
-INSTALLATION_DIRS+= ${TYPO3DIR}/${SITEDIR} ${TYPO3DIR}/${TYPO3NAME}
+CONF_FILES_PERMS+=     ${EGDIR}/localconf.php \
+                       ${TYPO3DIR}/${SITEDIR}/typo3conf/localconf.php \
+                       ${BINOWN} ${APACHE_GROUP} 0660
 
-.for d in ${TYPO3DATA}
-SPECIAL_PERMS+=        ${TYPO3DIR}/${SITEDIR}/${d} ${BINOWN} ${APACHE_GROUP} 0770
+.for d in ${TYPO3DATADIR}
+OWN_DIRS_PERMS+= ${TYPO3DIR}/${SITEDIR}/${d} ${BINOWN} ${APACHE_GROUP} 0770
 CHECK_PERMS_SKIP+= ${TYPO3DIR}/${SITEDIR}/${d}
 .endfor
 
+SUBST_CLASSES+=                conf
+SUBST_FILES.conf+=     ${WRKDIR}/README
+SUBST_SED.conf+=        -e 's|@PREFIX@|${PREFIX:Q}|g'
+SUBST_SED.conf+=        -e 's|@TYPO3DIR@|${TYPO3DIR:Q}|g'
+SUBST_SED.conf+=        -e 's|@SITEDIR@|${SITEDIR:Q}|g'
+SUBST_STAGE.conf=      post-configure
+
 .include "../../mk/bsd.prefs.mk"
 
 SITEDIR?=      www
 TYPO3DIR?=     share/typo3
 
+post-extract:
+       ${CP} ${FILESDIR}/README ${WRKDIR}
+
 do-install:
        cd ${WRKSRC}; pax -rw . ${DESTDIR}${PREFIX}/${TYPO3DIR}/${TYPO3NAME}
        cd ${WRKDIR}/${SITESRC}; \
                pax -rw . ${DESTDIR}${PREFIX}/${TYPO3DIR}/${SITEDIR}
+       ${INSTALL_DATA} ${WRKDIR}/localconf.php ${DESTDIR}${PREFIX}/${EGDIR}
 
 .include "../../mk/apachever.mk"
 .include "../../lang/php/phpversion.mk"
diff -r e2a20d6ca77d -r e0fd4f95ffd5 www/typo3/PLIST
--- a/www/typo3/PLIST   Mon Sep 22 15:34:47 2008 +0000
+++ b/www/typo3/PLIST   Mon Sep 22 15:42:56 2008 +0000
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/09/15 18:13:38 taca Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/09/22 15:42:56 taca Exp $
+${EGDIR}/localconf.php
 ${TYPO3DIR}/${TYPO3NAME}/ChangeLog
 ${TYPO3DIR}/${TYPO3NAME}/GPL.txt
 ${TYPO3DIR}/${TYPO3NAME}/INSTALL.txt
@@ -3884,25 +3885,11 @@
 ${TYPO3DIR}/${SITEDIR}/fileadmin/_temp_/index.html
 ${TYPO3DIR}/${SITEDIR}/typo3conf/extTables.php
 ${TYPO3DIR}/${SITEDIR}/typo3conf/index.html
-${TYPO3DIR}/${SITEDIR}/typo3conf/localconf.php
 ${TYPO3DIR}/${SITEDIR}/typo3_src
 ${TYPO3DIR}/${SITEDIR}/typo3
 ${TYPO3DIR}/${SITEDIR}/t3lib
 ${TYPO3DIR}/${SITEDIR}/index.php
 ${TYPO3DIR}/${SITEDIR}/uploads/index.html
-@dirrm ${TYPO3DIR}/${SITEDIR}/uploads/tf
-@dirrm ${TYPO3DIR}/${SITEDIR}/uploads/pics
-@dirrm ${TYPO3DIR}/${SITEDIR}/uploads/media
-@dirrm ${TYPO3DIR}/${SITEDIR}/uploads
-@dirrm ${TYPO3DIR}/${SITEDIR}/typo3temp
-@dirrm ${TYPO3DIR}/${SITEDIR}/typo3conf/l10n
-@dirrm ${TYPO3DIR}/${SITEDIR}/typo3conf/ext
-@dirrm ${TYPO3DIR}/${SITEDIR}/typo3conf
-@dirrm ${TYPO3DIR}/${SITEDIR}/fileadmin/user_upload/_temp_
-@dirrm ${TYPO3DIR}/${SITEDIR}/fileadmin/user_upload
-@dirrm ${TYPO3DIR}/${SITEDIR}/fileadmin/_temp_
-@dirrm ${TYPO3DIR}/${SITEDIR}/fileadmin
-@dirrm ${TYPO3DIR}/${SITEDIR}
 @dirrm ${TYPO3DIR}/${TYPO3NAME}/typo3/templates
 @dirrm ${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/wizard_sortpages/cshimages
 @dirrm ${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/wizard_sortpages
@@ -4288,3 +4275,4 @@
 @dirrm ${TYPO3DIR}/${TYPO3NAME}/misc
 @dirrm ${TYPO3DIR}/${TYPO3NAME}
 @unexec ${RMDIR} %D/${TYPO3DIR} >/dev/null 2>&1
+@dirrm ${EGDIR}
diff -r e2a20d6ca77d -r e0fd4f95ffd5 www/typo3/files/README
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/typo3/files/README    Mon Sep 22 15:42:56 2008 +0000
@@ -0,0 +1,14 @@
+$NetBSD: README,v 1.1 2008/09/22 15:42:56 taca Exp $
+
+1. Set up typo3; Add below line in your httpd.conf.
+
+       Alias   /typo3  @PREFIX@/@TYPO3DIR@/@SITEDIR@
+
+   Or set DocumentRoot to @PREFIX@/@TYPO3DIR@/@SITEDIR@.
+
+2. First, enable TYPO3 installer.
+
+       # cp /dev/null @PREFIX@/@TYPO3DIR@/@SITEDIR@/typo3conf/ENABLE_INSTALL_TOOL
+
+3. Access typo3 site.  You will be redirected to installer.
+



Home | Main Index | Thread Index | Old Index