misc/117082: [PATCH]: www/amphetadesk now uses USE_RC_SUBR and is portlint clean

Philip M. Gollucci pgollucci at p6m7g8.com
Wed Oct 10 11:40:01 PDT 2007


>Number:         117082
>Category:       misc
>Synopsis:       [PATCH]: www/amphetadesk now uses USE_RC_SUBR and is portlint clean
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Oct 10 18:40:01 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator:     Philip M. Gollucci
>Release:        FreeBSD 7.0-current
>Organization:
Riderway Inc.
>Environment:
FreeBSD philip.hq.rws 7.0-CURRENT FreeBSD 7.0-CURRENT #0: Thu Jul 26 16:44:37 EDT 2007     root at philip.office.rws:/usr/obj/usr/src/sys/GENERIC  i386

>Description:
Update port to use USE_RC_SUBR and cleanup other portlint warnings.

NOTE THIS DEPENEDS ON ports/117080

Also note, that an UPDATING entry is included for the rc.d script being renamed.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Renamed without modifications:
cvs diff: files/amphetadesk.in is a new entry, no comparison available
cvs diff: files/amphetadesk.sh was removed, no comparison available

retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile	3 Dec 2006 12:45:54 -0000	1.4
+++ Makefile	10 Oct 2007 17:59:53 -0000
@@ -30,7 +30,7 @@
 		${SITE_PERL}/URI/URL.pm:${PORTSDIR}/net/p5-URI
 
 USE_PERL5=	yes
-USE_RC_SUBR=	yes
+USE_RC_SUBR=	amphetadesk
 NO_BUILD=	yes
 
 .ifndef(NOPORTDOCS)
@@ -51,11 +51,6 @@
 		-e 's|%%DATADIR%%|${DATADIR}|' \
 		-e 's|%%DOCSDIR%%|${DOCSDIR}|' \
 		${WRKSRC}/lib/AmphetaDesk/Settings.pm
-# rc.d
-	@${SED}  \
-		-e 's|%%PREFIX%%|${PREFIX}|' \
-		-e "s|%%PERL%%|${PERL}|" \
-		${FILESDIR}/${PORTNAME}.sh > ${WRKDIR}/${PORTNAME}.sh
 
 post-configure:
 	@${REINPLACE_CMD} -E \
@@ -109,13 +104,11 @@
 		${XARGS} -0 -x -n 10 -I {} \
 		${MKDIR} ${DATADIR}/{}
 # files
-.for ext in gif html ico png pict 
+.for ext in gif html ico png pict
 	@cd ${WRKSRC} && \
 		${FIND} templates -type f -name "*.${ext}" -print0 | \
 		${XARGS} -0 -x -n 10 -I {} \
 		${INSTALL_DATA} {} ${DATADIR}/{}
 .endfor
-# rc.d
-	@${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${PREFIX}/etc/rc.d
 
 .include <bsd.port.mk>
Index: UPDATING
===================================================================
RCS file: /home/ncvs/ports/UPDATING,v
retrieving revision 1.556
diff -u -r1.556 UPDATING
--- UPDATING	8 Oct 2007 09:21:42 -0000	1.556
+++ UPDATING	10 Oct 2007 18:24:35 -0000
@@ -6,7 +6,15 @@
 time you update your ports collection, before attempting any port
 upgrades.
 
-20070614:
+20071010:
+  AFFECTS: users of www/amphetadesk
+  AUTHOR: pgollucci at p6m7g8.com
+
+  www/amphetadesk has been updated to use the USE_RC_SUBR framework
+  for rc.d scripts.  The rc.d script has been renamed from ampetadesk.sh
+  to amphetadesk for consistency with other ports.
+
+20071008:
   AFFECTS: users of www/mediawiki
   AUTHOR: miwi at FreeBSD.org
 


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


More information about the freebsd-bugs mailing list