Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 24 Mar 2013 00:25:31 +0100
From:      nemysis <nemysis@gmx.ch>
To:        FreeBSD-gnats-submit@freebsd.org
Cc:        dinoex@FreeBSD.org
Subject:   ports/177324: [PATCH] graphics/hobbes-icons-xpm: Convert to OptionsNG
Message-ID:  <20130323232540.1A7337C7@hub.freebsd.org>
Resent-Message-ID: <201303232330.r2NNU05L076554@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         177324
>Category:       ports
>Synopsis:       [PATCH] graphics/hobbes-icons-xpm: Convert to OptionsNG
>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:   Sat Mar 23 23:30:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     nemysis
>Release:        FreeBSD 9.1-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r243825: Tue Dec  4 09:23:10
>Description:

- Convert to OptionsNG
- Fix docs

Port maintainer (dinoex@FreeBSD.org) is cc'd.

Generated and tested manually, tested with port test, sent with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports)
>How-To-Repeat:
>Fix:

--- hobbes-icons-xpm3-1.0_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/graphics/hobbes-icons-xpm/Makefile ./Makefile
--- /usr/ports/graphics/hobbes-icons-xpm/Makefile	2013-01-30 14:55:23.000000000 +0100
+++ ./Makefile	2013-03-24 00:17:30.000000000 +0100
@@ -16,18 +16,20 @@
 # Where it will be installed (change pkg/PLIST if you change this)
 LIBDIR=		${PREFIX}/include/X11/pixmaps
 
+PORTDOCS=	README readem.shar
+
+.include <bsd.port.options.mk>
+
 do-install:
 	@${MKDIR} ${LIBDIR}
 	${CP} -R ${WRKSRC}/* ${LIBDIR}
 	${CHOWN} -R ${BINOWN}:${BINGRP} ${LIBDIR}
-	-${RM} ${LIBDIR}/README
-	-${RM} ${LIBDIR}/readem.shar
+	@(cd ${LIBDIR} && ${RM} README readem.shar)
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	@${INSTALL_SCRIPT} ${WRKSRC}/*.shar ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/graphics/hobbes-icons-xpm/pkg-descr ./pkg-descr
--- /usr/ports/graphics/hobbes-icons-xpm/pkg-descr	2013-01-14 17:57:04.000000000 +0100
+++ ./pkg-descr	2013-03-24 00:18:13.000000000 +0100
@@ -7,4 +7,4 @@
 and 16 colors.
 
 If you want the converter program used, write to:
-	-Rick Richardson, rick@pcroe.digibd.com, 10/29/93
+ -Rick Richardson, rick@pcroe.digibd.com, 10/29/93
diff -ruN --exclude=CVS /usr/ports/graphics/hobbes-icons-xpm/pkg-plist ./pkg-plist
--- /usr/ports/graphics/hobbes-icons-xpm/pkg-plist	2013-01-14 17:57:04.000000000 +0100
+++ ./pkg-plist	2013-03-24 00:11:15.000000000 +0100
@@ -3380,9 +3380,6 @@
 include/X11/pixmaps/z/zug.xpm
 include/X11/pixmaps/z/zug1.xpm
 include/X11/pixmaps/z/zug2.xpm
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/readem.shar
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/X11/pixmaps/0
 @dirrm include/X11/pixmaps/1
 @dirrm include/X11/pixmaps/2
--- hobbes-icons-xpm3-1.0_1.patch ends here ---

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130323232540.1A7337C7>