ports/134447: [PATCH] www/formication: apache@

[Philip M. Gollucci]

>Number:         134447
>Category:       ports
>Synopsis:       [PATCH] www/formication: apache@
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon May 11 07:10:02 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Philip M. Gollucci
>Release:        FreeBSD 7.1-PRERELEASE i386
>Organization:
Riderway Inc.
>Environment:
System: FreeBSD freefall.freebsd.org 7.1-PRERELEASE FreeBSD 7.1-PRERELEASE #36: Mon Dec 29 15:15:30 UTC 2008
>Description:
- USE_APACHE=yes is deprecated
- Use SUB_FILES for pkg-message
- Use WWWOWN
- PREFIX -> LOCALBASE

Added file(s):
- files/pkg-message.in

Removed file(s):
- pkg-message

Port maintainer (mranner at inode.at) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- formication-1.0.b1_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/www/formication/Makefile,v
retrieving revision 1.2
diff -u -u -r1.2 Makefile
--- Makefile	13 May 2006 04:41:10 -0000	1.2
+++ Makefile	11 May 2009 07:05:28 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	formication
 PORTVERSION=	1.0.b1
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.villainy.com/downloads/ \
 		http://www.ranner.jawa.at/stuff/
@@ -15,34 +16,28 @@
 MAINTAINER=	mranner at inode.at
 COMMENT=	Formular processing tool written in perl
 
-CGI_UID?=	www
-
-PKGMESSAGE=	${WRKDIR}/pkg-message
-USE_APACHE=	yes
+USE_APACHE=	1.3
 USE_PERL5_RUN=	yes
 NO_BUILD=	yes
 
 PORTDOCS=	BLURB COPYING feedback.fcn feedback.html formication.txt
 PLIST_FILES=	www/cgi-bin/formication.pl
+SUB_FILES+=	pkg-message
 
 post-patch:
 	@${REINPLACE_CMD} -e "s,^#!/usr/local/bin/perl,#!${PERL},g" \
-		-e "s,authorized_uid = 1031;,authorized_uid = ${CGI_UID};,g" \
+		-e "s,authorized_uid = 1031;,authorized_uid = ${WWWOWN};,g" \
 		${WRKSRC}/formication.pl
 
 do-install:
-	@${INSTALL_DATA} ${WRKSRC}/formication.pl ${PREFIX}/www/cgi-bin
+	@${INSTALL_DATA} ${WRKSRC}/formication.pl ${LOCALBASE}/www/cgi-bin
 .if !defined(NOPORTDOCS)
-	@${INSTALL} -d -o root -g wheel -m 0755 ${DOCSDIR}
+	${MKDIR} ${DOCSDIR}/
 .	for i in ${PORTDOCS}
-	  @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+	  @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/
 .	endfor
 .endif
 
-pre-install:
-	@${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
-		-e 's|%%DOCSDIR%%|${DOCSDIR}|g' <${.CURDIR}/pkg-message >${PKGMESSAGE}
-
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
Index: pkg-message
===================================================================
RCS file: pkg-message
diff -N pkg-message
--- pkg-message	25 Jul 2004 09:24:57 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-*****************************************************************************
-
-You have installed the formication package.
-
-Edit %%LOCALBASE%%/etc/apache/httpd.conf and add:
-
-    Action formication /cgi-bin/formication.pl
-    AddHandler formication .fcn
-
-Read %%DOCSDIR%%/formication.txt to learn how to use
-
-*****************************************************************************
Index: files/pkg-message.in
===================================================================
RCS file: files/pkg-message.in
diff -N files/pkg-message.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/pkg-message.in	11 May 2009 07:05:28 -0000
@@ -0,0 +1,12 @@
+*****************************************************************************
+
+You have installed the formication package.
+
+Edit %%LOCALBASE%%/etc/apache/httpd.conf and add:
+
+    Action formication /cgi-bin/formication.pl
+    AddHandler formication .fcn
+
+Read %%DOCSDIR%%/formication.txt to learn how to use
+
+*****************************************************************************
--- formication-1.0.b1_1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: