SF.net SVN: gar:[23062] csw/mgar/pkg/mod_proxy_html/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Sat Feb 22 11:25:38 CET 2014
Revision: 23062
http://sourceforge.net/p/gar/code/23062
Author: dmichelsen
Date: 2014-02-22 10:25:36 +0000 (Sat, 22 Feb 2014)
Log Message:
-----------
mod_proxy_html/trunk: Update to latest standards, previous recipes package was never released
Modified Paths:
--------------
csw/mgar/pkg/mod_proxy_html/trunk/Makefile
csw/mgar/pkg/mod_proxy_html/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/mod_proxy_html/trunk/files/CSWap2-mod-proxy-html.postinstall
csw/mgar/pkg/mod_proxy_html/trunk/files/CSWap2-mod-proxy-html.preremove
Removed Paths:
-------------
csw/mgar/pkg/mod_proxy_html/trunk/files/CSWap2modproxyhtml.depend
csw/mgar/pkg/mod_proxy_html/trunk/files/CSWap2modproxyhtml.gspec
Modified: csw/mgar/pkg/mod_proxy_html/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mod_proxy_html/trunk/Makefile 2014-02-22 10:03:46 UTC (rev 23061)
+++ csw/mgar/pkg/mod_proxy_html/trunk/Makefile 2014-02-22 10:25:36 UTC (rev 23062)
@@ -1,6 +1,5 @@
NAME = mod_proxy_html
-VERSION = 2.5.2
-GARTYPE = v1
+VERSION = 3.1.2
DESCRIPTION = Apache 2 output filter to rewrite HTML links
define BLURB
@@ -12,28 +11,46 @@
endef
MASTER_SITES = http://apache.webthing.com/mod_proxy_html/
-DISTFILES = $(NAME)-$(VERSION).c
-DISTFILES += $(call admfiles,CSWap2modproxyhtml,depend)
+DISTNAME = $(NAME)
+DISTFILES += $(DISTNAME).tar.bz2
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).c
+VENDOR_URL = http://apache.webthing.com/mod_proxy_html/
-BUILD_DEP_PKGS = CSWapache2-devel CSWapache2 CSWlibxml2
+BUILD_DEP_PKGS += CSWapache2-dev
+BUILD_DEP_PKGS += CSWlibxml2-dev
-WORKSRC = $(WORKDIR)
+PACKAGES += CSWap2-mod-proxy-html
+SPKG_DESC_CSWap2-mod-proxy-html = Apache 2 output filter to rewrite HTML links
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWap2-mod-proxy-html += CSWapache2
+# Apache paths
+AP2_ROOT = $(prefix)/apache2
+AP2_LIBEXEC = $(AP2_ROOT)/libexec
+AP2_EXTRACONF = $(AP2_ROOT)/etc/extra
+AP2_SBIN = $(AP2_ROOT)/sbin
+APXS = $(AP2_SBIN)/apxs
+
CONFIGURE_SCRIPTS =
BUILD_SCRIPTS = custom
TEST_SCRIPTS =
INSTALL_SCRIPTS = custom
+PRESERVECONF += $(AP2_EXTRACONF)/proxy_html.conf
+
include gar/category.mk
build-custom:
- $(prefix)/apache2/sbin/apxs -c -I$(includedir)/libxml2/ $(WORKSRC)/mod_proxy_html-2.5.2.c
+ cd $(WORKSRC) && $(APXS) -I. -I$(includedir)/libxml2 -c mod_proxy_html.c
+ cd $(WORKSRC) && $(APXS) -I. -I$(includedir)/libxml2 -c mod_xml2enc.c
@$(MAKECOOKIE)
install-custom:
- @-mkdir -p $(DESTDIR)$(prefix)/apache2/libexec
- cp $(WORKSRC)/.libs/mod_proxy_html-2.5.2.so $(DESTDIR)$(prefix)/apache2/libexec
+ mkdir -p $(DESTDIR)$(AP2_LIBEXEC)
+ cd $(WORKSRC) && $(APXS) -S LIBEXECDIR=$(DESTDIR)$(AP2_LIBEXEC) -i mod_proxy_html.la
+ cd $(WORKSRC) && $(APXS) -S LIBEXECDIR=$(DESTDIR)$(AP2_LIBEXEC) -i mod_xml2enc.la
+ ginstall -d $(DESTDIR)$(AP2_EXTRACONF)
+ ginstall -m 0644 $(WORKSRC)/proxy_html.conf $(DESTDIR)$(AP2_EXTRACONF)/proxy_html.conf
+ ginstall -d $(DESTDIR)$(docdir)/ap2_mod_proxy_html
+ ginstall -m 0644 $(WORKSRC)/README $(DESTDIR)$(docdir)/ap2_mod_proxy_html/README
@$(MAKECOOKIE)
Modified: csw/mgar/pkg/mod_proxy_html/trunk/checksums
===================================================================
--- csw/mgar/pkg/mod_proxy_html/trunk/checksums 2014-02-22 10:03:46 UTC (rev 23061)
+++ csw/mgar/pkg/mod_proxy_html/trunk/checksums 2014-02-22 10:25:36 UTC (rev 23062)
@@ -1,3 +1 @@
-6d38fbcd58e6e5cac246da3d1fcd22f4 download/mod_proxy_html-2.5.2.c
-bdf8321fb4906cb5773286c1071def0c download/CSWap2modproxyhtml.gspec
-cf5dc2bedf26e739694f566db17fe6e3 download/CSWap2modproxyhtml.depend
+d6497b48d2bffc4150472472004618c3 mod_proxy_html.tar.bz2
Copied: csw/mgar/pkg/mod_proxy_html/trunk/files/CSWap2-mod-proxy-html.postinstall (from rev 23055, csw/mgar/pkg/mod_auth_external/trunk/files/CSWap2-mod-auth-external.postinstall)
===================================================================
--- csw/mgar/pkg/mod_proxy_html/trunk/files/CSWap2-mod-proxy-html.postinstall (rev 0)
+++ csw/mgar/pkg/mod_proxy_html/trunk/files/CSWap2-mod-proxy-html.postinstall 2014-02-22 10:25:36 UTC (rev 23062)
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
+AP2_PREFIX=$CSW_PREFIX/apache2
+AP2_BINDIR=$AP2_PREFIX/sbin
+AP2_LIBEXEC=$AP2_PREFIX/libexec
+AP2_CONFDIR=$AP2_PREFIX/etc
+AP2_EXTRADIR=$AP2_CONFDIR/extra
+AP2_CONFIG=$AP2_CONFDIR/httpd.conf
+
+# Enable the modules
+PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-'/'}
+chroot $PKG_INSTALL_ROOT \
+ $AP2_BINDIR/apxs -S LIBEXECDIR=$AP2_LIBEXEC -e -a -n \
+ proxy_html mod_proxy_html.so
+chroot $PKG_INSTALL_ROOT \
+ $AP2_BINDIR/apxs -S LIBEXECDIR=$AP2_LIBEXEC -e -a -n \
+ xml2enc mod_xml2enc.so
+
+# Finito
+cat <<END
+
+NOTICE: mod_proxy_html and mod_xml2enc are enabled in httpd.conf but the server was not restarted.
+ Please check your configuration and restart apache.
+
+END
+
+exit 0
Copied: csw/mgar/pkg/mod_proxy_html/trunk/files/CSWap2-mod-proxy-html.preremove (from rev 23055, csw/mgar/pkg/mod_auth_external/trunk/files/CSWap2-mod-auth-external.preremove)
===================================================================
--- csw/mgar/pkg/mod_proxy_html/trunk/files/CSWap2-mod-proxy-html.preremove (rev 0)
+++ csw/mgar/pkg/mod_proxy_html/trunk/files/CSWap2-mod-proxy-html.preremove 2014-02-22 10:25:36 UTC (rev 23062)
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
+AP2_PREFIX=$CSW_PREFIX/apache2
+AP2_BINDIR=$AP2_PREFIX/sbin
+AP2_LIBEXEC=$AP2_PREFIX/libexec
+AP2_CONFDIR=$AP2_PREFIX/etc
+AP2_EXTRADIR=$AP2_CONFDIR/extra
+AP2_CONFIG=$AP2_CONFDIR/httpd.conf
+
+# Disable the modules
+PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-'/'}
+chroot $PKG_INSTALL_ROOT \
+ $AP2_BINDIR/apxs -S LIBEXECDIR=$AP2_LIBEXEC -e -A -n \
+ proxy_html mod_proxy_html.so
+chroot $PKG_INSTALL_ROOT \
+ $AP2_BINDIR/apxs -S LIBEXECDIR=$AP2_LIBEXEC -e -A -n \
+ xml2enc mod_xml2enc.so
+
+cat <<END
+
+NOTICE: mod_proxy_html and mod_xml2enc are disabled in httpd.conf but the server was not restarted.
+ Please check your configuration and restart apache.
+
+END
+
+exit 0
Deleted: csw/mgar/pkg/mod_proxy_html/trunk/files/CSWap2modproxyhtml.depend
===================================================================
--- csw/mgar/pkg/mod_proxy_html/trunk/files/CSWap2modproxyhtml.depend 2014-02-22 10:03:46 UTC (rev 23061)
+++ csw/mgar/pkg/mod_proxy_html/trunk/files/CSWap2modproxyhtml.depend 2014-02-22 10:25:36 UTC (rev 23062)
@@ -1,2 +0,0 @@
-P CSWlibxml2 libxml2 - XML Parser Library
-P CSWapache2 apache2 - Apache 2.2 web server
Deleted: csw/mgar/pkg/mod_proxy_html/trunk/files/CSWap2modproxyhtml.gspec
===================================================================
--- csw/mgar/pkg/mod_proxy_html/trunk/files/CSWap2modproxyhtml.gspec 2014-02-22 10:03:46 UTC (rev 23061)
+++ csw/mgar/pkg/mod_proxy_html/trunk/files/CSWap2modproxyhtml.gspec 2014-02-22 10:25:36 UTC (rev 23062)
@@ -1,6 +0,0 @@
-%var bitname mod_proxy_html
-%var pkgname CSWap2modproxyhtml
-%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright
-source code is licensed under the GNU General Public License (GPL) Version 2
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list