From owner-svn-ports-head@FreeBSD.ORG  Tue Aug 26 19:55:45 2014
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 685FFDC8;
 Tue, 26 Aug 2014 19:55:45 +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 4821A3533;
 Tue, 26 Aug 2014 19:55:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7QJtj7j080717;
 Tue, 26 Aug 2014 19:55:45 GMT (envelope-from tijl@FreeBSD.org)
Received: (from tijl@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7QJtirm080715;
 Tue, 26 Aug 2014 19:55:44 GMT (envelope-from tijl@FreeBSD.org)
Message-Id: <201408261955.s7QJtirm080715@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: tijl set sender to tijl@FreeBSD.org
 using -f
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Tue, 26 Aug 2014 19:55:44 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r366263 - in head/emulators/xsystem35: . 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.18-1
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: Tue, 26 Aug 2014 19:55:45 -0000

Author: tijl
Date: Tue Aug 26 19:55:44 2014
New Revision: 366263
URL: http://svnweb.freebsd.org/changeset/ports/366263
QAT: https://qat.redports.org/buildarchive/r366263/

Log:
  - Convert to USES=libtool
  - Add missing dependency on libfreetype and USE_XORG xxf86vm
  - Remove remnants of broken SDL support
  - Replace patch with post-patch command

Deleted:
  head/emulators/xsystem35/files/patch-configure.in
Modified:
  head/emulators/xsystem35/Makefile
  head/emulators/xsystem35/pkg-plist

Modified: head/emulators/xsystem35/Makefile
==============================================================================
--- head/emulators/xsystem35/Makefile	Tue Aug 26 19:55:00 2014	(r366262)
+++ head/emulators/xsystem35/Makefile	Tue Aug 26 19:55:44 2014	(r366263)
@@ -3,7 +3,7 @@
 
 PORTNAME=	xsystem35
 PORTVERSION=	1.7.2
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	emulators
 MASTER_SITES=	http://8ne.sakura.ne.jp:20008/chika/unitbase/xsys35/down/
 
@@ -13,20 +13,24 @@ COMMENT=	AliceSoft System 3.5/3.6/3.8/3.
 LICENSE=	GPLv2 # (or later)
 
 LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis \
+		libfreetype.so:${PORTSDIR}/print/freetype2 \
 		libjpeg.so:${PORTSDIR}/graphics/jpeg
 
 OPTIONS_DEFINE=	ESOUND DOCS EXAMPLES
 
-USES=		gettext gmake
+USES=		gettext gmake libtool
+USE_AUTOTOOLS=	autoconf:env
 USE_GNOME=	gtk12
-USE_AUTOTOOLS=	autoconf libtool
+USE_XORG=	xxf86vm
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-included-gettext \
 		--with-cachesize=20 \
+		--disable-static \
 		--enable-midi=seq,extp,raw \
 		--enable-cdrom=bsd,mp3
-
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib
+MAKE_JOBS_UNSAFE=	yes
 
 SUB_FILES=	pkg-message
 
@@ -41,31 +45,17 @@ CONFIGURE_ARGS+=	--enable-audio=oss,esd 
 CONFIGURE_ARGS+=	--enable-audio=oss --with-default-output=oss
 .endif
 
-#.if ${PORT_OPTIONS:MSDL}
-#USE_SDL=	sdl
-#CONFIGURE_ARGS+=	--enable-sdl
-#CPPFLAGS+=	$$(${SDL_CONFIG} --cflags)
-#LDFLAGS+=	$$(${SDL_CONFIG} --libs)
-#.else
-CONFIGURE_ARGS+=	--disable-sdl
-#.endif
-
-.if ${MACHINE_CPU:Mmmx} && !defined(PACKAGE_BUILDING)
+.if defined(MACHINE_CPU) && ${MACHINE_CPU:Mmmx}
 CONFIGURE_ARGS+=	--enable-mmx
 BUILD_DEPENDS+=		nasm:${PORTSDIR}/devel/nasm
 .else
 CONFIGURE_ARGS+=	--disable-mmx
 .endif
 
-post-extract:
-	@${CP} ${WRKSRC}/INSTALL ${WRKSRC}/doc/INSTALL
-
 post-patch:
-	${FIND} ${WRKSRC}/src -type f |\
-		${XARGS} ${GREP} -l '<SDL/SDL' /dev/null |\
-		${XARGS} ${REINPLACE_CMD} -e 's,<SDL/,<,'
-	@${REINPLACE_CMD} -e \
-		's|__COUNTER__|__COUNTER_H__|' ${WRKSRC}/src/counter.h
+	@${CP} ${WRKSRC}/INSTALL ${WRKSRC}/doc/INSTALL
+	@${REINPLACE_CMD} '/-lxpg4/d' ${WRKSRC}/configure
+	@${REINPLACE_CMD} 's|__COUNTER__|__COUNTER_H__|' ${WRKSRC}/src/counter.h
 
 pre-configure:
 	(cd ${WRKSRC}/libltdl; ${AUTOCONF})

Modified: head/emulators/xsystem35/pkg-plist
==============================================================================
--- head/emulators/xsystem35/pkg-plist	Tue Aug 26 19:55:00 2014	(r366262)
+++ head/emulators/xsystem35/pkg-plist	Tue Aug 26 19:55:44 2014	(r366263)
@@ -1,76 +1,28 @@
 bin/instgame
 bin/xsystem35
-lib/xsystem35/AliceLogo.a
-lib/xsystem35/AliceLogo.la
 lib/xsystem35/AliceLogo.so
-lib/xsystem35/Confirm.a
-lib/xsystem35/Confirm.la
 lib/xsystem35/Confirm.so
-lib/xsystem35/Gpx.a
-lib/xsystem35/Gpx.la
 lib/xsystem35/Gpx.so
-lib/xsystem35/MSGSKIP.a
-lib/xsystem35/MSGSKIP.la
 lib/xsystem35/MSGSKIP.so
-lib/xsystem35/Math.a
-lib/xsystem35/Math.la
 lib/xsystem35/Math.so
-lib/xsystem35/MsgSkip.a
-lib/xsystem35/MsgSkip.la
 lib/xsystem35/MsgSkip.so
-lib/xsystem35/NIGHTDLL.a
-lib/xsystem35/NIGHTDLL.la
 lib/xsystem35/NIGHTDLL.so
-lib/xsystem35/NightDemonDemo.a
-lib/xsystem35/NightDemonDemo.la
 lib/xsystem35/NightDemonDemo.so
-lib/xsystem35/RandMT.a
-lib/xsystem35/RandMT.la
 lib/xsystem35/RandMT.so
-lib/xsystem35/SACT.a
-lib/xsystem35/SACT.la
 lib/xsystem35/SACT.so
-lib/xsystem35/ShArray.a
-lib/xsystem35/ShArray.la
 lib/xsystem35/ShArray.so
-lib/xsystem35/ShCalc.a
-lib/xsystem35/ShCalc.la
 lib/xsystem35/ShCalc.so
-lib/xsystem35/ShGraph.a
-lib/xsystem35/ShGraph.la
 lib/xsystem35/ShGraph.so
-lib/xsystem35/ShPort.a
-lib/xsystem35/ShPort.la
 lib/xsystem35/ShPort.so
-lib/xsystem35/ShSound.a
-lib/xsystem35/ShSound.la
 lib/xsystem35/ShSound.so
-lib/xsystem35/ShString.a
-lib/xsystem35/ShString.la
 lib/xsystem35/ShString.so
-lib/xsystem35/dDemo.a
-lib/xsystem35/dDemo.la
 lib/xsystem35/dDemo.so
-lib/xsystem35/eDemo.a
-lib/xsystem35/eDemo.la
 lib/xsystem35/eDemo.so
-lib/xsystem35/eeDemo.a
-lib/xsystem35/eeDemo.la
 lib/xsystem35/eeDemo.so
-lib/xsystem35/nDEMO.a
-lib/xsystem35/nDEMO.la
 lib/xsystem35/nDEMO.so
-lib/xsystem35/nDEMOE.a
-lib/xsystem35/nDEMOE.la
 lib/xsystem35/nDEMOE.so
-lib/xsystem35/oDEMO.a
-lib/xsystem35/oDEMO.la
 lib/xsystem35/oDEMO.so
-lib/xsystem35/oujimisc.a
-lib/xsystem35/oujimisc.la
 lib/xsystem35/oujimisc.so
-lib/xsystem35/tDemo.a
-lib/xsystem35/tDemo.la
 lib/xsystem35/tDemo.so
 %%PORTDOCS%%%%DOCSDIR%%/BUGS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog