svn commit: r350393 - head/audio/gqmpeg

[Baptiste Daroussin]

Author: bapt
Date: Sun Apr  6 18:05:48 2014
New Revision: 350393
URL: http://svnweb.freebsd.org/changeset/ports/350393
QAT: https://qat.redports.org/buildarchive/r350393/

Log:
  Support stage

Modified:
  head/audio/gqmpeg/Makefile
  head/audio/gqmpeg/pkg-plist

Modified: head/audio/gqmpeg/Makefile
==============================================================================
--- head/audio/gqmpeg/Makefile	Sun Apr  6 18:00:10 2014	(r350392)
+++ head/audio/gqmpeg/Makefile	Sun Apr  6 18:05:48 2014	(r350393)
@@ -11,18 +11,17 @@ MASTER_SITES=	SF
 MAINTAINER?=	lyngbol at wheel.dk
 COMMENT?=	Another gtk-based MP3 frontend
 
+OPTIONS_DEFINE=	MPG321
+MPG321_DESC=	use mpg321 instead of mpg123
+
 LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png
 RUN_DEPENDS=	ogg123:${PORTSDIR}/audio/vorbis-tools \
 		xmp:${PORTSDIR}/audio/xmp
 
-.if defined(WITH_MPG321)
-RUN_DEPENDS+=	mpg321:${PORTSDIR}/audio/mpg321
-.else
-RUN_DEPENDS+=	mpg123:${PORTSDIR}/audio/mpg123
-.endif
+MPG321_RUN_DEPENDS=	mpg321:${PORTSDIR}/audio/mpg321
+MPG321_RUN_DEPENDS_OFF=	mpg123:${PORTSDIR}/audio/mpg123
 
 USE_GNOME=	gdkpixbuf
-NO_STAGE=	yes
 USES=		gettext
 USE_AUTOTOOLS=	autoconf213 libtool
 CONFIGURE_ENV+=	USE_GNOME=""
@@ -30,23 +29,11 @@ CONFIGURE_ENV+=	USE_GNOME=""
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
 LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 
-MAN1=		gqmpeg.1
-
-.include <bsd.port.pre.mk>
-
-.if !defined(WITH_MPG321)
-pre-everything::
-	@${ECHO_MSG}
-	@${ECHO_MSG} "If you want to use mpg321 instead of mpg123,"
-	@${ECHO_MSG} "hit Ctrl-C right now and execute \"make WITH_MPG321=yes\""
-	@${ECHO_MSG}
-.endif
+.include <bsd.port.options.mk>
 
-.if defined(WITH_MPG321)
 post-patch:
 	@${REINPLACE_CMD} -E -e \
 		's/^(#define MPG123_BINARY "mpg)123"/\1321"/' \
 		${WRKSRC}/src/io_mpg123.c
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/audio/gqmpeg/pkg-plist
==============================================================================
--- head/audio/gqmpeg/pkg-plist	Sun Apr  6 18:00:10 2014	(r350392)
+++ head/audio/gqmpeg/pkg-plist	Sun Apr  6 18:05:48 2014	(r350393)
@@ -1,7 +1,6 @@
 bin/gqmpeg
 bin/gqmpeg-shoutcast-plugin.sh
-%%GNOME:%%share/gnome/apps/Multimedia/gqmpeg.desktop
-%%GNOME:%%share/pixmaps/gqmpeg.png
+man/man1/gqmpeg.1.gz
 share/gqmpeg/skins/README
 share/gqmpeg/skins/SKIN-SPECS
 share/gqmpeg/skins/mrclean/blue-handle-24.png