From owner-svn-ports-all@FreeBSD.ORG  Tue Jan 21 10:14:48 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 19204D0C;
 Tue, 21 Jan 2014 10:14:48 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id EDE931B41;
 Tue, 21 Jan 2014 10:14:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0LAElS2002248;
 Tue, 21 Jan 2014 10:14:47 GMT (envelope-from danfe@svn.freebsd.org)
Received: (from danfe@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0LAEldv002246;
 Tue, 21 Jan 2014 10:14:47 GMT (envelope-from danfe@svn.freebsd.org)
Message-Id: <201401211014.s0LAEldv002246@svn.freebsd.org>
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Tue, 21 Jan 2014 10:14:47 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r340590 - head/audio/gtkpod
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Jan 2014 10:14:48 -0000

Author: danfe
Date: Tue Jan 21 10:14:47 2014
New Revision: 340590
URL: http://svnweb.freebsd.org/changeset/ports/340590
QAT: https://qat.redports.org/buildarchive/r340590/

Log:
  Stagify, utilize OPTIONS helpers, reword comments slightly.

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

Modified: head/audio/gtkpod/Makefile
==============================================================================
--- head/audio/gtkpod/Makefile	Tue Jan 21 10:13:35 2014	(r340589)
+++ head/audio/gtkpod/Makefile	Tue Jan 21 10:14:47 2014	(r340590)
@@ -16,14 +16,13 @@ LIB_DEPENDS=	libid3tag.so:${PORTSDIR}/au
 		libgpod.so:${PORTSDIR}/audio/libgpod
 
 USES=		gettext gmake pkgconfig
-NO_STAGE=	yes
 USE_GNOME=	gtk20 libglade2
 GNU_CONFIGURE=	yes
+INSTALLS_ICONS=	yes
+
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-INSTALLS_ICONS=	yes
 
-MAN1=		${PORTNAME}.1
 PORTDOCS=	ChangeLog NEWS README TODOandBUGS.txt TROUBLESHOOTING
 
 OPTIONS_DEFINE=	VORBIS FLAC CURL
@@ -31,40 +30,27 @@ OPTIONS_DEFAULT=	VORBIS FLAC CURL
 
 CURL_DESC=	Cover art download support via libcurl
 
-.include <bsd.port.pre.mk>
+VORBIS_LIB_DEPENDS=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis
+VORBIS_CONFIGURE_OFF=	--without-ogg
+
+FLAC_LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac
+FLAC_CONFIGURE_ARGS=	--without-flac
 
-.if ${PORT_OPTIONS:MVORBIS}
-LIB_DEPENDS+=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis
-.else
-CONFIGURE_ARGS+=	--without-ogg
-.endif
-
-.if ${PORT_OPTIONS:MFLAC}
-LIB_DEPENDS+=	libFLAC.so:${PORTSDIR}/audio/flac
-.else
-CONFIGURE_ARGS+=	--without-flac
-.endif
-
-.if ${PORT_OPTIONS:MCURL}
-LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl
-.else
-CONFIGURE_ARGS+=	--without-curl
-.endif
+CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+CURL_CONFIGURE_ARGS=	--without-curl
 
 post-patch:
 # Install locale files correctly (to share dir instead of lib dir)
 	@${REINPLACE_CMD} -e 's|DATADIRNAME=lib|DATADIRNAME=share|' \
 		${WRKSRC}/configure
-# FreeBSD does not have libdl
+# FreeBSD does not have separate libdl.so
 	@${REINPLACE_CMD} -e 's| -ldl||' ${WRKSRC}/src/Makefile.in
-# Adjust location of <endian.h> header
+# Fix location of the <endian.h> header
 	@${REINPLACE_CMD} -e 's|endian\.h|sys/&|' ${WRKSRC}/configure \
 		${WRKSRC}/src/mp4file.c
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/audio/gtkpod/pkg-plist
==============================================================================
--- head/audio/gtkpod/pkg-plist	Tue Jan 21 10:13:35 2014	(r340589)
+++ head/audio/gtkpod/pkg-plist	Tue Jan 21 10:14:47 2014	(r340590)
@@ -1,4 +1,5 @@
 bin/gtkpod
+man/man1/gtkpod.1.gz
 %%DATADIR%%/data/default-cover.png
 %%DATADIR%%/data/gtkpod-add-dirs.png
 %%DATADIR%%/data/gtkpod-add-files.png