Date: Wed, 24 Sep 2003 18:02:01 +0200 From: Clement Laforet <sheepkiller@cultdeadsheep.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Clement Laforet <sheepkiller@cultdeadsheep.org> Subject: ports/57178: [update] www/mod_layout2: update to 4.0.2a Message-ID: <20030924160203.DE2F044029@mx1.FreeBSD.org> Resent-Message-ID: <200309241610.h8OGAJJZ010576@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 57178 >Category: ports >Synopsis: [update] www/mod_layout2: update to 4.0.2a >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: Wed Sep 24 09:10:19 PDT 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 #0: Mon Sep 22 08:20:10 CEST 2003 clement@lucifer.cultdeadsheep.org:/usr/obj/usr/src/sys/LUCIFER i386 >Description: Update to 4.0.2a Changelog: - Use LATEST_LINK Removed file: pkg-message >How-To-Repeat: N/A. >Fix: --- mod_layout2.diff begins here --- Index: mod_layout2/Makefile =================================================================== RCS file: /WORK/REPO/ports/www/mod_layout2/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- mod_layout2/Makefile 23 Jul 2003 21:32:23 -0000 1.1 +++ mod_layout2/Makefile 24 Sep 2003 15:58:04 -0000 @@ -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 @@ 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 @@ @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/README .endif - @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> Index: mod_layout2/distinfo =================================================================== RCS file: /WORK/REPO/ports/www/mod_layout2/distinfo,v retrieving revision 1.1 diff -u -r1.1 distinfo --- mod_layout2/distinfo 23 Jul 2003 21:32:23 -0000 1.1 +++ mod_layout2/distinfo 24 Sep 2003 15:58:04 -0000 @@ -1 +1 @@ -MD5 (mod_layout-4.0.1a.tar.gz) = 253c4a2c0f44b788648fc7564f246e87 +MD5 (mod_layout-4.0.2a.tar.gz) = 123cbefc6e137f22e134025801eed47f Index: mod_layout2/pkg-message =================================================================== RCS file: mod_layout2/pkg-message diff -N mod_layout2/pkg-message --- mod_layout2/pkg-message 23 Jul 2003 21:32:23 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -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. ------------------------------------------------------------------ Index: mod_layout2/pkg-plist =================================================================== RCS file: /WORK/REPO/ports/www/mod_layout2/pkg-plist,v retrieving revision 1.1 diff -u -r1.1 pkg-plist --- mod_layout2/pkg-plist 23 Jul 2003 21:32:23 -0000 1.1 +++ mod_layout2/pkg-plist 24 Sep 2003 15:58:04 -0000 @@ -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 Index: mod_layout2/files/patch-Makefile =================================================================== RCS file: /WORK/REPO/ports/www/mod_layout2/files/patch-Makefile,v retrieving revision 1.1 diff -u -r1.1 patch-Makefile --- mod_layout2/files/patch-Makefile 23 Jul 2003 21:32:23 -0000 1.1 +++ mod_layout2/files/patch-Makefile 24 Sep 2003 15:58:04 -0000 @@ -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 --- mod_layout2.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?20030924160203.DE2F044029>