- Update to 1.2

PR:		177933
Submitted by:	Ports Fury

3 files changed, 77 insertions, 95 deletions

diff --git a/emulators/advancemame/Makefile b/emulators/advancemame/Makefile
index 8c2fe900442a..05a742989e3f 100644
--- a/emulators/advancemame/Makefile
+++ b/emulators/advancemame/Makefile
@@ -1,59 +1,103 @@
-# New ports collection makefile for:	advancemame
-# Date created:				2007-01-10
-# Whom:					alepulver
-#
+# Created by: alepulver
 # $FreeBSD$
-#
 
 PORTNAME=	advancemame
-PORTVERSION=	0.106.1
-PORTREVISION=	1
+PORTVERSION=	1.2
 CATEGORIES=	emulators
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	SDL MAME port with advanced TV and monitor video support
 
-LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
+LICENSE=	GPLv2
+
+LIB_DEPENDS=	expat:${PORTSDIR}/textproc/expat2
+
+OPTIONS_DEFINE=	FREETYPE DOCS
+OPTIONS_DEFAULT=FREETYPE
 
-USE_GL=		yes
-USE_GMAKE=	yes
 USE_SDL=	sdl
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-LDFLAGS+=	-L${LOCALBASE}/lib
-CFLAGS+=	-idirafter ${LOCALBASE}/include
+CONFIGURE_ARGS=	--disable-asm --disable-svgalib --disable-fb \
+		--disable-alsa --enable-oss --disable-slang \
+		--disable-ncurses --disable-kevent
+MAKE_JOBS_SAFE=	yes
 
-OPTIONS_DEFINE=	FREETYPE SLANG DOCS
-SLANG_DESC=	Enable sLang support (for video driver)
+DATADIR=	${PREFIX}/share/advance
+
+CFLAGS+=	-idirafter ${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		advdev.1 advj.1 advk.1 advm.1 advmame.1 advs.1
+PORTDOCS=	*
+PLIST_FILES=	bin/advj \
+		bin/advk \
+		bin/advm \
+		bin/advmame \
+		bin/advs \
+		%%DATADIR%%/artwork/.keep_me \
+		%%DATADIR%%/diff/.keep_me \
+		%%DATADIR%%/event.dat \
+		%%DATADIR%%/history.dat \
+		%%DATADIR%%/hiscore.dat \
+		%%DATADIR%%/image/.keep_me \
+		%%DATADIR%%/rom/.keep_me \
+		%%DATADIR%%/sample/.keep_me \
+		%%DATADIR%%/snap/.keep_me
+PLIST_DIRS=	%%DATADIR%%/snap \
+		%%DATADIR%%/sample \
+		%%DATADIR%%/rom \
+		%%DATADIR%%/image \
+		%%DATADIR%%/diff \
+		%%DATADIR%%/artwork \
+		%%DATADIR%%
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "i386"
-BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
-.endif
-.if ${ARCH} == "powerpc"
-BROKEN=		Does not compile on powerpc
-.endif
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MFREETYPE}
-LIB_DEPENDS+=	freetype.9:${PORTSDIR}/print/freetype2
+LIB_DEPENDS+=	freetype:${PORTSDIR}/print/freetype2
 .else
 CONFIGURE_ARGS+=--disable-freetype
 .endif
 
