- Update to 2.7

- Update pkg-descr

PR:		188142
Submitted by:	ports fury

3 files changed, 32 insertions, 30 deletions

diff --git a/emulators/advancemenu/Makefile b/emulators/advancemenu/Makefile
index 91f16b434556..2092af4c7dc0 100644
--- a/emulators/advancemenu/Makefile
+++ b/emulators/advancemenu/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	advancemenu
-PORTVERSION=	2.6
-PORTREVISION=	1
+PORTVERSION=	2.7
 CATEGORIES=	emulators
 MASTER_SITES=	SF/advancemame/${PORTNAME}/${PORTVERSION}
 
@@ -14,12 +13,11 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
 
-USE_SDL=	sdl
 USES=		gmake
+USE_SDL=	sdl
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-asm --disable-svgalib --disable-fb \
-		--disable-alsa --enable-oss --disable-slang \
-		--disable-ncurses --disable-kevent
+CONFIGURE_ARGS=	--disable-svgalib --disable-fb --disable-alsa --enable-oss \
+		--disable-slang --disable-ncurses --disable-kevent
 
 CFLAGS+=	-idirafter ${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -27,29 +25,33 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 PORTDOCS=	*
 PLIST_FILES=	bin/advmenu man/man1/advmenu.1.gz
 
-OPTIONS_DEFINE=	FREETYPE DOCS
-OPTIONS_DEFAULT=FREETYPE
+OPTIONS_DEFINE=		DOCS FREETYPE
+OPTIONS_DEFINE_i386=	ASM
+OPTIONS_DEFAULT=	FREETYPE
+OPTIONS_DEFAULT_i386=	ASM
 
+ASM_BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
+ASM_CONFIGURE_ENABLE=	asm
+FREETYPE_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
 FREETYPE_CONFIGURE_ENABLE=	freetype
-FREETYPE_LIB_DEPENDS=		libfreetype.so:${PORTSDIR}/print/freetype2
 
 post-patch:
 	@${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 ${STAGEDIR}${PREFIX}/bin)
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} advmenu \
+		${STAGEDIR}${PREFIX}/bin)
 	(cd ${WRKSRC}/doc && ${INSTALL_MAN} advmenu.1 \
 		${STAGEDIR}${MANPREFIX}/man/man1)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	(cd ${WRKSRC} && ${INSTALL_DATA} HISTORY README RELEASE \
+.for i in HISTORY README RELEASE
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} \
+		${STAGEDIR}${DOCSDIR})
+.endfor
+	(cd ${WRKSRC}/doc && ${INSTALL_DATA} advmenu.[ht]* \
 		${STAGEDIR}${DOCSDIR})
-	(cd ${WRKSRC}/doc && ${INSTALL_DATA} advmenu.[ht]* ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/emulators/advancemenu/distinfo b/emulators/advancemenu/distinfo
index 6d22080d7a2a..aa9606b91884 100644
--- a/emulators/advancemenu/distinfo
+++ b/emulators/advancemenu/distinfo
@@ -1,2 +1,2 @@
-SHA256 (advancemenu-2.6.tar.gz) = e854c9d58d8e936f926493476e25a37089e3c39ab53863cfecaa4fb645dc4b31
-SIZE (advancemenu-2.6.tar.gz) = 2384272
+SHA256 (advancemenu-2.7.tar.gz) = e635f8d236b08e40587344daa33ef78d50d14e01fb6a7ef74eb6fdb3e80cb224
+SIZE (advancemenu-2.7.tar.gz) = 2371297
diff --git a/emulators/advancemenu/pkg-descr b/emulators/advancemenu/pkg-descr
index 02e096377686..12d3f8153e76 100644
--- a/emulators/advancemenu/pkg-descr
+++ b/emulators/advancemenu/pkg-descr
@@ -1,21 +1,21 @@
-AdvanceMENU is a frontend for AdvanceMAME, MAME, MESS, RAINE and any other
-emulator.
+AdvanceMENU is a frontend for AdvanceMAME, MAME, MESS, RAINE and any
+other emulator.
 
 It runs in Linux, Mac OS X, DOS, Windows and in all the other platforms
 supported by the SDL library. The main features are:
 
 * Auto update of the rom info.
 * Vertical and horizontal orientation.
-* Support for any TV/Arcade Monitor like AdvanceMAME but it's good also for a
-  normal PC monitor.
-* Static and Animated image and clip preview (PNG/PCX/ICO/MNG). Up to 192
-  images at the same time!
-* Sound preview. (MP3/WAV). You can select a special sound for every game
-  played when the cursor move on it.
-* Sound backgrounds (MP3/WAV). Play your favourite songs or radio records in
-  background.
-* Sound effects (MP3/WAV) for key press, program start, game start, program
-  exit...
+* Support for any TV/Arcade Monitor like AdvanceMAME but it's good also
+  for a normal PC monitor.
+* Static and Animated image and clip preview (PNG/PCX/ICO/MNG). Up to
+  192 images at the same time!
+* Sound preview. (MP3/WAV). You can select a special sound for every
+  game played when the cursor move on it.
+* Sound backgrounds (MP3/WAV). Play your favourite songs or radio
+  records in background.
+* Sound effects (MP3/WAV) for key press, program start, game start,
+  program exit...
 * Support for zipped images and sounds archives.
 * Screensaver. A slide show of the game images.
 * Selectable background and help images with translucency.