Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 13 Mar 2013 18:31:53 +0100
From:      nemysis <nemysis@gmx.ch>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/176922: [PATCH] graphics/tiff2png: OptionsNG
Message-ID:  <20130313173157.C81C2E6@hub.freebsd.org>
Resent-Message-ID: <201303131740.r2DHe1c8014580@freefall.freebsd.org>

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

>Number:         176922
>Category:       ports
>Synopsis:       [PATCH] graphics/tiff2png: 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:   Wed Mar 13 17:40:01 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:

Makefile changed:

Port is now safe with NOPORTDOCS=yes in /etc/make.conf

+OPTIONS_DEFINE=	DOCS
+.include <bsd.port.options.mk>
+PLIST_FILES+=	%%DOCSDIR%%/README
+PLIST_DIRS+=	%%DOCSDIR%%

Changed and refined:
 do-install:

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
looks usual.

port test: clean

>Fix:

--- tiff2png-0.91_5,1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/graphics/tiff2png/Makefile ./Makefile
--- /usr/ports/graphics/tiff2png/Makefile	2013-01-14 17:57:01.000000000 +0100
+++ ./Makefile	2013-03-13 18:26:51.000000000 +0100
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	tiff2png
-# Date created:				Tue 04 Jul 2000
-# Whom:					will
-#
+# Created by: will
 # $FreeBSD: head/graphics/tiff2png/Makefile 300896 2012-07-14 13:54:48Z beat $
-#
 
 PORTNAME=	tiff2png
 PORTVERSION=	0.91
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SF/png-mng/${PORTNAME}/${PORTVERSION}
@@ -15,8 +11,8 @@
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Converts TIFF images to PNG format
 
-LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
-		jpeg.11:${PORTSDIR}/graphics/jpeg \
+LIB_DEPENDS=	tiff:${PORTSDIR}/graphics/tiff \
+		jpeg:${PORTSDIR}/graphics/jpeg \
 		png15:${PORTSDIR}/graphics/png
 
 MAKEFILE=	Makefile.unx
@@ -30,11 +26,18 @@
 		-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lpng -lz -ltiff -ljpeg -lm
 
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
+
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/tiff2png ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
+
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+PLIST_FILES+=	%%DOCSDIR%%/README
+PLIST_DIRS+=	%%DOCSDIR%%
 .endif
 
 .include <bsd.port.mk>
--- tiff2png-0.91_5,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?20130313173157.C81C2E6>