Index: head/devel/cvsweb3/Makefile =================================================================== --- head/devel/cvsweb3/Makefile (revision 467473) +++ head/devel/cvsweb3/Makefile (revision 467474) @@ -1,105 +1,103 @@ # Created by: SADA Kenji # $FreeBSD$ PORTNAME= cvsweb PORTVERSION= 3.0.6 PORTREVISION= 5 CATEGORIES= devel www MASTER_SITES= LOCAL/scop http://people.FreeBSD.org/~scop/cvsweb/ PKGNAMESUFFIX= 3 # For issues that are not specific to this port/package, please consult # the mailing list. MAINTAINER= noackjr@alumni.rice.edu COMMENT= WWW CGI script to browse CVS repository trees version 3 LICENSE= BSD2CLAUSE RUN_DEPENDS= p5-IPC-Run>=0:devel/p5-IPC-Run \ p5-URI>=0:net/p5-URI # The following extra dependencies are optional, but CVSweb works the # best with them. RUN_DEPENDS+= p5-MIME-Types>=0:mail/p5-MIME-Types \ p5-String-Ediff>=0:devel/p5-String-Ediff \ cvsgraph:devel/cvsgraph # Use PAPERSIZE to avoid a stale dependency on Enscript. PAPERSIZE?= letter RUN_DEPENDS+= enscript:print/enscript-${PAPERSIZE} CONFLICTS= cvsweb-2.* USES= perl5 shebangfix SHEBANG_FILES= cvsweb.cgi NO_BUILD= yes NO_ARCH= yes .include # Specify where your repository belongs. # (You can reconfigure it after installation anyway) .if defined(PACKAGE_BUILDING) || !defined(CVSROOT) || empty(CVSROOT) CVSROOT= /home/cvs .endif # Specify the title of your cvsweb site. TITLE?= My CVS Repository # Specify these directories in relative paths to ${PREFIX}. .if exists(${PREFIX}/www/cgi-bin) DIRPREFIX= www .elif exists(${PREFIX}/www/apache24/cgi-bin) DIRPREFIX= www/apache24 -.elif exists(${PREFIX}/www/apache22/cgi-bin) -DIRPREFIX= www/apache22 .elif exists(${PREFIX}/apache/cgi-bin) DIRPREFIX= apache .else DIRPREFIX= share/apache .endif CGIDIR?= ${DIRPREFIX}/cgi-bin ICONSDIR?= ${DIRPREFIX}/icons CSSDIR?= ${DIRPREFIX}/data/css CONFFILES= cvsweb.conf \ cvsweb.conf-freebsd \ cvsweb.conf-openbsd \ cvsweb.conf-netbsd \ cvsweb.conf-ruby PLIST_SUB+= CGIDIR="${CGIDIR}" ICONSDIR="${ICONSDIR}" CSSDIR="${CSSDIR}" \ DIRPREFIX="${DIRPREFIX}" SUB_FILES= pkg-message SUB_LIST= PREFIX="${PREFIX}" DOCSDIR="${DOCSDIR}" post-patch: @${SED} -i '' -e 's,/usr/local/etc/,${PREFIX}/etc/,' \ -e 's,\(qw(hi.*)\),(\1),' ${WRKSRC}/cvsweb.cgi @${REINPLACE_CMD} -i '' -e 's,!!PREFIX!!,${PREFIX},' \ -e 's,!!CVSROOT!!,${CVSROOT},' \ -e 's,!!TITLE!!,${TITLE},' \ ${WRKSRC}/cvsweb.conf do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/${CGIDIR} ${INSTALL_SCRIPT} ${WRKSRC}/cvsweb.cgi ${STAGEDIR}${PREFIX}/${CGIDIR}/ @${MKDIR} ${STAGEDIR}${PREFIX}/etc/cvsweb .for f in ${CONFFILES} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/etc/cvsweb/${f}.dist .endfor @${MKDIR} ${STAGEDIR}${PREFIX}/${ICONSDIR}/cvsweb ${INSTALL_DATA} ${WRKSRC}/icons/* ${STAGEDIR}${PREFIX}/${ICONSDIR}/cvsweb/ @${MKDIR} ${STAGEDIR}${PREFIX}/${CSSDIR}/cvsweb ${INSTALL_DATA} ${WRKSRC}/css/*.css ${STAGEDIR}${PREFIX}/${CSSDIR}/cvsweb/ @${MKDIR} ${STAGEDIR}${PREFIX}/share/enscript/hl ${INSTALL_DATA} ${WRKSRC}/enscript/*.st ${STAGEDIR}${PREFIX}/share/enscript/hl/ @${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ChangeLog INSTALL NEWS README TODO ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/ .endfor @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/samples/* ${STAGEDIR}${EXAMPLESDIR}/ .include Index: head/www/mod_memcache_block/Makefile =================================================================== --- head/www/mod_memcache_block/Makefile (revision 467473) +++ head/www/mod_memcache_block/Makefile (revision 467474) @@ -1,25 +1,27 @@ # Created by: Hung-Yi Chen # $FreeBSD$ PORTNAME= mod_memcache_block PORTVERSION= 20120821 PORTREVISION= 1 CATEGORIES= www DIST_SUBDIR= apache2 MAINTAINER= gaod@hychen.org COMMENT= Apache 2.2 module to block IPs from lists stored in memcache LIB_DEPENDS+= libmemcached.so:databases/libmemcached USE_GITHUB= yes GH_ACCOUNT= netik GH_TAGNAME= 7b1fcec -USES= apache:2.2 +BROKEN= Does not currently work with Apache 2.4+ + +USES= apache:2.4+ AP_FAST_BUILD= yes AP_GENPLIST= yes AP_INC= ${LOCALBASE}/include/libmemcached AP_LIB= ${LOCALBASE}/lib -lmemcached .include Index: head/www/resin3/Makefile =================================================================== --- head/www/resin3/Makefile (revision 467473) +++ head/www/resin3/Makefile (revision 467474) @@ -1,99 +1,100 @@ # Created by: Jean-Baptiste Quenot # $FreeBSD$ PORTNAME= resin PORTVERSION= 3.1.15 CATEGORIES= www java MASTER_SITES= http://www.caucho.com/download/ MAINTAINER= bofh@FreeBSD.org COMMENT= Java-based Application Server, 3.x branch LICENSE= GPLv2 OPTIONS_DEFINE= APACHE22 APACHE22_DESC= Use Apache 2.2 GNU_CONFIGURE= yes USES= libtool python ssl USE_JAVA= yes JAVA_VERSION= 1.6+ # Pass JAVA_HOME as determined by bsd.java.mk CONFIGURE_ARGS= --with-java-home=${JAVA_HOME} \ --with-openssl-lib=${OPENSSLLIB} \ --with-openssl-include=${OPENSSLINC} USERS= www GROUPS= www PLIST_SUB= APP_NAME=${APP_NAME} \ APXS=${APXS} \ GROUPS=${GROUPS} \ USERS=${USERS} SUB_LIST= APP_HOME=${APP_HOME} \ APP_NAME=${APP_NAME} \ GROUPS=${GROUPS} \ LOG_FILE=${LOG_FILE} \ PID_FILE=${PID_FILE} \ PORT=${PORT} \ PYTHON_CMD=${PYTHON_CMD} \ USERS=${USERS} # Customizable settings PORT?= 8080 # Do not use PKGNAMESUFFIX here because version info is already in PORTVERSION # If we used PKGNAMESUFFIX, the package name would be resin2-2.1.11 APP_NAME_SUFFIX=${PORTVERSION:C/\..*$//} APP_NAME?= ${PORTNAME}${APP_NAME_SUFFIX} APP_HOME?= ${PREFIX}/${APP_NAME} PID_FILE?= /var/run/${APP_NAME}.pid LOG_FILE?= /var/log/${APP_NAME}.log # Other settings APXS?= ${LOCALBASE}/sbin/apxs SUB_FILES= pkg-message resin3ctl USE_RC_SUBR= resin3 NO_ARCH= yes +APACHE22_BROKEN=The Apache 2.2 port has been deleted .include # Install the Apache plugin if needed .if ${PORT_OPTIONS:MAPACHE22} BUILD_DEPENDS+= ${APXS}:www/apache22 CONFIGURE_ARGS+=--with-apxs=${APXS} PLIST_SUB+= MOD_DIR=libexec/apache22 # Allow apxs invocations PLIST_SUB+= APACHE="" .else PLIST_SUB+= MOD_DIR="@comment " # Prevent apxs invocations PLIST_SUB+= APACHE="@comment " .endif post-extract: @${MKDIR} ${WRKSRC}/webapps/resin-doc @${TAR} xf ${WRKSRC}/webapps/resin-doc.war -C ${WRKSRC}/webapps/resin-doc && ${RM} ${WRKSRC}/webapps/resin-doc.war post-patch: @${REINPLACE_CMD} -e 's|$${resin.home}/conf/app-default.xml|${PREFIX}/etc/${APP_NAME}/app-default.xml|' \ ${WRKSRC}/conf/resin.conf post-build: (cd ${WRKSRC}/modules/c/src/resin_os && ${SETENV} ${MAKE_ENV} \ ${MAKE_CMD} ${MAKE_ARGS} install) # Resin does not handle installation, so proceed now do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/${APP_NAME} ${INSTALL_DATA} ${WRKSRC}/conf/resin.conf ${STAGEDIR}${PREFIX}/etc/${APP_NAME}/resin.xml.sample ${INSTALL_DATA} ${WRKSRC}/conf/app-default.xml ${STAGEDIR}${PREFIX}/etc/${APP_NAME} ${INSTALL_SCRIPT} ${WRKDIR}/resin3ctl ${STAGEDIR}${PREFIX}/sbin (cd ${WRKSRC}/webapps && ${COPYTREE_SHARE} . ${STAGEDIR}${APP_HOME}/webapps) (cd ${WRKSRC}/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${APP_HOME}/lib) .if ${PORT_OPTIONS:MAPACHE22} ${APXS} -i -n caucho -a ${WRKSRC}/modules/c/src/apache2/.libs/mod_caucho.so .endif .include