Bug 27963 - Update port www/mod_layout to 2.10.6
Summary: Update port www/mod_layout to 2.10.6
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: freebsd-ports (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2001-06-08 14:50 UTC by Pete Fritchman
Modified: 2001-06-17 19:36 UTC (History)
0 users

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Pete Fritchman 2001-06-08 14:50:01 UTC
- update to 2.10.6 (it's the stable branch)
- take over as maintainer (current maintainer, mi@, is ok with this)
- don't override do-{build,install} targets -- the distributed Makefile
  can handle these on it's own now
- use NOPORTDOCS
- add pkg-message
- shorten pkg-comment to please portlint

Fix: (I've included pkg-message at the end)



And pkg-message:

-----------------------------------------------------------------
You have installed mod_layout, a module that can automatically
prepend/append HTML pages served.  To enable this module, edit
${PREFIX}/etc/apache/httpd.conf and look for the line:

#LoadModule layout_module      libexec/apache/mod_layout.so

Remove the hash mark from the beginning of the line and run
${PREFIX}/sbin/apachectl restart to enable this module.  Please
see ${PREFIX}/share/doc/mod_layout for more details.
-------------------------------------------------------------------Or7Cts7TvpptS2gyo9w8OSwYe6HqI3npXjOrXqCKlr5wOYQw
Content-Type: text/plain; name="file.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="file.diff"

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/www/mod_layout/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- Makefile	2000/12/19 12:45:30	1.1
+++ Makefile	2001/06/08 00:54:29
@@ -6,32 +6,24 @@
 #
 
 PORTNAME=	mod_layout
-PORTVERSION=	2.8.2
+PORTVERSION=	2.10.6
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.tangent.org/pub/apache/ \
 		http://www.tangent.org/mod_layout/
 
-MAINTAINER=	mi@aldan.algebra.com
+MAINTAINER=	petef@databits.net
 
 BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
 RUN_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
 
-do-build:
-	cd ${WRKSRC} && ${LOCALBASE}/sbin/apxs -c *.c
+post-patch:
+	@${PERL} -pi -e 's!-i -a -n!-i -A -n!' ${WRKSRC}/Makefile
 
-do-install:
-	cd ${WRKSRC} && ${LOCALBASE}/sbin/apxs -A -i ${PORTNAME}.so
-
-.if !defined(NOPORTDOCS)
-PLIST_SUB+=	DOC=''
-
 post-install:
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/${PORTNAME}
-	@${INSTALL_DATA} ${WRKSRC}/*.html \
-		${PREFIX}/share/doc/${PORTNAME}
-
-.else
-PLIST_SUB+=	DOC='@comment '
+	${INSTALL_DATA} ${WRKSRC}/faq.html ${PREFIX}/share/doc/${PORTNAME}
 .endif
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/www/mod_layout/distinfo,v
retrieving revision 1.1
diff -u -r1.1 distinfo
--- distinfo	2000/12/19 12:45:30	1.1
+++ distinfo	2001/06/08 00:28:51
@@ -1 +1 @@
-MD5 (mod_layout-2.8.2.tar.gz) = f786c566c7107e1da63201162489d774
+MD5 (mod_layout-2.10.6.tar.gz) = 2221e35e31388354132bbd20bec44d35
Index: pkg-comment
===================================================================
RCS file: /home/ncvs/ports/www/mod_layout/pkg-comment,v
retrieving revision 1.1
diff -u -r1.1 pkg-comment
--- pkg-comment	2000/12/19 12:45:30	1.1
+++ pkg-comment	2001/06/08 00:53:50
@@ -1 +1 @@
-An Apache module that provides for prepending/appending HTML pages served
+Apache module that provides for prepending/appending served HTML pages
Index: pkg-descr
===================================================================
RCS file: /home/ncvs/ports/www/mod_layout/pkg-descr,v
retrieving revision 1.1
diff -u -r1.1 pkg-descr
--- pkg-descr	2000/12/19 12:45:30	1.1
+++ pkg-descr	2001/06/08 00:41:39
@@ -13,3 +13,6 @@
 	possibilities.
 
 WWW: http://www.tangent.org/mod_layout/
+
+- Pete
+petef@databits.net
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/mod_layout/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- pkg-plist	2000/12/19 12:45:30	1.1
+++ pkg-plist	2001/06/08 00:48:13
@@ -1,5 +1,5 @@
 libexec/apache/mod_layout.so
-%%DOC%%share/doc/mod_layout/faq.html
-%%DOC%%@dirrm share/doc/mod_layout
-@exec ${PKG_PREFIX}/sbin/apxs -e -A -n layout mod_layout.so; echo "	enable the mod_layout in Apache's config manually"
-@unexec ${PKG_PREFIX}/sbin/apxs -e -A -n layout mod_layout.so || echo "	remove the mod_layout from Apache's config manually"
+%%PORTDOCS%%share/doc/mod_layout/faq.html
+@exec %D/sbin/apxs -e -A -n layout mod_layout.so
+%%PORTDOCS%%@dirrm share/doc/mod_layout
+@unexec %D/sbin/apxs -e -A -n layout mod_layout.so || echo "	disable mod_layout in Apache's config manually"
How-To-Repeat: 
N/A
Comment 1 Steve Price freebsd_committer freebsd_triage 2001-06-17 19:36:16 UTC
State Changed
From-To: open->closed

Update committed, thanks!