From owner-svn-ports-head@FreeBSD.ORG  Thu Mar 21 19:08:11 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id F18E797E;
 Thu, 21 Mar 2013 19:08:10 +0000 (UTC)
 (envelope-from beech@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id E4683403;
 Thu, 21 Mar 2013 19:08:10 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2LJ8Ara090730;
 Thu, 21 Mar 2013 19:08:10 GMT (envelope-from beech@svn.freebsd.org)
Received: (from beech@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2LJ8Ajs090729;
 Thu, 21 Mar 2013 19:08:10 GMT (envelope-from beech@svn.freebsd.org)
Message-Id: <201303211908.r2LJ8Ajs090729@svn.freebsd.org>
From: Beech Rintoul <beech@FreeBSD.org>
Date: Thu, 21 Mar 2013 19:08:10 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r314864 - head/graphics/png2ico
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.14
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: Thu, 21 Mar 2013 19:08:11 -0000

Author: beech
Date: Thu Mar 21 19:08:10 2013
New Revision: 314864
URL: http://svnweb.freebsd.org/changeset/ports/314864

Log:
  - Convert to OptionsNG
  - Add license
  
  PR:		ports/177119
  Submitted by:	nemysis <nemysis@gmx.ch>

Modified:
  head/graphics/png2ico/Makefile

Modified: head/graphics/png2ico/Makefile
==============================================================================
--- head/graphics/png2ico/Makefile	Thu Mar 21 19:01:04 2013	(r314863)
+++ head/graphics/png2ico/Makefile	Thu Mar 21 19:08:10 2013	(r314864)
@@ -11,6 +11,8 @@ DISTNAME=	${PORTNAME}-src-${PORTVERSION:
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Converts PNG files to Windows icon resource files
 
+LICENSE=	GPLv2
+
 LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
 
 MAN1=		png2ico.1
@@ -19,12 +21,15 @@ PORTDOCS=	bmp.txt
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
+.include <bsd.port.options.mk>
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/doc/png2ico.1 ${PREFIX}/man/man1/
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/bmp.txt ${DOCSDIR}/
+	${INSTALL_MAN} ${WRKSRC}/doc/${MAN1} ${MAN1PREFIX}/man/man1
+
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>