From owner-svn-ports-all@FreeBSD.ORG  Wed Nov  6 12:14:49 2013
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 ESMTP id 8D38FE97;
 Wed,  6 Nov 2013 12:14:49 +0000 (UTC) (envelope-from mat@FreeBSD.org)
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 7BB042A36;
 Wed,  6 Nov 2013 12:14:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA6CEn1F062348;
 Wed, 6 Nov 2013 12:14:49 GMT (envelope-from mat@svn.freebsd.org)
Received: (from mat@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA6CEnGV062347;
 Wed, 6 Nov 2013 12:14:49 GMT (envelope-from mat@svn.freebsd.org)
Message-Id: <201311061214.rA6CEnGV062347@svn.freebsd.org>
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Wed, 6 Nov 2013 12:14:49 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r332970 - head/audio/mp3info
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.14
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: Wed, 06 Nov 2013 12:14:49 -0000

Author: mat
Date: Wed Nov  6 12:14:48 2013
New Revision: 332970
URL: http://svnweb.freebsd.org/changeset/ports/332970

Log:
  - Fix WITH=GTK2
  - Stagify
  - Use new options framework.
  
  maintainer timeout.
  
  PR:		ports/183160
  Submitted by:	mat

Modified:
  head/audio/mp3info/Makefile

Modified: head/audio/mp3info/Makefile
==============================================================================
--- head/audio/mp3info/Makefile	Wed Nov  6 12:12:45 2013	(r332969)
+++ head/audio/mp3info/Makefile	Wed Nov  6 12:14:48 2013	(r332970)
@@ -21,33 +21,26 @@ PORTDOCS=	ChangeLog README mp3info.txt
 OPTIONS_DEFINE=	GTK2
 GTK2_DESC=	Enable to have the gmp3info
 
-PLIST_FILES=	bin/mp3info \
-		%%WITH_GTK%%bin/gmp3info
+GTK2_USES=		pkgconfig
+GTK2_USE=		GNOME=gtk20
+GTK2_ALL_TARGET=	gmp3info
+GTK2_PLIST_FILES=	bin/gmp3info
 
-MAN1=		mp3info.1
-NO_STAGE=	yes
+PLIST_FILES=	bin/mp3info man/man1/mp3info.1.gz
 
 ALL_TARGET=	doc mp3info
 
 .include <bsd.port.options.mk>
 
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/mp3info ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/mp3info.1 ${STAGEDIR}${PREFIX}/man/man1
 .if ${PORT_OPTIONS:MGTK2}
-USE_GNOME+=	gtk20
-ALL_TARGET+=	gmp3info
-MAKE_ARGS=	install-gmp3info
-PLIST_SUB+=	WITH_GTK=""
-.else
-PLIST_SUB+=	WITH_GTK="@comment "
+	${INSTALL_PROGRAM} ${WRKSRC}/gmp3info ${STAGEDIR}${PREFIX}/bin
 .endif
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/mp3info ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/mp3info.1 ${PREFIX}/man/man1
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for docs in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${docs} ${DOCSDIR}
-.endfor
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>