Date: Sat, 8 Nov 2003 15:08:59 +0100 From: "Clement Laforet" <sheepkiller@cultdeadsheep.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Clement Laforet <sheepkiller@cultdeadsheep.org> Subject: ports/59054: [maintainer update] www/gforge: Update to 3.1 Message-ID: <20031108140858.7B39043FE5@mx1.FreeBSD.org> Resent-Message-ID: <200311081410.hA8EAGhQ013147@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 59054 >Category: ports >Synopsis: [maintainer update] www/gforge: Update to 3.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Nov 08 06:10:15 PST 2003 >Closed-Date: >Last-Modified: >Originator: Clement Laforet >Release: FreeBSD 5.1-CURRENT i386 >Organization: cotds.org >Environment: System: FreeBSD lucifer.cultdeadsheep.org 5.1-CURRENT FreeBSD 5.1-CURRENT #2: Fri Nov 7 16:11:58 CET 2003 clement@lucifer.cultdeadsheep.org:/usr/obj/usr/src/sys/LUCIFER i386 >Description: Update gforge to 3.1 and misc fixes. >How-To-Repeat: N/A. >Fix: --- gforge-3.1.diff begins here --- Index: gforge/Makefile =================================================================== RCS file: /WORK/REPO/FreeBSD/ports/www/gforge/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- gforge/Makefile 7 Oct 2003 00:09:16 -0000 1.1 +++ gforge/Makefile 8 Nov 2003 13:53:19 -0000 @@ -6,15 +6,14 @@ # PORTNAME= gforge -PORTVERSION= 3.0 +PORTVERSION= 3.1 CATEGORIES= www devel -MASTER_SITES= http://gforge.org/download.php/37/ +MASTER_SITES= http://gforge.org/download.php/44/ MAINTAINER= sheepkiller@cultdeadsheep.org COMMENT= Open Source collaborative software development tool -RUN_DEPENDS= ${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache13 \ - ${LOCALBASE}/bin/php:${PORTSDIR}/lang/php4 \ +RUN_DEPENDS= ${LOCALBASE}/bin/php:${PORTSDIR}/lang/php4 \ ${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget \ ${LOCALBASE}/share/jpgraph/imgdata_balls.inc:${PORTSDIR}/graphics/jpgraph @@ -23,6 +22,7 @@ USE_PERL= YES HAS_CONFIGURE= YES USE_AUTOCONF= YES +USE_APACHE= YES WANT_AUTOCONF_VER= 253 NO_BUILD= YES @@ -36,11 +36,11 @@ BIN_PHP= ${LOCALBASE}/bin/php PQ_LIB= ${LOCALBASE}/lib/libpq.so -IS_INTERACTIVE= "${PORTNAME} need at least PostgreSQL support" +NO_PACKAGE= "The configure process uses hostname." .include <bsd.port.pre.mk> -### Misc check +### Misc checks .if !exists(${MOD_PHP}) && !exists(${BIN_PHP}) IGNORE= "You MUST have installed PHP from lang/php4 \(mod_php et php-cli are required\)" .endif @@ -49,12 +49,12 @@ .endif .if defined(WITH_JABBER) -CONFIGURE_ARGS+=--enable-jabber -RUN_DEPENDS+= ${LOCALBASE}/sbin/jabberd:${PORTSDIR}/net/jabber +CONFIGURE_ARGS+= --enable-jabber +RUN_DEPENDS+= ${LOCALBASE}/sbin/jabberd:${PORTSDIR}/net/jabber .endif .if defined(WITH_MAILMAN) -RUN_DEPENDS= ${LOCALBASE}/mailman:${PORTSDIR}/mail/mailman +RUN_DEPENDS+= ${LOCALBASE}/mailman:${PORTSDIR}/mail/mailman .endif WWW_ROOT?= www @@ -62,15 +62,21 @@ BACKENDS?= share/${PORTNAME}/backends BACKEND_DIR= ${PREFIX}/${BACKENDS} ETC_DIR?= etc/gforge -PLIST_SUB= WWW_ROOT=${WWW_ROOT} BACKEND_DIR="${BACKENDS}" ETC_DIR=${ETC_DIR} +PLIST_SUB+= WWW_ROOT=${WWW_ROOT} BACKEND_DIR="${BACKENDS}" ETC_DIR=${ETC_DIR} WWWROOT= ${PREFIX}/${WWW_ROOT} ETCDIR= ${PREFIX}/${ETC_DIR} -DOMAINNAME?= `hostname | cut -f 2,3 -d "."` +.if !defined(WITH_DOMAINNAME) +HOSTNAME_CMD?= /bin/hostname +SHORT_HOSTNAME!= ${HOSTNAME_CMD} -s +DOMAINNAME!= ${HOSTNAME_CMD} | ${SED} "s,${SHORT_HOSTNAME}\.,," +.else +DOMAINNAME= ${WITH_DOMAINNAME} +.endif CONFIGURE_WRKSRC=${WRKSRC}/contrib/autoconf -CONFIGURE_ARGS= --enable-defaults=FreeBSD --with-domain-name=${DOMAINNAME} \ +CONFIGURE_ARGS+=--enable-defaults=FreeBSD --with-domain-name=${DOMAINNAME} \ --with-sys-path-to-jpgraph=${LOCALBASE}/share/jpgraph/ CONFIGURE_ENV+= "WWWROOT=${WWWROOT}/gforge" @@ -82,7 +88,7 @@ .if defined(SYSTEM_NAME) CONFIGURE_ARGS+= --with-sys-name=${SYSTEM_NAME} .else - @${ECHO_MSG} "You can set your system name with SYSTEM_NAME=<your name>" + @${ECHO_MSG} "You can set your system name with SYSTEM_NAME=<your system name>" .endif post-patch: @@ -97,14 +103,14 @@ @${ECHO_MSG} " ==> Patching perl scripts" @${FIND} ${WRKSRC} -name "*.pl" | ${XARGS} ${REINPLACE_CMD} -e \ "s,/usr/bin/perl,${PERL}," -.for file in utils/groupCreator utils/ldap/ldap-clean utils/ldap/ldap-del-user utils/ldap/ldap-dump utils/ldap/ldap-import utils/ldap/ldap-check-replica monitor/systemdaemon - @${REINPLACE_CMD} -e "s,/usr/bin/perl,${PERL}," ${WRKSRC}/${file} +.for f in utils/groupCreator utils/ldap/ldap-clean utils/ldap/ldap-del-user utils/ldap/ldap-dump utils/ldap/ldap-import utils/ldap/ldap-check-replica monitor/systemdaemon + @${REINPLACE_CMD} -e "s,/usr/bin/perl,${PERL}," ${WRKSRC}/${f} .endfor - @${ECHO_MSG} " ==> preparing blah" - @${REINPLACE_CMD} -e "s,/usr/bin/wget,${LOCALBASE}/wget," ${WRKSRC}/utils/mailing_lists_create.pl + @${ECHO_MSG} " ==> Setting correct path" + @${REINPLACE_CMD} -e "s,/usr/bin/wget,${LOCALBASE}/bin/wget," ${WRKSRC}/utils/mailing_lists_create.pl @${REINPLACE_CMD} -e "s,/usr/bin:/usr/games:/bin,${PATH}," ${WRKSRC}/monitor/systemdaemon -.for file in backend/include.pl utils/include.pl www/include/BaseLanguage.class www/include/pre.php www/include/squal_pre.php - @${REINPLACE_CMD} -e "s,/etc/gforge,${ETCDIR},g" ${WRKSRC}/${file} +.for f in backend/include.pl utils/include.pl www/include/BaseLanguage.class www/include/pre.php www/include/squal_pre.php + @${REINPLACE_CMD} -e "s,/etc/gforge,${ETCDIR},g" ${WRKSRC}/${f} .endfor post-configure: @@ -113,21 +119,21 @@ @${REINPLACE_CMD} -e "s,~/alexandria,${BACKEND_DIR},g" ${WRKSRC}/cronjobs/${CRONFILE} .endfor @${ECHO_MSG} " ==> Cleaning useless file" - @${FIND} ${WRKSRC} -name "*.bak" | ${XARGS} ${RM} -f -.for file in autom4te.cache configure.ac.orig configure.lineno config.log - ${RM} -rfv ${WRKSRC}/contrib/autoconf/${file} + @${FIND} ${WRKSRC} -name "*.bak" -exec ${RM} {} \; +.for f in autom4te.cache configure.ac.orig configure.lineno config.log + @${RM} -rfv ${WRKSRC}/contrib/autoconf/${f} .endfor do-install: - ${MKDIR} ${ETCDIR} + @${MKDIR} ${ETCDIR} @${CP} ${WRKSRC}/contrib/autoconf/local.inc ${ETCDIR}/local.inc-dist @${CP} ${WRKSRC}/contrib/autoconf/sample-apache.vhost ${ETCDIR}/sample-apache.vhost-dist .for dir in ${WWW_STUFF} - ${MKDIR} ${WWWROOT}/gforge/${dir} + @${MKDIR} ${WWWROOT}/gforge/${dir} @${CP} -Rvf ${WRKSRC}/${dir}/* ${WWWROOT}/gforge/${dir} .endfor .for dir in ${BACKEND_STUFF} - ${MKDIR} ${BACKEND_DIR}/${dir} + @${MKDIR} ${BACKEND_DIR}/${dir} @${CP} -Rvf ${WRKSRC}/${dir}/* ${BACKEND_DIR}/${dir} .endfor .for dir in ${SHARE_STUFF} @@ -140,9 +146,9 @@ .endif post-install: - @${ECHO_MSG} "----------------------------------------------------" - @${ECHO_MSG} "To start using gforge just copy ${ETCDIR}/local.in" - @${ECHO_MSG} "to ${ETCDIR}/local.in and edit it. + @${ECHO_MSG} "--------------------------------------------------------" + @${ECHO_MSG} "To start using gforge just copy ${ETCDIR}/local.inc-dist" + @${ECHO_MSG} "to ${ETCDIR}/local.inc and edit it. @${ECHO_MSG} "A sample apache virtualhost can be found here:" @${ECHO_MSG} "${ETCDIR}/sample-apache.vhost-dist" @${ECHO_MSG} "" @@ -153,6 +159,6 @@ @${ECHO_MSG} "gforge is a huge project and complex to configure." @${ECHO_MSG} "If you have some great ideas for this port please" @${ECHO_MSG} "contract me directly (${MAINTAINER})." - @${ECHO_MSG} "----------------------------------------------------" + @${ECHO_MSG} "--------------------------------------------------------" .include <bsd.port.post.mk> Index: gforge/distinfo =================================================================== RCS file: /WORK/REPO/FreeBSD/ports/www/gforge/distinfo,v retrieving revision 1.1 diff -u -r1.1 distinfo --- gforge/distinfo 7 Oct 2003 00:09:16 -0000 1.1 +++ gforge/distinfo 7 Nov 2003 13:13:52 -0000 @@ -1 +1 @@ -MD5 (gforge-3.0.tar.bz2) = b03af8927869a0e38eae63117d10c01c +MD5 (gforge-3.1.tar.bz2) = 857143a2457f8cb736626dc65b264bf4 Index: gforge/pkg-plist =================================================================== RCS file: /WORK/REPO/FreeBSD/ports/www/gforge/pkg-plist,v retrieving revision 1.1 diff -u -r1.1 pkg-plist --- gforge/pkg-plist 7 Oct 2003 00:09:16 -0000 1.1 +++ gforge/pkg-plist 8 Nov 2003 13:51:28 -0000 @@ -81,12 +81,18 @@ %%DATADIR%%/contrib/autoconf/sample-apache.vhost %%DATADIR%%/contrib/autoconf/sample-apache.vhost.in %%DATADIR%%/contrib/autoconf/README.configure +%%DATADIR%%/contrib/rh8_apache20_config/httpd.conf +%%DATADIR%%/contrib/rh8_apache20_config/local.inc +%%DATADIR%%/contrib/rh8_apache20_config/php.conf +%%DATADIR%%/contrib/rh8_apache20_config/php.ini +%%DATADIR%%/contrib/rh8_apache20_config/readme.txt %%DATADIR%%/contrib/userlist.README %%DATADIR%%/contrib/tracker-cc.patch %%DATADIR%%/contrib/tracker-cc.README %%DATADIR%%/contrib/gforge-3.0-php_path.patch %%DATADIR%%/contrib/gforge-3.0-local_config.patch %%DATADIR%%/contrib/userlist.patch +%%DATADIR%%/contrib/gforge.conf %%DATADIR%%/contrib/gforge-3.0-cronjobs.patch %%DATADIR%%/contrib/cmd-line-prototype.tar.gz %%DATADIR%%/contrib/beta1_install_from_scratch_install.php @@ -138,6 +144,7 @@ %%DATADIR%%/db/oci8port/shaguo/SourceForge2.5oci8-Trigger_er.sql %%DATADIR%%/db/oci8port/shaguo/database.php %%DATADIR%%/db/oci8port/shaguo/pgdb-convert.pl +%%DATADIR%%/db/20030822.sql %%DATADIR%%/db/20030513.sql %%DATADIR%%/db/20030312.sql %%DATADIR%%/db/20030209.sql @@ -365,21 +372,9 @@ %%WWW_ROOT%%/gforge/www/themes/gforge/images/ic/tracker20w.png %%WWW_ROOT%%/gforge/www/themes/gforge/images/ic/forum20g.png %%WWW_ROOT%%/gforge/www/themes/gforge/images/ic/msg.png -%%WWW_ROOT%%/gforge/www/themes/gforge/images/fr_login.png -%%WWW_ROOT%%/gforge/www/themes/gforge/images/fr_logout.png -%%WWW_ROOT%%/gforge/www/themes/gforge/images/fr_myaccount.png -%%WWW_ROOT%%/gforge/www/themes/gforge/images/fr_newaccount.png -%%WWW_ROOT%%/gforge/www/themes/gforge/images/login.png %%WWW_ROOT%%/gforge/www/themes/gforge/images/logo.png -%%WWW_ROOT%%/gforge/www/themes/gforge/images/logout.png -%%WWW_ROOT%%/gforge/www/themes/gforge/images/myaccount.png -%%WWW_ROOT%%/gforge/www/themes/gforge/images/newaccount.png %%WWW_ROOT%%/gforge/www/themes/gforge/images/t.png %%WWW_ROOT%%/gforge/www/themes/gforge/images/t2.png -%%WWW_ROOT%%/gforge/www/themes/gforge/images/it_login.png -%%WWW_ROOT%%/gforge/www/themes/gforge/images/it_logout.png -%%WWW_ROOT%%/gforge/www/themes/gforge/images/it_myaccount.png -%%WWW_ROOT%%/gforge/www/themes/gforge/images/it_newaccount.png %%WWW_ROOT%%/gforge/www/themes/gforge/images/clear.png %%WWW_ROOT%%/gforge/www/themes/gforge/Theme.class %%WWW_ROOT%%/gforge/www/themes/osx/images/ic/forum20w.png @@ -511,6 +506,7 @@ %%WWW_ROOT%%/gforge/www/tracker/taskmgr.php %%WWW_ROOT%%/gforge/www/tracker/add.php %%WWW_ROOT%%/gforge/www/tracker/detail.php +%%WWW_ROOT%%/gforge/www/tracker/mod-limited.php %%WWW_ROOT%%/gforge/www/survey/admin/survey_utils.php %%WWW_ROOT%%/gforge/www/survey/admin/add_survey.php %%WWW_ROOT%%/gforge/www/survey/admin/edit_question.php @@ -735,6 +731,7 @@ @dirrm %%BACKEND_DIR%%/utils @unexec rmdir %D/%%BACKEND_DIR%% 2>/dev/null || true @dirrm %%DATADIR%%/contrib/autoconf +@dirrm %%DATADIR%%/contrib/rh8_apache20_config @dirrm %%DATADIR%%/contrib @dirrm %%DATADIR%%/db/SQL_2.5 @dirrm %%DATADIR%%/db/SQL_migrate-2.5-to-2.6 --- gforge-3.1.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20031108140858.7B39043FE5>