3 files changed, 41 insertions, 64 deletions

diff --git a/emulators/advancemenu/Makefile b/emulators/advancemenu/Makefile
index 59473831c792..c0e537d4c6e7 100644
--- a/emulators/advancemenu/Makefile
+++ b/emulators/advancemenu/Makefile
@@ -1,56 +1,63 @@
-# New ports collection makefile for:	advancemenu
-# Date created:				2007-01-10
-# Whom:					alepulver
-#
+# Created by: alepulver
 # $FreeBSD$
-#
 
 PORTNAME=	advancemenu
-PORTVERSION=	2.5.0
-PORTREVISION=	1
+PORTVERSION=	2.6
 CATEGORIES=	emulators
 MASTER_SITES=	SF/advancemame/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A frontend for AdvanceMAME, MAME, MESS, RAINE
+COMMENT=	Frontend for AdvanceMAME, MAME, MESS, RAINE
 
-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
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+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)
+CFLAGS+=	-idirafter ${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		advmenu.1
+PORTDOCS=	*
+PLIST_FILES=	bin/advmenu
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "i386"
-BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
-.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
-.endif
-
 post-patch:
-	@${REINPLACE_CMD} -Ee 's|^(pkg.*)/advance|\1/${PORTNAME}|; /pkgdir/d' \
-		${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
+
+do-install:
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} advmenu ${PREFIX}/bin)
+	(cd ${WRKSRC}/doc && ${INSTALL_MAN} advmenu.1 ${MANPREFIX}/man/man1)
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+.for i in HISTORY README RELEASE
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${DOCSDIR})
+.endfor
+	(cd ${WRKSRC}/doc && ${INSTALL_DATA} advmenu.[ht]* ${DOCSDIR})
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/emulators/advancemenu/distinfo b/emulators/advancemenu/distinfo
index c7ced9186420..6d22080d7a2a 100644
--- a/emulators/advancemenu/distinfo
+++ b/emulators/advancemenu/distinfo
@@ -1,2 +1,2 @@
-SHA256 (advancemenu-2.5.0.tar.gz) = 2f0509974c4cfd9dcc30506581897a456bcb525a773fafe7df8150763d0f15ab
-SIZE (advancemenu-2.5.0.tar.gz) = 2317328
+SHA256 (advancemenu-2.6.tar.gz) = e854c9d58d8e936f926493476e25a37089e3c39ab53863cfecaa4fb645dc4b31
+SIZE (advancemenu-2.6.tar.gz) = 2384272
diff --git a/emulators/advancemenu/pkg-plist b/emulators/advancemenu/pkg-plist
deleted file mode 100644
index 3225c96ac92b..000000000000
--- a/emulators/advancemenu/pkg-plist
+++ /dev/null
@@ -1,30 +0,0 @@
-bin/advmenu
-%%PORTDOCS%%%%DOCSDIR%%/advcfg.html
-%%PORTDOCS%%%%DOCSDIR%%/advcfg.txt
-%%PORTDOCS%%%%DOCSDIR%%/advdev.html
-%%PORTDOCS%%%%DOCSDIR%%/advdev.txt
-%%PORTDOCS%%%%DOCSDIR%%/advmenu.html
-%%PORTDOCS%%%%DOCSDIR%%/advmenu.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%%/cost.html
-%%PORTDOCS%%%%DOCSDIR%%/cost.txt
-%%PORTDOCS%%%%DOCSDIR%%/faq.html
-%%PORTDOCS%%%%DOCSDIR%%/faq.txt
-%%PORTDOCS%%%%DOCSDIR%%/histmenu.html
-%%PORTDOCS%%%%DOCSDIR%%/histmenu.txt
-%%PORTDOCS%%%%DOCSDIR%%/install.html
-%%PORTDOCS%%%%DOCSDIR%%/install.txt
-%%PORTDOCS%%%%DOCSDIR%%/readmenu.html
-%%PORTDOCS%%%%DOCSDIR%%/readmenu.txt
-%%PORTDOCS%%%%DOCSDIR%%/relemenu.html
-%%PORTDOCS%%%%DOCSDIR%%/relemenu.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%