Attachment 186618 Details for Bug 222517 – Proposed patch (since 425824 revision)

[patch] Proposed patch (since 425824 revision)

pngcrush.diff (text/plain), 2.69 KB, created by lightside on 2017-09-22 19:26:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: lightside

Created: 2017-09-22 19:26:48 UTC

Size: 2.69 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 450395)
>+++ Makefile	(working copy)
>@@ -2,10 +2,10 @@
> # $FreeBSD$
> 
> PORTNAME=	pngcrush
>-PORTVERSION=	1.8.7
>+PORTVERSION=	1.8.13
> CATEGORIES=	graphics
>-MASTER_SITES=	SF/pmt/${PORTNAME}/old-versions/${PORTVERSION:R}/${PORTVERSION}/
>-#		# SF/pmt/${PORTNAME}/${PORTVERSION}/
>+MASTER_SITES=	SF/pmt/${PORTNAME}/${PORTVERSION}/ \
>+		SF/pmt/${PORTNAME}/old-versions/${PORTVERSION:R}/${PORTVERSION}/
> DISTNAME=	${PORTNAME}-${PORTVERSION}-nolib
> 
> MAINTAINER=	vsasjason@gmail.com
>@@ -13,13 +13,16 @@
> 
> LIB_DEPENDS=	libpng.so:graphics/png
> 
>-USES=		tar:xz
>-CFLAGS+=	-DPNGCRUSH_COUNT_COLORS -I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib
>-MAKE_ARGS+=	CC="${CC}" CFLAGS="${CFLAGS}" LD="${CC}" LDFLAGS="${LDFLAGS}"
>+USES=		localbase:ldflags tar:xz
>+MAKE_ARGS+=	CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" LD="${CC}" \
>+		LDFLAGS="${LDFLAGS}"
> 
> PLIST_FILES=	bin/pngcrush
> 
>+post-patch:
>+	@${REINPLACE_CMD} -e '/^LIBS/s|-L$$([[:alpha:]]*) ||g' \
>+		${WRKSRC}/Makefile
>+
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/pngcrush
> 
>Index: distinfo
>===================================================================
>--- distinfo	(revision 450395)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1477914424
>-SHA256 (pngcrush-1.8.7-nolib.tar.xz) = f0cfc0d6f4df67106a184600f891b164875b6be7173111c87bec48a509fac60b
>-SIZE (pngcrush-1.8.7-nolib.tar.xz) = 64556
>+TIMESTAMP = 1504041316
>+SHA256 (pngcrush-1.8.13-nolib.tar.xz) = 3b4eac8c5c69fe0894ad63534acedf6375b420f7038f7fc003346dd352618350
>+SIZE (pngcrush-1.8.13-nolib.tar.xz) = 66104
>Index: files/patch-Makefile
>===================================================================
>--- files/patch-Makefile	(revision 450395)
>+++ files/patch-Makefile	(nonexistent)
>@@ -1,29 +0,0 @@
>---- ./Makefile.orig	2013-06-02 13:08:48.000000000 +0300
>-+++ ./Makefile	2013-06-02 13:10:53.000000000 +0300
>-@@ -11,11 +11,11 @@
>- # macros --------------------------------------------------------------------
>- 
>- # uncomment these 2 lines only if you are using an external copy of libpng:
>--PNGINC = ${HOME}/include
>--PNGLIB = ${HOME}/lib
>-+#PNGINC = ${HOME}/include
>-+#PNGLIB = ${HOME}/lib
>- # uncomment these 2 lines only if you are using an external copy of zlib:
>--ZINC = ${HOME}/include
>--ZLIB = ${HOME}/lib
>-+#ZINC = ${HOME}/include
>-+#ZLIB = ${HOME}/lib
>- 
>- CC = gcc
>- LD = gcc
>-@@ -31,8 +31,8 @@
>- PNGCRUSH  = pngcrush
>- 
>- # LIBS = -lm
>--LIBS = -L$(PNGLIB) -lpng -lz -lm
>--# LIBS = -lpng -lz -lm
>-+#LIBS = -L$(PNGLIB) -lpng -lz -lm
>-+LIBS = -lpng -lz -lm
>- #LIBS = ${ZLIB}/libz.a -lm
>- 
>- # uncomment these 4 lines only if you are NOT using an external copy of zlib:

Actions: View | Diff

Attachments on bug 222517: 186618 | 186619 | 186659 | 186667 | 186670 | 186672