diff options
| -rw-r--r-- | devel/chora/Makefile | 16 | ||||
| -rw-r--r-- | devel/chora/distinfo | 2 | ||||
| -rw-r--r-- | devel/chora/pkg-plist | 2 | ||||
| -rw-r--r-- | devel/horde-chora/Makefile | 16 | ||||
| -rw-r--r-- | devel/horde-chora/distinfo | 2 | ||||
| -rw-r--r-- | devel/horde-chora/pkg-plist | 2 |
6 files changed, 28 insertions, 12 deletions
diff --git a/devel/chora/Makefile b/devel/chora/Makefile index 9681232a0e1..c8230b1b306 100644 --- a/devel/chora/Makefile +++ b/devel/chora/Makefile @@ -7,15 +7,13 @@ PORTNAME= chora PORTVERSION= 1.1 +PORTREVISION= 1 CATEGORIES= devel www -MASTER_SITES= ftp://ftp.horde.org/pub/chora/tarballs/ \ - ftp://ftp.uk.horde.org/mirrors/ftp.horde.org/pub/chora/tarballs/ -DISTNAME= ${PORTNAME}-${PORTVERSION}-RC1 +MASTER_SITES= ftp://ftp.horde.org/pub/chora/tarballs/%SUBDIR%/ +MASTER_SITE_SUBDIR= . old MAINTAINER= thierry@pompo.net -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} - #----------------------------------------------------------------------- # You may define these options: # @@ -79,12 +77,20 @@ do-install: @${CP} -p ${FILESDIR}/httpd.conf.chora ${HORDE_INC} @${PERL} -pi -e "s:/home/httpd/html/horde/chora:${CHORADIR}:g" \ ${HORDE_INC}/httpd.conf.chora + @${CP} -p ${HORDEDIR}/config/registry.php \ + ${HORDEDIR}/config/registry.php.beforeChora + @${CP} -p ${HORDEDIR}/config/mime_drivers.php \ + ${HORDEDIR}/config/mime_drivers.php.beforeChora @${PERL} -pi -e "s://UNCOMMENTWHENINSTCHORA::" \ ${HORDEDIR}/config/registry.php .if !defined(WITHOUT_ENSCRIPT) @${PERL} -pi -e "s://UNCOMMENTWHENINSTCHORA::" \ ${HORDEDIR}/config/mime_drivers.php .endif + @${CP} -p ${HORDEDIR}/config/registry.php \ + ${HORDEDIR}/config/registry.php.afterChora + @${CP} -p ${HORDEDIR}/config/mime_drivers.php \ + ${HORDEDIR}/config/mime_drivers.php.afterChora .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} .for FILE in ${DOCS} diff --git a/devel/chora/distinfo b/devel/chora/distinfo index 5f03ee081fe..4524fff306c 100644 --- a/devel/chora/distinfo +++ b/devel/chora/distinfo @@ -1 +1 @@ -MD5 (chora-1.1-RC1.tar.gz) = b90276bbf6d731943f596cefdd16c863 +MD5 (chora-1.1.tar.gz) = fffcdc04a6440ec42bdc62de79941a4a diff --git a/devel/chora/pkg-plist b/devel/chora/pkg-plist index e9df2d1c0e8..bd94f74e373 100644 --- a/devel/chora/pkg-plist +++ b/devel/chora/pkg-plist @@ -147,3 +147,5 @@ etc/horde/httpd.conf.chora @dirrm %%CHORADIR%%/templates/log @dirrm %%CHORADIR%%/templates @dirrm %%CHORADIR%% +@unexec if cmp -s %D/www/horde/config/mime_drivers.php %D/www/horde/config/mime_drivers.php.afterChora; then rm -f %D/www/horde/config/mime_drivers.php.afterChora; mv %D/www/horde/config/mime_drivers.php.beforeChora %D/www/horde/config/mime_drivers.php; fi +@unexec if cmp -s %D/www/horde/config/registry.php %D/www/horde/config/registry.php.afterChora; then rm -f %D/www/horde/config/registry.php.afterChora; mv %D/www/horde/config/registry.php.beforeChora %D/www/horde/config/registry.php; fi diff --git a/devel/horde-chora/Makefile b/devel/horde-chora/Makefile index 9681232a0e1..c8230b1b306 100644 --- a/devel/horde-chora/Makefile +++ b/devel/horde-chora/Makefile @@ -7,15 +7,13 @@ PORTNAME= chora PORTVERSION= 1.1 +PORTREVISION= 1 CATEGORIES= devel www -MASTER_SITES= ftp://ftp.horde.org/pub/chora/tarballs/ \ - ftp://ftp.uk.horde.org/mirrors/ftp.horde.org/pub/chora/tarballs/ -DISTNAME= ${PORTNAME}-${PORTVERSION}-RC1 +MASTER_SITES= ftp://ftp.horde.org/pub/chora/tarballs/%SUBDIR%/ +MASTER_SITE_SUBDIR= . old MAINTAINER= thierry@pompo.net -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} - #----------------------------------------------------------------------- # You may define these options: # @@ -79,12 +77,20 @@ do-install: @${CP} -p ${FILESDIR}/httpd.conf.chora ${HORDE_INC} @${PERL} -pi -e "s:/home/httpd/html/horde/chora:${CHORADIR}:g" \ ${HORDE_INC}/httpd.conf.chora + @${CP} -p ${HORDEDIR}/config/registry.php \ + ${HORDEDIR}/config/registry.php.beforeChora + @${CP} -p ${HORDEDIR}/config/mime_drivers.php \ + ${HORDEDIR}/config/mime_drivers.php.beforeChora @${PERL} -pi -e "s://UNCOMMENTWHENINSTCHORA::" \ ${HORDEDIR}/config/registry.php .if !defined(WITHOUT_ENSCRIPT) @${PERL} -pi -e "s://UNCOMMENTWHENINSTCHORA::" \ ${HORDEDIR}/config/mime_drivers.php .endif + @${CP} -p ${HORDEDIR}/config/registry.php \ + ${HORDEDIR}/config/registry.php.afterChora + @${CP} -p ${HORDEDIR}/config/mime_drivers.php \ + ${HORDEDIR}/config/mime_drivers.php.afterChora .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} .for FILE in ${DOCS} diff --git a/devel/horde-chora/distinfo b/devel/horde-chora/distinfo index 5f03ee081fe..4524fff306c 100644 --- a/devel/horde-chora/distinfo +++ b/devel/horde-chora/distinfo @@ -1 +1 @@ -MD5 (chora-1.1-RC1.tar.gz) = b90276bbf6d731943f596cefdd16c863 +MD5 (chora-1.1.tar.gz) = fffcdc04a6440ec42bdc62de79941a4a diff --git a/devel/horde-chora/pkg-plist b/devel/horde-chora/pkg-plist index e9df2d1c0e8..bd94f74e373 100644 --- a/devel/horde-chora/pkg-plist +++ b/devel/horde-chora/pkg-plist @@ -147,3 +147,5 @@ etc/horde/httpd.conf.chora @dirrm %%CHORADIR%%/templates/log @dirrm %%CHORADIR%%/templates @dirrm %%CHORADIR%% +@unexec if cmp -s %D/www/horde/config/mime_drivers.php %D/www/horde/config/mime_drivers.php.afterChora; then rm -f %D/www/horde/config/mime_drivers.php.afterChora; mv %D/www/horde/config/mime_drivers.php.beforeChora %D/www/horde/config/mime_drivers.php; fi +@unexec if cmp -s %D/www/horde/config/registry.php %D/www/horde/config/registry.php.afterChora; then rm -f %D/www/horde/config/registry.php.afterChora; mv %D/www/horde/config/registry.php.beforeChora %D/www/horde/config/registry.php; fi |