From owner-svn-ports-head@FreeBSD.ORG  Fri Feb  7 09:02:46 2014
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])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 6FCCE8E6;
 Fri,  7 Feb 2014 09:02:46 +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 3F0E4135B;
 Fri,  7 Feb 2014 09:02:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1792kSH021432;
 Fri, 7 Feb 2014 09:02:46 GMT (envelope-from ehaupt@svn.freebsd.org)
Received: (from ehaupt@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1792kRv021431;
 Fri, 7 Feb 2014 09:02:46 GMT (envelope-from ehaupt@svn.freebsd.org)
Message-Id: <201402070902.s1792kRv021431@svn.freebsd.org>
From: Emanuel Haupt <ehaupt@FreeBSD.org>
Date: Fri, 7 Feb 2014 09:02:46 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r343202 - head/x11-fonts/p5-type1inst
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.17
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: Fri, 07 Feb 2014 09:02:46 -0000

Author: ehaupt
Date: Fri Feb  7 09:02:45 2014
New Revision: 343202
URL: http://svnweb.freebsd.org/changeset/ports/343202
QAT: https://qat.redports.org/buildarchive/r343202/

Log:
  - Support staging
  - Use shebangfix
  - Convert to new options framework
  - Don't conditionalize installation of documentation as it is now handled by
    the new options framework

Modified:
  head/x11-fonts/p5-type1inst/Makefile

Modified: head/x11-fonts/p5-type1inst/Makefile
==============================================================================
--- head/x11-fonts/p5-type1inst/Makefile	Fri Feb  7 09:00:07 2014	(r343201)
+++ head/x11-fonts/p5-type1inst/Makefile	Fri Feb  7 09:02:45 2014	(r343202)
@@ -12,28 +12,28 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	A script that helps install Postscript fonts in X Window System
 
-.if !defined(WITHOUT_X11)
-RUN_DEPENDS=	${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
-		${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
-.endif
-
-USES=		perl5
+USES=		perl5 shebangfix
 NO_BUILD=	yes
 PORTDOCS=	README
-PLIST_FILES=	bin/t1embed bin/type1inst
 
-MAN1=	type1inst.1
+PLIST_FILES=	bin/t1embed bin/type1inst man/man1/type1inst.1.gz
+SHEBANG_FILES=	type1inst t1embed
+
+OPTIONS_DEFINE=	DOCS X11
+OPTIONS_DEFAULT=X11
 
-NO_STAGE=	yes
-pre-install:
-	${REINPLACE_CMD} 's,^#!/usr/bin/perl,#!${PERL},' ${WRKSRC}/type1inst
+X11_RUN_DEPENDS=	${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
+			${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
+
+.include <bsd.port.options.mk>
 
 do-install:
-	@cd ${WRKSRC} && ${INSTALL_SCRIPT} type1inst t1embed ${PREFIX}/bin
-	@${INSTALL_MAN} ${WRKSRC}/type1inst.man ${PREFIX}/man/man1/type1inst.1
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-.endif
+	cd ${WRKSRC} && ${INSTALL_SCRIPT} type1inst t1embed \
+		${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/type1inst.man \
+		${STAGEDIR}${PREFIX}/man/man1/type1inst.1
+
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>