Date: Mon, 25 Nov 2013 02:52:05 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/184232: graphics/png2ico: Fix build Message-ID: <20131125025205.88f7ac92be1b187475bc1e13@yahoo.com> Resent-Message-ID: <201311241810.rAOIA4BV046870@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 184232
>Category: ports
>Synopsis: graphics/png2ico: Fix build
>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: Sun Nov 24 18:10:04 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 8.4-RELEASE-p4 i386
>Organization:
>Environment:
>Description:
- Fix build
New file:
files/patch-png2ico.cpp
Remove file:
files/patch-Makefile
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/graphics/png2ico/Makefile graphics/png2ico/Makefile
--- /usr/ports/graphics/png2ico/Makefile 2013-11-06 22:02:20.000000000 +0900
+++ graphics/png2ico/Makefile 2013-11-25 00:00:00.000000000 +0900
@@ -13,24 +13,29 @@
LICENSE= GPLv2
-LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
-
-MAN1= png2ico.1
-PLIST_FILES= bin/png2ico
-PORTDOCS= bmp.txt
+LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png
WRKSRC= ${WRKDIR}/${PORTNAME}
-NO_STAGE= yes
+CPPFLAGS+= $$(libpng-config --cflags)
+LDFLAGS+= $$(libpng-config --ldflags)
+
+PORTDOCS= bmp.txt
+PLIST_FILES= bin/png2ico man/man1/png2ico.1.gz
+
.include <bsd.port.options.mk>
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/doc/${MAN1} ${MAN1PREFIX}/man/man1
+do-build:
+ (cd ${WRKSRC} && ${CXX} ${CXXFLAGS} ${CPPFLAGS} -o png2ico \
+ png2ico.cpp ${LDFLAGS})
-.if ${PORT_OPTIONS:MDOCS}
- @${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${DOCSDIR}
-.endif
+do-install:
+ (cd ${WRKSRC} && ${INSTALL_PROGRAM} png2ico \
+ ${STAGEDIR}${PREFIX}/bin)
+ (cd ${WRKSRC}/doc && ${INSTALL_DATA} png2ico.1 \
+ ${STAGEDIR}${MAN1PREFIX}/man/man1)
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ (cd ${WRKSRC}/doc && ${INSTALL_DATA} bmp.txt \
+ ${STAGEDIR}${DOCSDIR})
.include <bsd.port.mk>
diff -urN /usr/ports/graphics/png2ico/files/patch-Makefile graphics/png2ico/files/patch-Makefile
--- /usr/ports/graphics/png2ico/files/patch-Makefile 2013-11-06 22:02:20.000000000 +0900
+++ graphics/png2ico/files/patch-Makefile 1970-01-01 09:00:00.000000000 +0900
@@ -1,11 +0,0 @@
---- Makefile.orig Mon Oct 17 13:19:41 2005
-+++ Makefile Mon Oct 17 13:21:09 2005
-@@ -5,7 +5,7 @@
- all: png2ico
-
- png2ico: png2ico.cpp
-- g++ $(CPPFLAGS) $(DEBUG) -o $@ $< -lpng -lz -lm
-+ $(CXX) $(CXXFLAGS) -I$(LOCALBASE)/include -L$(LOCALBASE)/lib -o $@ $< -lpng -lz -lm
-
- doc/png2ico.txt: doc/png2ico.1
- man $< |sed -e $$'s/.\b\\(.\\)/\\1/g' -e 's/\(.*\)/\1'$$'\r/' >$@
diff -urN /usr/ports/graphics/png2ico/files/patch-png2ico.cpp graphics/png2ico/files/patch-png2ico.cpp
--- /usr/ports/graphics/png2ico/files/patch-png2ico.cpp 1970-01-01 09:00:00.000000000 +0900
+++ graphics/png2ico/files/patch-png2ico.cpp 2013-11-25 00:00:00.000000000 +0900
@@ -0,0 +1,10 @@
+--- png2ico.cpp.orig
++++ png2ico.cpp
+@@ -33,6 +33,7 @@
+
+
+ #include <cstdio>
++#include <cstdlib>
+ #include <vector>
+ #include <climits>
+
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131125025205.88f7ac92be1b187475bc1e13>