ports/142590: [patch] irc/trickyirc use DOCSDIR & support NOPORTDOCS, use SUB_FILES, patch mk file as chown wasn't running

Sevan Janiyan venture37 at geeklan.co.uk
Sun Jan 10 19:30:06 UTC 2010


>Number:         142590
>Category:       ports
>Synopsis:       [patch] irc/trickyirc use DOCSDIR & support NOPORTDOCS, use SUB_FILES, patch mk file as chown wasn't running
>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:   Sun Jan 10 19:30:05 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Sevan Janiyan
>Release:        
>Organization:
>Environment:
>Description:

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/irc/trickyirc/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- Makefile	21 Feb 2008 21:19:59 -0000	1.14
+++ Makefile	10 Jan 2010 19:06:37 -0000
@@ -18,15 +18,17 @@
 MAKEFILE=	GNUmakefile
 WRKSRC=		${WRKDIR}/trickyirc
 USE_GMAKE=	YES
+SUB_FILES=	pkg-message
 
 post-install:
-	@ ${MKDIR} ${PREFIX}/share/doc/TrickyIRC
+.if !defined(NOPORTDOCS)
+	@ ${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+.endif
 #	@ ${MKDIR} ${PREFIX}/share/examples/TrickyIRC
 #	${INSTALL_DATA} ${WRKSRC}/config.sample \
 #	    ${PREFIX}/share/examples/TrickyIRC
-	${INSTALL_DATA} ${WRKSRC}/README \
-	    ${PREFIX}/share/doc/TrickyIRC
 	@${STRIP_CMD} ${PREFIX}/bin/trickyirc
-	@${CAT} ${PKGMESSAGE} | ${SED} -e s:/usr/local:${PREFIX}:
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
Index: pkg-message
===================================================================
RCS file: pkg-message
diff -N pkg-message
--- pkg-message	8 Jul 1999 05:43:54 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1 +0,0 @@
-   Please read /usr/local/share/doc/TrickyIRC/README before using!
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/irc/trickyirc/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- pkg-plist	8 Jul 1999 05:43:54 -0000	1.2
+++ pkg-plist	10 Jan 2010 19:06:37 -0000
@@ -1,3 +1,3 @@
 bin/trickyirc
-share/doc/TrickyIRC/README
- at dirrm share/doc/TrickyIRC
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
Index: files/patch-core_make_make.mk
===================================================================
RCS file: files/patch-core_make_make.mk
diff -N files/patch-core_make_make.mk
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-core_make_make.mk	10 Jan 2010 19:06:37 -0000
@@ -0,0 +1,11 @@
+--- core/make/make.mk.orig	2010-01-10 19:00:06.000000000 +0000
++++ core/make/make.mk	2010-01-10 19:00:28.000000000 +0000
+@@ -63,7 +63,7 @@
+ 
+ doinst :
+ 	cp ${BINNAME} ${INSTALLDIR}
+-	chown root.bin ${INSTALLDIR}${BINNAME}
++	chown root:bin ${INSTALLDIR}${BINNAME}
+ 	chmod a+rx ${INSTALLDIR}${BINNAME}
+ 
+ # Messages
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	10 Jan 2010 19:06:37 -0000
@@ -0,0 +1 @@
+   Please read %%DOCSDIR%%/README before using!


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



More information about the freebsd-ports-bugs mailing list