From 5153f5fc0a1d65057a17bd74d0d6d7d47a75a9ac Mon Sep 17 00:00:00 2001 From: Christian Weisgerber Date: Fri, 26 Sep 2003 17:25:14 +0000 Subject: * Update to 4.0.2a * Use LATEST_LINK PR: 57178 Submitted by: Clement Laforet --- www/mod_layout2/Makefile | 5 ++-- www/mod_layout2/distinfo | 2 +- www/mod_layout2/files/patch-Makefile | 46 +++++++---------------------------- www/mod_layout2/pkg-message | 9 ------- www/mod_layout2/pkg-plist | 1 - www/mod_layout22/Makefile | 5 ++-- www/mod_layout22/distinfo | 2 +- www/mod_layout22/files/patch-Makefile | 46 +++++++---------------------------- www/mod_layout22/pkg-message | 9 ------- www/mod_layout22/pkg-plist | 1 - 10 files changed, 26 insertions(+), 100 deletions(-) delete mode 100644 www/mod_layout2/pkg-message delete mode 100644 www/mod_layout22/pkg-message (limited to 'www') diff --git a/www/mod_layout2/Makefile b/www/mod_layout2/Makefile index 081c6d87180a..16ef44eac3bb 100644 --- a/www/mod_layout2/Makefile +++ b/www/mod_layout2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= mod_layout -PORTVERSION= 4.0.1a +PORTVERSION= 4.0.2a CATEGORIES= www MASTER_SITES= http://software.tangent.org/download/ @@ -16,6 +16,8 @@ COMMENT= Apache2 module to wrap served pages with a header and/or footer BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache2 RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache2 +LATEST_LINK= mod_layout2 + USE_REINPLACE= yes MAKE_ARGS+= builddir=${WRKSRC} @@ -24,6 +26,5 @@ post-install: @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/README .endif - @${CAT} ${PKGMESSAGE} .include diff --git a/www/mod_layout2/distinfo b/www/mod_layout2/distinfo index a5e5c1629eea..66d11e949d0b 100644 --- a/www/mod_layout2/distinfo +++ b/www/mod_layout2/distinfo @@ -1 +1 @@ -MD5 (mod_layout-4.0.1a.tar.gz) = 253c4a2c0f44b788648fc7564f246e87 +MD5 (mod_layout-4.0.2a.tar.gz) = 123cbefc6e137f22e134025801eed47f diff --git a/www/mod_layout2/files/patch-Makefile b/www/mod_layout2/files/patch-Makefile index 9225f5b38777..470842ad57f1 100644 --- a/www/mod_layout2/files/patch-Makefile +++ b/www/mod_layout2/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig Mon Oct 21 19:38:28 2002 -+++ Makefile Sat Nov 16 16:10:44 2002 -@@ -1,17 +1,17 @@ +--- Makefile.orig Wed Sep 24 17:56:08 2003 ++++ Makefile Wed Sep 24 17:56:33 2003 +@@ -1,13 +1,13 @@ ## ## Makefile -- Build procedure for mod_layout Apache module ## @@ -8,56 +8,28 @@ -top_srcdir=/usr/local/apache2 -top_builddir=/usr/local/apache2 -include /usr/local/apache2/build/special.mk -+#builddir=${WRKSRC} ++#builddir=$(shell pwd) +top_srcdir=${LOCALBASE}/share/apache2 +top_builddir=${LOCALBASE}/share/apache2 +include ${LOCALBASE}/share/apache2/build/special.mk # the used tools --APXS=/usr/local/apache2/bin/apxs +-APXS=apxs +APXS=${LOCALBASE}/sbin/apxs APACHECTL=apachectl CC=`$(APXS) -q CC` INC=-I`$(APXS) -q INCLUDEDIR` `$(APXS) -q CFLAGS` #-DLAYOUT_FILEOWNER_NAME --LD_SHLIB=`apxs -q LDFLAGS_SHLIB` -+LD_SHLIB=`apxs -q LDFLAGS_SHLIB` -lapr -L${LOCALBASE}/apache2 - VERSION = 4.0.1a - DISTNAME = mod_layout - DISTVNAME = $(DISTNAME)-$(VERSION) -@@ -36,7 +36,7 @@ - # Apache itself won't compile with it this strict - #DEF = -Wall -DDEBUG -Wtraditional -Wshadow -Wid-clash-len -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings-Wconversion -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wlong-long -Winline -Werror - #DEF = -Wall -DDEBUG -- -+DEF= -L${LOCALBASE}/lib/apache2 -lapr - # the default target - all: mod_layout.so - -@@ -44,8 +44,6 @@ - #mod_layout.so: $(OBJ) Makefile - mod_layout.so: $(OBJ) - $(APXS) -o liblayout.la -c $(SOBJ) -- #$(APXS) -c -o liblayout $(SOBJ) -- #$(APXS) -i -a mod_layout.la - - mod_layout.o : mod_layout.c - $(APXS) -c mod_layout.c -@@ -63,17 +61,7 @@ +@@ -61,12 +61,7 @@ $(APXS) -c header.c # install the shared object file into Apache install: -- $(APXS) -i -n liblayout.so -e liblayout.la +- $(APXS) -iac $(INCLUDES) $(LIBS) $(SRC) - @echo "+--------------------------------------------------------+"; \ - echo "| All done. |"; \ - echo "| |"; \ -- echo "| You will need to add the directive: |"; \ -- echo "| LoadModule layout_module modules/liblayout.so |"; \ -- echo "| |"; \ -- echo "| So that you can begin to use mod_layout. |"; \ -- echo "| |"; \ - echo "| Thanks for installing mod_layout. |"; \ - echo "+--------------------------------------------------------+"; \ -+ $(APXS) -a -i -n liblayout.so -e liblayout.la ++ $(APXS) -ia $(INCLUDES) $(LIBS) mod_layout.la - rpm: #all dist + rpm: dist cp $(DISTVNAME).tar$(SUFFIX) /usr/src/redhat/SOURCES diff --git a/www/mod_layout2/pkg-message b/www/mod_layout2/pkg-message deleted file mode 100644 index 0d671f193f84..000000000000 --- a/www/mod_layout2/pkg-message +++ /dev/null @@ -1,9 +0,0 @@ ------------------------------------------------------------------ -You have installed mod_layout, a module that can automatically add -a footer or header to pages served. -Please Add : - LoadModule layout_module libexec/apache2/liblayout.so -to your httpd.conf. - -Please note that this module is an alpha version. ------------------------------------------------------------------ diff --git a/www/mod_layout2/pkg-plist b/www/mod_layout2/pkg-plist index a2b5d0e333da..ede244d95c11 100644 --- a/www/mod_layout2/pkg-plist +++ b/www/mod_layout2/pkg-plist @@ -1,5 +1,4 @@ libexec/apache2/mod_layout.so -libexec/apache2/liblayout.so @exec %D/sbin/apxs -e -a -n layout %D/%f @unexec echo "===> If you do not plan on reinstalling mod_layout, you must manually remove"; echo "===> references to it in httpd.conf." %%PORTDOCS%%%%DOCSDIR%%/README diff --git a/www/mod_layout22/Makefile b/www/mod_layout22/Makefile index 081c6d87180a..16ef44eac3bb 100644 --- a/www/mod_layout22/Makefile +++ b/www/mod_layout22/Makefile @@ -6,7 +6,7 @@ # PORTNAME= mod_layout -PORTVERSION= 4.0.1a +PORTVERSION= 4.0.2a CATEGORIES= www MASTER_SITES= http://software.tangent.org/download/ @@ -16,6 +16,8 @@ COMMENT= Apache2 module to wrap served pages with a header and/or footer BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache2 RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache2 +LATEST_LINK= mod_layout2 + USE_REINPLACE= yes MAKE_ARGS+= builddir=${WRKSRC} @@ -24,6 +26,5 @@ post-install: @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/README .endif - @${CAT} ${PKGMESSAGE} .include diff --git a/www/mod_layout22/distinfo b/www/mod_layout22/distinfo index a5e5c1629eea..66d11e949d0b 100644 --- a/www/mod_layout22/distinfo +++ b/www/mod_layout22/distinfo @@ -1 +1 @@ -MD5 (mod_layout-4.0.1a.tar.gz) = 253c4a2c0f44b788648fc7564f246e87 +MD5 (mod_layout-4.0.2a.tar.gz) = 123cbefc6e137f22e134025801eed47f diff --git a/www/mod_layout22/files/patch-Makefile b/www/mod_layout22/files/patch-Makefile index 9225f5b38777..470842ad57f1 100644 --- a/www/mod_layout22/files/patch-Makefile +++ b/www/mod_layout22/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig Mon Oct 21 19:38:28 2002 -+++ Makefile Sat Nov 16 16:10:44 2002 -@@ -1,17 +1,17 @@ +--- Makefile.orig Wed Sep 24 17:56:08 2003 ++++ Makefile Wed Sep 24 17:56:33 2003 +@@ -1,13 +1,13 @@ ## ## Makefile -- Build procedure for mod_layout Apache module ## @@ -8,56 +8,28 @@ -top_srcdir=/usr/local/apache2 -top_builddir=/usr/local/apache2 -include /usr/local/apache2/build/special.mk -+#builddir=${WRKSRC} ++#builddir=$(shell pwd) +top_srcdir=${LOCALBASE}/share/apache2 +top_builddir=${LOCALBASE}/share/apache2 +include ${LOCALBASE}/share/apache2/build/special.mk # the used tools --APXS=/usr/local/apache2/bin/apxs +-APXS=apxs +APXS=${LOCALBASE}/sbin/apxs APACHECTL=apachectl CC=`$(APXS) -q CC` INC=-I`$(APXS) -q INCLUDEDIR` `$(APXS) -q CFLAGS` #-DLAYOUT_FILEOWNER_NAME --LD_SHLIB=`apxs -q LDFLAGS_SHLIB` -+LD_SHLIB=`apxs -q LDFLAGS_SHLIB` -lapr -L${LOCALBASE}/apache2 - VERSION = 4.0.1a - DISTNAME = mod_layout - DISTVNAME = $(DISTNAME)-$(VERSION) -@@ -36,7 +36,7 @@ - # Apache itself won't compile with it this strict - #DEF = -Wall -DDEBUG -Wtraditional -Wshadow -Wid-clash-len -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings-Wconversion -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wlong-long -Winline -Werror - #DEF = -Wall -DDEBUG -- -+DEF= -L${LOCALBASE}/lib/apache2 -lapr - # the default target - all: mod_layout.so - -@@ -44,8 +44,6 @@ - #mod_layout.so: $(OBJ) Makefile - mod_layout.so: $(OBJ) - $(APXS) -o liblayout.la -c $(SOBJ) -- #$(APXS) -c -o liblayout $(SOBJ) -- #$(APXS) -i -a mod_layout.la - - mod_layout.o : mod_layout.c - $(APXS) -c mod_layout.c -@@ -63,17 +61,7 @@ +@@ -61,12 +61,7 @@ $(APXS) -c header.c # install the shared object file into Apache install: -- $(APXS) -i -n liblayout.so -e liblayout.la +- $(APXS) -iac $(INCLUDES) $(LIBS) $(SRC) - @echo "+--------------------------------------------------------+"; \ - echo "| All done. |"; \ - echo "| |"; \ -- echo "| You will need to add the directive: |"; \ -- echo "| LoadModule layout_module modules/liblayout.so |"; \ -- echo "| |"; \ -- echo "| So that you can begin to use mod_layout. |"; \ -- echo "| |"; \ - echo "| Thanks for installing mod_layout. |"; \ - echo "+--------------------------------------------------------+"; \ -+ $(APXS) -a -i -n liblayout.so -e liblayout.la ++ $(APXS) -ia $(INCLUDES) $(LIBS) mod_layout.la - rpm: #all dist + rpm: dist cp $(DISTVNAME).tar$(SUFFIX) /usr/src/redhat/SOURCES diff --git a/www/mod_layout22/pkg-message b/www/mod_layout22/pkg-message deleted file mode 100644 index 0d671f193f84..000000000000 --- a/www/mod_layout22/pkg-message +++ /dev/null @@ -1,9 +0,0 @@ ------------------------------------------------------------------ -You have installed mod_layout, a module that can automatically add -a footer or header to pages served. -Please Add : - LoadModule layout_module libexec/apache2/liblayout.so -to your httpd.conf. - -Please note that this module is an alpha version. ------------------------------------------------------------------ diff --git a/www/mod_layout22/pkg-plist b/www/mod_layout22/pkg-plist index a2b5d0e333da..ede244d95c11 100644 --- a/www/mod_layout22/pkg-plist +++ b/www/mod_layout22/pkg-plist @@ -1,5 +1,4 @@ libexec/apache2/mod_layout.so -libexec/apache2/liblayout.so @exec %D/sbin/apxs -e -a -n layout %D/%f @unexec echo "===> If you do not plan on reinstalling mod_layout, you must manually remove"; echo "===> references to it in httpd.conf." %%PORTDOCS%%%%DOCSDIR%%/README -- cgit v1.2.3