From owner-svn-ports-all@FreeBSD.ORG  Sun Jul  6 14:55:37 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@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 BC117640;
 Sun,  6 Jul 2014 14:55:37 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8F4342898;
 Sun,  6 Jul 2014 14:55:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s66Etbrb040257;
 Sun, 6 Jul 2014 14:55:37 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s66EtbQ2040256;
 Sun, 6 Jul 2014 14:55:37 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201407061455.s66EtbQ2040256@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sun, 6 Jul 2014 14:55:37 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r360915 - head/emulators/gxemul
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 06 Jul 2014 14:55:37 -0000

Author: bapt
Date: Sun Jul  6 14:55:37 2014
New Revision: 360915
URL: http://svnweb.freebsd.org/changeset/ports/360915
QAT: https://qat.redports.org/buildarchive/r360915/

Log:
  Support stage
  Use options helpers

Modified:
  head/emulators/gxemul/Makefile

Modified: head/emulators/gxemul/Makefile
==============================================================================
--- head/emulators/gxemul/Makefile	Sun Jul  6 14:48:47 2014	(r360914)
+++ head/emulators/gxemul/Makefile	Sun Jul  6 14:55:37 2014	(r360915)
@@ -18,9 +18,9 @@ HAS_CONFIGURE=	yes
 ALL_TARGET=	build
 MAKE_JOBS_UNSAFE=	yes
 
-MAN1=		gxemul.1
 PORTDOCS=	*
-PLIST_FILES=	bin/gxemul
+PLIST_FILES=	bin/gxemul \
+		man/man1/gxemul.1.gz
 
 USE_GCC=	yes
 
@@ -28,14 +28,8 @@ USE_GCC=	yes
 # a virtual VGA adaptor.
 CONFLICTS=	svgalib-[0-9]*
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MX11}
-USE_XORG=	x11
-.else
-CONFIGURE_ARGS+=--disable-x
-.endif
+X11_USE=	xorg=x11
+X11_CONFIGURE_OFF=--disable-x
 
 post-patch:
 	@${REINPLACE_CMD} -Ee \
@@ -44,15 +38,12 @@ post-patch:
 		 s|-f[a-zA-Z-]+||g' ${WRKSRC}/configure
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/gxemul ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/man/gxemul.1 ${MAN1PREFIX}/man/man1
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${MKDIR} -p ${DOCSDIR}/components
-	${MKDIR} -p ${DOCSDIR}/machines
-	${INSTALL_DATA} ${WRKSRC}/doc/components/* ${DOCSDIR}/components
-	${INSTALL_DATA} ${WRKSRC}/doc/machines/* ${DOCSDIR}/machines
-	${INSTALL_DATA} `find ${WRKSRC}/doc/ -type f -depth 1` ${DOCSDIR}
-.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/gxemul ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/man/gxemul.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/components \
+		${STAGEDIR}${DOCSDIR}/machines
+	${INSTALL_DATA} ${WRKSRC}/doc/components/* ${STAGEDIR}${DOCSDIR}/components
+	${INSTALL_DATA} ${WRKSRC}/doc/machines/* ${STAGEDIR}${DOCSDIR}/machines
+	${INSTALL_DATA} `find ${WRKSRC}/doc/ -type f -depth 1` ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>