ports/172411: [PATCH] graphics/netpbm: Not clean reinstall, OptionsNG

[nemysis]

>Number:         172411
>Category:       ports
>Synopsis:       [PATCH] graphics/netpbm: Not clean reinstall, 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 Oct 06 20:00:22 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     nemysis
>Release:        FreeBSD 9.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan  3 07:46:30 UTC
>Description:

- OptionsNG

+.include <bsd.port.options.mk>

+.if ${PORT_OPTIONS:MX11}

+.if ${PORT_OPTIONS:MDOCS}


- Not clean reinstall

make reinstall
...
    SRCDIR=/var/tmp/ports/usr/ports/graphics/netpbm/work/netpbm-10.35.86 BUILDDIR=/var/tmp/ports/usr/ports/graphics/netpbm/work/netpbm-10.35.86 install.bin 
    gmake[4]: Entering directory `/var/tmp/ports/usr/ports/graphics/netpbm/work/netpbm-10.35.86/converter/other/fiasco/lib'
    gmake[4]: Nothing to be done for `install.bin'.
    gmake[4]: Leaving directory `/var/tmp/ports/usr/ports/graphics/netpbm/work/netpbm-10.35.86/converter/other/fiasco/lib'
    gmake[3]: Leaving directory `/var/tmp/ports/usr/ports/graphics/netpbm/work/netpbm-10.35.86/converter/other/fiasco'
    cd /usr/local/bin ; \
    ln -s pnmtoplainpnm pnmnoraw
    ln: pnmnoraw: File exists
    gmake[2]: *** [install.bin.local] Error 1
    gmake[2]: Leaving directory `/var/tmp/ports/usr/ports/graphics/netpbm/work/netpbm-10.35.86/converter/other'
    gmake[1]: *** [other/install.bin] Error 2
    gmake[1]: Leaving directory `/var/tmp/ports/usr/ports/graphics/netpbm/work/netpbm-10.35.86/converter'
    gmake: *** [converter/install.bin] Error 2
    *** Error code 2

    Stop in /usr/ports/graphics/netpbm.
    *** Error code 1

    Stop in /usr/ports/graphics/netpbm.


Only this helps for a clean reinstall

cd /usr/local/bin ; rm -f pnmnoraw gemtopbm ppmtojpeg bmptoppm ppmtouil pnmtopnm pnmtofits pnmtotiff pgmslice pnmfile


After this command is clean make reinstall.

===>   Compressing manual pages for netpbm-10.35.86
===>   Running ldconfig
/sbin/ldconfig -m /usr/local/lib
===>   Registering installation for netpbm-10.35.86

Port maintainer (dinoex at 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:

portlint -A
WARN: Makefile: for new port, make $FreeBSD$ tag in comment section empty, to make SVN happy.
WARN: Makefile: LIB_DEPENDS don't specify the ABI version number .4 in tiff.4 unless it is really necessary.
WARN: Makefile: LIB_DEPENDS don't specify the ABI version number .11 in jpeg.11 unless it is really necessary.
WARN: Makefile: LIB_DEPENDS don't specify the ABI version number .1 in jbig.1 unless it is really necessary.
WARN: Makefile: LIB_DEPENDS don't specify the ABI version number .4 in jasper.4 unless it is really necessary.
WARN: Makefile: LIB_DEPENDS don't specify the ABI version number .5 in xml2.5 unless it is really necessary.
0 fatal errors and 6 warnings found.


port test: clean


>Fix:

--- netpbm-10.35.86.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/graphics/netpbm/Makefile ./Makefile
--- /usr/ports/graphics/netpbm/Makefile	2012-08-04 07:44:18.000000000 +0200
+++ ./Makefile	2012-10-06 21:26:54.000000000 +0200
@@ -12,7 +12,7 @@
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	dinoex at FreeBSD.org
-COMMENT=	A toolkit for conversion of images between different formats
+COMMENT=	Toolkit for conversion of images between different formats
 
 LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 		jpeg.11:${PORTSDIR}/graphics/jpeg \
@@ -35,7 +35,9 @@
 
 MAN1=		netpbm.1
 
-.if defined(WITH_X11)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MX11}
 USE_XORG=	x11
 MAKE_ENV+=	WITH_X11="${WITH_X11}"
 PLIST_SUB+=	X11=''
@@ -71,8 +73,8 @@
 	@${REINPLACE_CMD} -e 's|doc/USERDOC|${DOCSDIR}/USERDOC|g' \
 		${WRKSRC}/doc/netpbm.1
 	${INSTALL_MAN} ${WRKSRC}/doc/netpbm.1 ${MANPREFIX}/man/man1
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/USERDOC ${DOCSDIR}/
 .endif
 
--- netpbm-10.35.86.patch ends here ---

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