From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 16:45:41 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 16FF9653; Sun, 15 Dec 2013 16:45:41 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 00ABD10B5; Sun, 15 Dec 2013 16:45:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFGjekU091529; Sun, 15 Dec 2013 16:45:40 GMT (envelope-from ohauer@svn.freebsd.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFGjckx091516; Sun, 15 Dec 2013 16:45:38 GMT (envelope-from ohauer@svn.freebsd.org) Message-Id: <201312151645.rBFGjckx091516@svn.freebsd.org> From: Olli Hauer Date: Sun, 15 Dec 2013 16:45:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336555 - in head/www: mod_fastcgi mod_line_edit mod_log_config-st mod_log_mysql mod_proctitle mod_proxy_html mod_tidy mod_webkit mod_xmlns X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 16:45:41 -0000 Author: ohauer Date: Sun Dec 15 16:45:38 2013 New Revision: 336555 URL: http://svnweb.freebsd.org/changeset/ports/336555 Log: - add stage support - minor cleanups Deleted: head/www/mod_xmlns/pkg-plist Modified: head/www/mod_fastcgi/Makefile head/www/mod_line_edit/Makefile head/www/mod_log_config-st/Makefile head/www/mod_log_mysql/Makefile head/www/mod_proctitle/Makefile head/www/mod_proxy_html/Makefile head/www/mod_proxy_html/pkg-descr head/www/mod_tidy/Makefile head/www/mod_webkit/Makefile head/www/mod_xmlns/Makefile Modified: head/www/mod_fastcgi/Makefile ============================================================================== --- head/www/mod_fastcgi/Makefile Sun Dec 15 16:44:08 2013 (r336554) +++ head/www/mod_fastcgi/Makefile Sun Dec 15 16:45:38 2013 (r336555) @@ -10,25 +10,16 @@ DISTNAME= mod_fastcgi-SNAP-0910052141 DIST_SUBDIR= apache2 MAINTAINER= apache@FreeBSD.org -COMMENT= A fast-cgi module for Apache - +COMMENT= Apache 2.2 fast-cgi module USE_APACHE= 22 AP_FAST_BUILD= yes AP_GENPLIST= yes SRC_FILE= *.c -PORTDOCS= LICENSE.TERMS mod_fastcgi.html - -NO_STAGE= yes -do-install: - @${APXS} -i -a -n ${SHORTMODNAME} ${WRKSRC}/${MODULENAME}.${AP_BUILDEXT} +PORTDOCS= mod_fastcgi.html post-install: -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} -.for f in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/docs/${f} ${DOCSDIR} -.endfor -.endif + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/|} ${STAGEDIR}${DOCSDIR} .include Modified: head/www/mod_line_edit/Makefile ============================================================================== --- head/www/mod_line_edit/Makefile Sun Dec 15 16:44:08 2013 (r336554) +++ head/www/mod_line_edit/Makefile Sun Dec 15 16:45:38 2013 (r336555) @@ -13,19 +13,17 @@ EXTRACT_SUFX= MAINTAINER= apache@FreeBSD.org COMMENT= Apache module for simple text rewriting - -WRKSRC= ${WRKDIR} +LICENSE= GPLv2 USE_APACHE= 22+ AP_FAST_BUILD= yes AP_GENPLIST= yes -NO_STAGE= yes pre-extract: - @${MKDIR} ${WRKDIR} + @${MKDIR} ${WRKSRC} do-extract: - @${CP} ${DISTDIR}/${PORTNAME}.c ${WRKDIR}/ + @${CP} ${DISTDIR}/${PORTNAME}.c ${WRKSRC} .include Modified: head/www/mod_log_config-st/Makefile ============================================================================== --- head/www/mod_log_config-st/Makefile Sun Dec 15 16:44:08 2013 (r336554) +++ head/www/mod_log_config-st/Makefile Sun Dec 15 16:45:38 2013 (r336555) @@ -6,22 +6,24 @@ PORTVERSION= 1.0 PORTREVISION= 2 CATEGORIES= www # Original location: http://bitbrook.de/software/mod_log_mysql/mod_log_config.c -MASTER_SITES= http://sheepkiller.nerim.net/ports/${PORTNAME}/ +# Please handle update requests with care! +# sheepkiller was hacked and not cleaned over a long periode. +# (First notice 2011-03 not cleaned until 2011-07) +# Provide distfile now from LOCAL +#MASTER_SITES= http://sheepkiller.nerim.net/ports/${PORTNAME}/ +MASTER_SITES= LOCAL/ohauer DIST_SUBDIR= apache2 MAINTAINER= apache@FreeBSD.org -COMMENT= A modified version of mod_log_config for apache2 +COMMENT= Modified version of mod_log_config for apache2 +EXPIRATION_DATE= 2014-02-08 +DEPRECATED= Upstream site gone since 2011-03 USE_APACHE= 22 - AP_FAST_BUILD= yes SRC_FILE= mod_log_config.c SHORTMODNAME= log_config MODULENAME= mod_log_config-st -NO_STAGE= yes -post-install: - @${CAT} ${PKGMESSAGE} - .include Modified: head/www/mod_log_mysql/Makefile ============================================================================== --- head/www/mod_log_mysql/Makefile Sun Dec 15 16:44:08 2013 (r336554) +++ head/www/mod_log_mysql/Makefile Sun Dec 15 16:45:38 2013 (r336555) @@ -17,8 +17,10 @@ DIST_SUBDIR= apache2 MAINTAINER= apache@FreeBSD.org COMMENT= Allows Apache 2 to log to a MySQL database -RUN_DEPENDS+= ${LOCALBASE}/${APACHEMODDIR}/mod_log_config-st.so:${PORTSDIR}/www/mod_log_config-st +EXPIRATION_DATE= 2014-02-08 +DEPRECATED= Upstream site gone since 2011-03 +RUN_DEPENDS+= ${LOCALBASE}/${APACHEMODDIR}/mod_log_config-st.so:${PORTSDIR}/www/mod_log_config-st USE_APACHE= 22 AP_FAST_BUILD= yes @@ -28,5 +30,4 @@ USE_MYSQL= yes AP_INC+= ${LOCALBASE}/include/mysql AP_LIB+= ${LOCALBASE}/lib/mysql -lmysqlclient -NO_STAGE= yes .include Modified: head/www/mod_proctitle/Makefile ============================================================================== --- head/www/mod_proctitle/Makefile Sun Dec 15 16:44:08 2013 (r336554) +++ head/www/mod_proctitle/Makefile Sun Dec 15 16:45:38 2013 (r336555) @@ -3,7 +3,6 @@ PORTNAME= mod_proctitle PORTVERSION= 0.4.1 -PORTREVISION= 0 CATEGORIES= www MASTER_SITES= ftp://ftp.springdaemons.com/soft/ PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX} @@ -11,6 +10,7 @@ PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX} MAINTAINER= apache@FreeBSD.org COMMENT= Set httpd process titles to reflect currently processed request +LICENSE= BSD USE_APACHE= 22+ GNU_CONFIGURE= yes @@ -21,9 +21,9 @@ CFLAGS+= -I${LOCALBASE}/include \ PLIST_FILES= ${APACHEMODDIR}/${PORTNAME}.so -NO_STAGE= yes do-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR} ${INSTALL_PROGRAM} ${WRKSRC}/src/.libs/mod_proctitle.so \ - ${PREFIX}/${APACHEMODDIR}/ + ${STAGEDIR}${PREFIX}/${APACHEMODDIR} .include Modified: head/www/mod_proxy_html/Makefile ============================================================================== --- head/www/mod_proxy_html/Makefile Sun Dec 15 16:44:08 2013 (r336554) +++ head/www/mod_proxy_html/Makefile Sun Dec 15 16:45:38 2013 (r336555) @@ -12,11 +12,12 @@ DIST_SUBDIR= mod_proxy_html MAINTAINER= apache@FreeBSD.org COMMENT= Apache module for rewriting HTML links in proxied content -RUN_DEPENDS= ${LOCALBASE}/${APACHEMODDIR}/mod_xml2enc.so:${PORTSDIR}/www/mod_xml2enc +LICENSE= GPLv2 +RUN_DEPENDS= ${LOCALBASE}/${APACHEMODDIR}/mod_xml2enc.so:${PORTSDIR}/www/mod_xml2enc SUB_FILES= pkg-message -USE_APACHE= 22+ +USE_APACHE= 22 AP_FAST_BUILD= yes AP_GENPLIST= yes SHORTMODNAME= proxy_html @@ -27,16 +28,10 @@ AP_INC+= ${LOCALBASE}/include/libxml2 -I AP_LIB+= ${LOCALBASE}/lib AP_EXTRAS+= -lxml2 -PLIST_FILES= %%DOCSDIR%%/COPYING %%DOCSDIR%%/README \ - %%DOCSDIR%%/proxy_html.conf -PLIST_DIRS= %%DOCSDIR%% +PORTDOCS= README proxy_html.conf -NO_STAGE= yes post-install: - ${MKDIR} ${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/COPYING ${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/proxy_html.conf ${DOCSDIR} - @${CAT} ${PKGMESSAGE} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include Modified: head/www/mod_proxy_html/pkg-descr ============================================================================== --- head/www/mod_proxy_html/pkg-descr Sun Dec 15 16:44:08 2013 (r336554) +++ head/www/mod_proxy_html/pkg-descr Sun Dec 15 16:45:38 2013 (r336555) @@ -3,4 +3,9 @@ situation, to ensure that links work for serves the same purpose as Apache's ProxyPassReverse directive does for HTTP headers, and is an essential component of a reverse proxy. +Note (for apache24 users): +mod_proxy_html has now been relicensed and incorporated into the core +Apache HTTPD distribution at apache.org from HTTPD 2.4. That version is +now likely to be more up-to-date than this one. + WWW: http://apache.webthing.com/mod_proxy_html/ Modified: head/www/mod_tidy/Makefile ============================================================================== --- head/www/mod_tidy/Makefile Sun Dec 15 16:44:08 2013 (r336554) +++ head/www/mod_tidy/Makefile Sun Dec 15 16:45:38 2013 (r336555) @@ -11,8 +11,10 @@ DIST_SUBDIR= apache2 MAINTAINER= apache@FreeBSD.org COMMENT= Validates the HTML output of your apache2 webserver -LIB_DEPENDS= tidy:${PORTSDIR}/www/tidy-lib +LICENSE= AL2 MIT +LICENSE_COMB= multi +LIB_DEPENDS= libtidy.so:${PORTSDIR}/www/tidy-lib WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src USE_APACHE= 22+ @@ -20,12 +22,5 @@ AP_FAST_BUILD= yes AP_GENPLIST= yes AP_INC+= ${LOCALBASE}/include/tidy AP_LIB+= ${LOCALBASE}/lib -ltidy -PLIST_FILES= ${DOCSDIR:S/${PREFIX}\///}/LICENSE -PLIST_DIRS= ${DOCSDIR:S/${PREFIX}\///} - -NO_STAGE= yes -post-install: - @${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/../LICENSE ${DOCSDIR} .include Modified: head/www/mod_webkit/Makefile ============================================================================== --- head/www/mod_webkit/Makefile Sun Dec 15 16:44:08 2013 (r336554) +++ head/www/mod_webkit/Makefile Sun Dec 15 16:45:38 2013 (r336555) @@ -10,6 +10,7 @@ DISTNAME= Webware-${PORTVERSION} MAINTAINER= apache@FreeBSD.org COMMENT= Apache module for WebWare WebKit AppServer +LICENSE= PSFL USE_APACHE= 22+ AP_FAST_BUILD= yes @@ -18,7 +19,6 @@ AP_EXTRAS= marshal.c WRKSRC= ${WRKDIR}/Webware-${PORTVERSION}/WebKit/Adapters/${PORTNAME}2 -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's|/usr/sbin/apxs|${APXS}|' ${WRKSRC}/Makefile Modified: head/www/mod_xmlns/Makefile ============================================================================== --- head/www/mod_xmlns/Makefile Sun Dec 15 16:44:08 2013 (r336554) +++ head/www/mod_xmlns/Makefile Sun Dec 15 16:45:38 2013 (r336555) @@ -12,24 +12,21 @@ DISTFILES= xmlns.h mod_xmlns.c MAINTAINER= apache@FreeBSD.org COMMENT= Apache module for XML namespaces +LICENSE= GPLv2 USE_GNOME= libxml2 USE_APACHE= 22+ -XML2_INC= ${LOCALBASE}/include/libxml2 -XML2_LIB= ${LOCALBASE}/lib +AP_FAST_BUILD= yes +AP_GENPLIST= yes +AP_INC+= ${LOCALBASE}/include/libxml2 +AP_LIB+= ${LOCALBASE}/lib -lxml2 +SRC_FILE= mod_xmlns.c -NO_STAGE= yes pre-extract: - @${MKDIR} ${WRKDIR} + @${MKDIR} ${WRKSRC} do-extract: - @${CP} ${DISTDIR}/xmlns.h ${DISTDIR}/mod_xmlns.c ${WRKDIR} - -do-build: - @(cd ${WRKDIR} && ${APXS} -c -I ${XML2_INC} -L ${XML2_LIB} -lxml2 mod_xmlns.c) - -do-install: - @(cd ${WRKDIR} && ${APXS} -A -i mod_xmlns.la) + @${CP} ${DISTDIR}/xmlns.h ${DISTDIR}/mod_xmlns.c ${WRKSRC} .include