Skip site navigation (1)Skip section navigation (2)
Date:      Fri,  7 Mar 2014 02:42:18 +0400 (MSK)
From:      Dmitry Marakasov <amdmi3@amdmi3.ru>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/187331: [PATCH] graphics/optipng: support staging
Message-ID:  <20140306224218.752F327AB5@hades.panopticon>
Resent-Message-ID: <201403062250.s26Mo1wE060607@freefall.freebsd.org>

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

>Number:         187331
>Category:       ports
>Synopsis:       [PATCH] graphics/optipng: support staging
>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:   Thu Mar 06 22:50:01 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Dmitry Marakasov
>Release:        FreeBSD 10.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD hades.panopticon 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260807: Fri Jan 17 13:14:28 MSK
>Description:
- Support staging
- Use new LIB_DEPENDS syntax

Port maintainer (tom@hur.st) is cc'd.

Generated with FreeBSD Port Tools 1.00.2014.02.18 (mode: change, diff: ports)
>How-To-Repeat:
>Fix:

--- optipng-0.7.4.patch begins here ---
diff -ruN /usr/ports/graphics/optipng/Makefile ./Makefile
--- /usr/ports/graphics/optipng/Makefile	2014-01-22 21:00:46.000000000 +0400
+++ ./Makefile	2014-03-06 18:37:06.445023247 +0400
@@ -18,19 +18,17 @@
 BUNDLED_ZLIB_DESC=	Use bundled zlib
 
 HAS_CONFIGURE=	yes
-PLIST_FILES=	bin/optipng
-MAN1=		optipng.1
+PLIST_FILES=	bin/optipng man/man1/optipng.1.gz
 PORTDOCS=	history.txt optipng.man.html optipng.man.pdf optipng.man.txt \
 		png_optimization.html todo.txt
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if empty(PORT_OPTIONS:MBUNDLED_LIBPNG)
 CONFIGURE_ARGS+=	--with-system-libpng
 CFLAGS+=	"-I${LOCALBASE}/include"
 LDFLAGS+=	"-L${LOCALBASE}/lib"
-LIB_DEPENDS+=	png15:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=	libpng15.so:${PORTSDIR}/graphics/png
 .endif
 
 .if empty(PORT_OPTIONS:MBUNDLED_ZLIB)
@@ -38,13 +36,11 @@
 .endif
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/optipng/optipng ${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/src/optipng/man/optipng.1 ${MAN1PREFIX}/man/man1/
+	${INSTALL_PROGRAM} ${WRKSRC}/src/optipng/optipng ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_MAN} ${WRKSRC}/src/optipng/man/optipng.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	${INSTALL} -d ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/doc/,} ${DOCSDIR}/
-.endif
+	${INSTALL} -d ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/doc/,} ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
--- optipng-0.7.4.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?20140306224218.752F327AB5>