-.if ${PORT_OPTIONS:MSLANG}
-LIB_DEPENDS+=	slang.2:${PORTSDIR}/devel/libslang2
-.else
-CONFIGURE_ARGS+=--disable-slang
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "powerpc"
+BROKEN=		Does not compile on powerpc
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -Ee 's|^(pkg.*)/advance|\1/${PORTNAME}|' \
-		${WRKSRC}/advance/advance.mak
-.if empty(PORT_OPTIONS:MDOCS)
-	@${REINPLACE_CMD} -e '/pkgdocdir/d' ${WRKSRC}/advance/advance.mak
+	@${REINPLACE_CMD} -e \
+		's|-lpthread|-pthread|' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		's|@@|@|' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e \
+		'/\(pkgdocdir\)/s|^|#| ; \
+		 /WHOLE_CFLAGS_OPT/s|-O2|| ; \
+		 /WHOLE_LDFLAGS/s|-s||' ${WRKSRC}/advance/advance.mak
+	@${REINPLACE_CMD} -e \
+		's|-lpthread|-pthread|' ${WRKSRC}/advance/emu.mak
+
+do-install:
+.for i in advj advk advm advmame advs
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${i} ${PREFIX}/bin)
+.endfor
+.for i in ${MAN1}
+	(cd ${WRKSRC}/doc && ${INSTALL_MAN} ${i} ${MANPREFIX}/man/man1)
+.endfor
+	@${MKDIR} ${DATADIR}
+	(cd ${WRKSRC}/support && ${INSTALL_DATA} *.dat ${DATADIR})
+.for i in artwork diff image rom sample snap
+	@${MKDIR} ${DATADIR}/${i}
+	@${ECHO_CMD} -n > ${DATADIR}/${i}/.keep_me
+.endfor
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+.for i in HISTORY README RELEASE
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${DOCSDIR})
+.endfor
+	(cd ${WRKSRC}/doc && ${INSTALL_DATA} *.[ht]* ${DOCSDIR})
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/emulators/advancemame/distinfo b/emulators/advancemame/distinfo
index ce37043cadb3..4bbcfd23aefe 100644
--- a/emulators/advancemame/distinfo
+++ b/emulators/advancemame/distinfo
@@ -1,2 +1,2 @@
-SHA256 (advancemame-0.106.1.tar.gz) = 03499e2f205e0c53a8c8af2520024304eea6c67e67f05dee9f53061b7bf04cb7
-SIZE (advancemame-0.106.1.tar.gz) = 17302325
+SHA256 (advancemame-1.2.tar.gz) = eaf46e54f0cb5fa1d99f55604a4a3f8a065c1cf5e70ac4abc67391b0450ce439
+SIZE (advancemame-1.2.tar.gz) = 17508670
diff --git a/emulators/advancemame/pkg-plist b/emulators/advancemame/pkg-plist
deleted file mode 100644
index 18bb23078a34..000000000000
--- a/emulators/advancemame/pkg-plist
+++ /dev/null
@@ -1,62 +0,0 @@
-@exec for i in artwork crc image rom sample; do mkdir -p %D/%%DATADIR%%/${i}; done
-bin/advj
-bin/advk
-bin/advm
-bin/advmame
-bin/advs
-%%DATADIR%%/event.dat
-%%DATADIR%%/hiscore.dat
-%%DATADIR%%/history.dat
-%%PORTDOCS%%%%DOCSDIR%%/advcfg.html
-%%PORTDOCS%%%%DOCSDIR%%/advcfg.txt
-%%PORTDOCS%%%%DOCSDIR%%/advdev.html
-%%PORTDOCS%%%%DOCSDIR%%/advdev.txt
-%%PORTDOCS%%%%DOCSDIR%%/advj.html
-%%PORTDOCS%%%%DOCSDIR%%/advj.txt
-%%PORTDOCS%%%%DOCSDIR%%/advk.html
-%%PORTDOCS%%%%DOCSDIR%%/advk.txt
-%%PORTDOCS%%%%DOCSDIR%%/advline.html
-%%PORTDOCS%%%%DOCSDIR%%/advline.txt
-%%PORTDOCS%%%%DOCSDIR%%/advm.html
-%%PORTDOCS%%%%DOCSDIR%%/advm.txt
-%%PORTDOCS%%%%DOCSDIR%%/advmame.html
-%%PORTDOCS%%%%DOCSDIR%%/advmame.txt
-%%PORTDOCS%%%%DOCSDIR%%/advs.html
-%%PORTDOCS%%%%DOCSDIR%%/advs.txt
-%%PORTDOCS%%%%DOCSDIR%%/advv.html
-%%PORTDOCS%%%%DOCSDIR%%/advv.txt
-%%PORTDOCS%%%%DOCSDIR%%/authors.html
-%%PORTDOCS%%%%DOCSDIR%%/authors.txt
-%%PORTDOCS%%%%DOCSDIR%%/build.html
-%%PORTDOCS%%%%DOCSDIR%%/build.txt
-%%PORTDOCS%%%%DOCSDIR%%/carddos.html
-%%PORTDOCS%%%%DOCSDIR%%/carddos.txt
-%%PORTDOCS%%%%DOCSDIR%%/cardlinx.html
-%%PORTDOCS%%%%DOCSDIR%%/cardlinx.txt
-%%PORTDOCS%%%%DOCSDIR%%/cardwin.html
-%%PORTDOCS%%%%DOCSDIR%%/cardwin.txt
-%%PORTDOCS%%%%DOCSDIR%%/cost.html
-%%PORTDOCS%%%%DOCSDIR%%/cost.txt
-%%PORTDOCS%%%%DOCSDIR%%/faq.html
-%%PORTDOCS%%%%DOCSDIR%%/faq.txt
-%%PORTDOCS%%%%DOCSDIR%%/histemu.html
-%%PORTDOCS%%%%DOCSDIR%%/histemu.txt
-%%PORTDOCS%%%%DOCSDIR%%/install.html
-%%PORTDOCS%%%%DOCSDIR%%/install.txt
-%%PORTDOCS%%%%DOCSDIR%%/license.html
-%%PORTDOCS%%%%DOCSDIR%%/license.txt
-%%PORTDOCS%%%%DOCSDIR%%/reademu.html
-%%PORTDOCS%%%%DOCSDIR%%/reademu.txt
-%%PORTDOCS%%%%DOCSDIR%%/releemu.html
-%%PORTDOCS%%%%DOCSDIR%%/releemu.txt
-%%PORTDOCS%%%%DOCSDIR%%/script.html
-%%PORTDOCS%%%%DOCSDIR%%/script.txt
-%%PORTDOCS%%%%DOCSDIR%%/svgawin.html
-%%PORTDOCS%%%%DOCSDIR%%/svgawin.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%/sample
-@dirrm %%DATADIR%%/rom
-@dirrm %%DATADIR%%/image
-@dirrm %%DATADIR%%/crc
-@dirrm %%DATADIR%%/artwork
-@dirrm %%DATADIR%%