From owner-svn-ports-head@FreeBSD.ORG  Mon Nov 25 13:35:29 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 9258C2EB;
 Mon, 25 Nov 2013 13:35:29 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6741A29CB;
 Mon, 25 Nov 2013 13:35:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAPDZTIq056028;
 Mon, 25 Nov 2013 13:35:29 GMT (envelope-from ak@svn.freebsd.org)
Received: (from ak@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAPDZTj8056023;
 Mon, 25 Nov 2013 13:35:29 GMT (envelope-from ak@svn.freebsd.org)
Message-Id: <201311251335.rAPDZTj8056023@svn.freebsd.org>
From: Alex Kozlov <ak@FreeBSD.org>
Date: Mon, 25 Nov 2013 13:35:29 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r334849 - in head/graphics/png2ico: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.16
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Nov 2013 13:35:29 -0000

Author: ak
Date: Mon Nov 25 13:35:28 2013
New Revision: 334849
URL: http://svnweb.freebsd.org/changeset/ports/334849

Log:
  - Fix build with clang
  - Support STAGEDIR
  - Convert to new LIB_DEPENDS syntax
  
  PR:	ports/184232
  Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

Added:
  head/graphics/png2ico/files/patch-png2ico.cpp   (contents, props changed)
Deleted:
  head/graphics/png2ico/files/patch-Makefile
Modified:
  head/graphics/png2ico/Makefile

Modified: head/graphics/png2ico/Makefile
==============================================================================
--- head/graphics/png2ico/Makefile	Mon Nov 25 13:18:42 2013	(r334848)
+++ head/graphics/png2ico/Makefile	Mon Nov 25 13:35:28 2013	(r334849)
@@ -13,24 +13,24 @@ COMMENT=	Converts PNG files to Windows i
 
 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
-.include <bsd.port.options.mk>
+CPPFLAGS+=	$$(libpng-config --cflags)
+LDFLAGS+=	$$(libpng-config --ldflags)
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/doc/${MAN1} ${MAN1PREFIX}/man/man1
+PORTDOCS=	bmp.txt
+PLIST_FILES=	bin/png2ico man/man1/png2ico.1.gz
+
+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:
+	${INSTALL_PROGRAM} ${WRKSRC}/png2ico ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/doc/png2ico.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Added: head/graphics/png2ico/files/patch-png2ico.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/png2ico/files/patch-png2ico.cpp	Mon Nov 25 13:35:28 2013	(r334849)
@@ -0,0 +1,10 @@
+--- png2ico.cpp.orig
++++ png2ico.cpp
+@@ -33,6 +33,7 @@
+ 
+ 
+ #include <cstdio>
++#include <cstdlib>
+ #include <vector>
+ #include <climits>
+