ports/142847: [PATCH] misc/wmweather+: Use SUB_FILES to update pkg-message

Sevan Janiyan venture37 at geeklan.co.uk
Fri Jan 15 02:30:01 UTC 2010


>Number:         142847
>Category:       ports
>Synopsis:       [PATCH] misc/wmweather+: Use SUB_FILES to update pkg-message
>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:   Fri Jan 15 02:30:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Sevan Janiyan
>Release:        FreeBSD 8.0-RELEASE-p2 amd64
>Organization:
>Environment:
System: FreeBSD newbie.thingamajig-systems.co.uk 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #0: Tue Jan  5 21:11:58 UTC
>Description:

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

Port maintainer (dougb at FreeBSD.org) is cc'd.

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

--- wmweather+-2.11_2.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/misc/wmweather+/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- Makefile	22 Aug 2009 00:28:19 -0000	1.18
+++ Makefile	15 Jan 2010 02:16:04 -0000
@@ -37,7 +37,14 @@
 
 PLIST_FILES=	bin/wmweather+
 
-.include <bsd.port.pre.mk>
+.if !defined(NOPORTEXAMPLES)
+SUB_FILES=	pkg-message
+PLIST_FILES+=	${EXAMPLESDIR_REL}/HINTS
+PLIST_FILES+=	${EXAMPLESDIR_REL}/example.conf
+PLIST_DIRS+=	${EXAMPLESDIR_REL}
+.endif
+
+.include <bsd.port.options.mk>
 
 .if !defined(WITHOUT_WM)
 LIB_DEPENDS+=	wraster:${PORTSDIR}/x11-wm/windowmaker
@@ -45,6 +52,8 @@
 LIB_DEPENDS+=	wraster:${PORTSDIR}/x11-wm/libwraster
 .endif
 
+.include <bsd.port.pre.mk>
+
 post-patch:
 	@${CP} ${WRKSRC}/wmweather+.c ${WRKSRC}/wmweather+.c.dist
 	@${SED} -e "s#^void usage(int i) __THROW.*#void usage(int i);#" \
@@ -57,23 +66,10 @@
 	${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/HINTS ${EXAMPLESDIR}/HINTS
 	${INSTALL_DATA} ${WRKSRC}/example.conf ${EXAMPLESDIR}/example.conf
-PLIST_FILES+=	${EXAMPLESDIR_REL}/HINTS
-PLIST_FILES+=	${EXAMPLESDIR_REL}/example.conf
-PLIST_DIRS+=	${EXAMPLESDIR_REL}
-PM=		${WRKDIR}/pkg-message
-PKGMESSAGE=	${WRKDIR}/pkg-message
 .endif
 
-
 post-install:
 .if !defined(NOPORTEXAMPLES)
-	@${ECHO} "===================================================" > ${PM}
-	@${ECHO} "A sample configuration file has been copied to" >> ${PM}
-	@${ECHO} "${EXAMPLESDIR}/example.conf" >> ${PM}
-	@${ECHO} "" >> ${PM}
-	@${ECHO} "Please copy it to ~/.wmweather+/conf and adjust it" >> ${PM}
-	@${ECHO} "to your needs!" >> ${PM}
-	@${ECHO} "===================================================" >> ${PM}
 	@${CAT} ${PKGMESSAGE}
 .endif
 
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	15 Jan 2010 02:16:04 -0000
@@ -0,0 +1,7 @@
+===================================================
+A sample configuration file has been copied to
+%%EXAMPLESDIR%%/example.conf
+
+Please copy it to ~/.wmweather+/conf and adjust it
+to your needs!
+===================================================
--- wmweather+-2.11_2.patch ends here ---

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



More information about the freebsd-ports-bugs mailing list