From nemysis@gmx.ch  Tue Jun 25 08:07:15 2013
Return-Path: <nemysis@gmx.ch>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	by hub.freebsd.org (Postfix) with ESMTP id 44D6DA19
	for <freebsd-gnats-submit@freebsd.org>; Tue, 25 Jun 2013 08:07:15 +0000 (UTC)
	(envelope-from nemysis@gmx.ch)
Received: from mout.gmx.net (mout.gmx.net [212.227.17.20])
	by mx1.freebsd.org (Postfix) with ESMTP id CDFAA196E
	for <freebsd-gnats-submit@freebsd.org>; Tue, 25 Jun 2013 08:07:14 +0000 (UTC)
Received: from mailout-de.gmx.net ([10.1.76.16]) by mrigmx.server.lan
 (mrigmx002) with ESMTP (Nemesis) id 0MAiu5-1UyHta2UNn-00BrVz for
 <FreeBSD-gnats-submit@freebsd.org>; Tue, 25 Jun 2013 10:07:13 +0200
Received: (qmail invoked by alias); 25 Jun 2013 08:07:12 -0000
Received: from 5-80.77-83.cust.bluewin.ch (EHLO something.email.com) [83.77.80.5]
  by mail.gmx.net (mp016) with SMTP; 25 Jun 2013 10:07:12 +0200
Received: by something.email.com (sSMTP sendmail emulation); Tue, 25 Jun 2013 10:07:11 +0200
Message-Id: <20130625080715.44D6DA19@hub.freebsd.org>
Date: Tue, 25 Jun 2013 10:07:11 +0200
From: nemysis <nemysis@gmx.ch>
To: FreeBSD-gnats-submit@freebsd.org
Cc: jpaetzel@FreeBSD.org
Subject: [MAINTAINER] multimedia/freetuxtv: Trim to use only GCC, fix docs and NLS
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         179950
>Category:       ports
>Synopsis:       [MAINTAINER] multimedia/freetuxtv: Trim to use only GCC, fix docs and NLS
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    wg
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jun 25 08:10:01 UTC 2013
>Closed-Date:    Tue Jun 25 13:51:25 UTC 2013
>Last-Modified:  Tue Jun 25 14:00:00 UTC 2013
>Originator:     nemysis
>Release:        FreeBSD 9.1-RELEASE-p8 amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.1-RELEASE-p8 FreeBSD 9.1-RELEASE-p8 #0: Tue Jun 18 15:25:28 UTC 2013
>Description:

- Trim Makefile header
- Add dependency for textproc/p5-XML-Parser
- Trim new Uses
- Trim to use only GCC
- Add DOCS NLS Options
- Fix docs and NLS
- Remove files/patch-po-Makefile.in.in
- Trim pkg-plist, remove docs and mtree

Generated and tested manually, tested with port test and with RedPorts, sent with FreeBSD Port Tools 0.99_8 (mode: change, diff: ports)
>How-To-Repeat:

Build log

https://redports.org/buildarchive/20130625064100-40092/

>Fix:

--- freetuxtv-0.6.5_3.patch begins here ---
diff -ruN /usr/ports/multimedia/freetuxtv/Makefile ./Makefile
--- /usr/ports/multimedia/freetuxtv/Makefile	2013-06-02 18:56:39.000000000 +0200
+++ ./Makefile	2013-06-25 09:57:21.000000000 +0200
@@ -1,3 +1,4 @@
+# Created by: nemysis <nemysis@gmx.ch>
 # $FreeBSD: head/multimedia/freetuxtv/Makefile 319055 2013-05-25 14:37:02Z zeising $
 
 PORTNAME=	freetuxtv
@@ -11,6 +12,7 @@
 
 LICENSE=	GPLv3
 
+BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
 LIB_DEPENDS=	vlc:${PORTSDIR}/multimedia/vlc \
 		dbus-glib:${PORTSDIR}/devel/dbus-glib \
 		sqlite3:${PORTSDIR}/databases/sqlite3 \
@@ -24,27 +26,39 @@
 		expat:${PORTSDIR}/textproc/expat2 \
 		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
 
+USES=		iconv pathfix pkgconfig
 USE_GNOME=	glib20 gtk20
 USE_XORG=	pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext xfixes \
 		xi xinerama xrandr xrender
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=--with-gtk=2.0
 USE_GMAKE=	yes
-USES=		pkgconfig iconv
+USE_GCC=	any
 INSTALLS_ICONS=	yes
 
-CONFIGURE_ARGS+=--with-gtk=2.0
+PORTDOCS=	AUTHORS ChangeLog README
+
+OPTIONS_DEFINE=	DOCS NLS
+OPTIONS_SUB=	yes
+
+NLS_USES=	gettext
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
+post-patch:
+	@${REINPLACE_CMD} -e 's|$${pkgdatadir}/doc|$${PREFIX}/share/doc/${PORTNAME}|' \
+		-e 's|install-data-am: install-freetuxtvdocDATA|install-data-am: |' \
+		${WRKSRC}/Makefile.in
+
+.if ! ${PORT_OPTIONS:MNLS}
 CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
 .endif
 
 post-install:
-	${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png ${PREFIX}/share/pixmaps/
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+.endif
+	${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png ${PREFIX}/share/pixmaps
 
 .include <bsd.port.mk>
diff -ruN /usr/ports/multimedia/freetuxtv/files/patch-po-Makefile.in.in ./files/patch-po-Makefile.in.in
--- /usr/ports/multimedia/freetuxtv/files/patch-po-Makefile.in.in	2013-06-02 18:56:39.000000000 +0200
+++ ./files/patch-po-Makefile.in.in	1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
---- po/Makefile.in.in.orig	2012-05-08 19:34:01.000000000 +0200
-+++ po/Makefile.in.in	2012-09-22 10:34:08.000000000 +0200
-@@ -34,7 +34,7 @@
- datarootdir = @datarootdir@
- libdir = @libdir@
- DATADIRNAME = @DATADIRNAME@
--itlocaledir = $(prefix)/$(DATADIRNAME)/locale
-+itlocaledir = $(datarootdir)/locale
- subdir = po
- install_sh = @install_sh@
- # Automake >= 1.8 provides @mkdir_p@.
diff -ruN /usr/ports/multimedia/freetuxtv/pkg-plist ./pkg-plist
--- /usr/ports/multimedia/freetuxtv/pkg-plist	2013-06-02 18:56:39.000000000 +0200
+++ ./pkg-plist	2013-05-24 13:12:28.000000000 +0200
@@ -10,12 +10,6 @@
 lib/libvlc-gtk.la
 share/applications/freetuxtv.desktop
 %%DATADIR%%/channels_groups.xml
-%%DATADIR%%/doc/AUTHORS
-%%DATADIR%%/doc/COPYING
-%%DATADIR%%/doc/ChangeLog
-%%DATADIR%%/doc/INSTALL
-%%DATADIR%%/doc/NEWS
-%%DATADIR%%/doc/README
 %%DATADIR%%/images/channels/100pourcentradio.png
 %%DATADIR%%/images/channels/1onairconnect.png
 %%DATADIR%%/images/channels/2mmaroc.png
@@ -440,22 +434,9 @@
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/freetuxtv.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/freetuxtv.mo
 share/pixmaps/freetuxtv.png
-@dirrmtry share/icons/hicolor/scalable/apps
-@dirrmtry share/icons/hicolor/scalable
-@dirrmtry share/icons/hicolor/48x48/apps
-@dirrmtry share/icons/hicolor/48x48
-@dirrmtry share/icons/hicolor/32x32/apps
-@dirrmtry share/icons/hicolor/32x32
-@dirrmtry share/icons/hicolor/22x22/apps
-@dirrmtry share/icons/hicolor/22x22
-@dirrmtry share/icons/hicolor/16x16/apps
-@dirrmtry share/icons/hicolor/16x16
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
 @dirrm %%DATADIR%%/ui
 @dirrm %%DATADIR%%/images/channels
 @dirrm %%DATADIR%%/images
-@dirrm %%DATADIR%%/doc
 @dirrm %%DATADIR%%
 @dirrmtry share/applications
 @dirrmtry include/libvlc-gtk
--- freetuxtv-0.6.5_3.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->wg 
Responsible-Changed-By: wg 
Responsible-Changed-When: Tue Jun 25 11:59:14 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=179950 
State-Changed-From-To: open->closed 
State-Changed-By: wg 
State-Changed-When: Tue Jun 25 13:51:24 UTC 2013 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=179950 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/179950: commit references a PR
Date: Tue, 25 Jun 2013 13:51:26 +0000 (UTC)

 Author: wg
 Date: Tue Jun 25 13:51:12 2013
 New Revision: 321744
 URL: http://svnweb.freebsd.org/changeset/ports/321744
 
 Log:
   multimedia/freetuxtv: fix build
   
   - Add p5-XML-Parser as BUILD_DEPENDS [1]
   - Use pathfix [1]
   - Add DOCS and NLS options [1]
   - Fix build with clang, -Wno-return-type
   
   PR:		ports/179950
   Submitted by:	nemysis <nemysis@gmx.ch> [1] (maintainer)
 
 Deleted:
   head/multimedia/freetuxtv/files/
 Modified:
   head/multimedia/freetuxtv/Makefile
   head/multimedia/freetuxtv/pkg-plist
 
 Modified: head/multimedia/freetuxtv/Makefile
 ==============================================================================
 --- head/multimedia/freetuxtv/Makefile	Tue Jun 25 13:31:45 2013	(r321743)
 +++ head/multimedia/freetuxtv/Makefile	Tue Jun 25 13:51:12 2013	(r321744)
 @@ -1,3 +1,4 @@
 +# Created by: nemysis <nemysis@gmx.ch>
  # $FreeBSD$
  
  PORTNAME=	freetuxtv
 @@ -11,6 +12,7 @@ COMMENT=	WebTV player based on GTK2+ and
  
  LICENSE=	GPLv3
  
 +BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
  LIB_DEPENDS=	vlc:${PORTSDIR}/multimedia/vlc \
  		dbus-glib:${PORTSDIR}/devel/dbus-glib \
  		sqlite3:${PORTSDIR}/databases/sqlite3 \
 @@ -24,27 +26,39 @@ LIB_DEPENDS=	vlc:${PORTSDIR}/multimedia/
  		expat:${PORTSDIR}/textproc/expat2 \
  		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
  
 +USES=		iconv pathfix pkgconfig
  USE_GNOME=	glib20 gtk20
  USE_XORG=	pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext xfixes \
  		xi xinerama xrandr xrender
  GNU_CONFIGURE=	yes
 +CONFIGURE_ARGS+=--with-gtk=2.0
  USE_GMAKE=	yes
 -USES=		pkgconfig iconv
 +CFLAGS=		-Wno-return-type
  INSTALLS_ICONS=	yes
  
 -CONFIGURE_ARGS+=--with-gtk=2.0
 +PORTDOCS=	AUTHORS ChangeLog README
 +
 +OPTIONS_DEFINE=	DOCS NLS
 +OPTIONS_SUB=	yes
 +
 +NLS_USES=	gettext
  
  .include <bsd.port.options.mk>
  
 -.if ${PORT_OPTIONS:MNLS}
 -USES+=		gettext
 -PLIST_SUB+=	NLS=""
 -.else
 +post-patch:
 +	@${REINPLACE_CMD} -e 's|$${pkgdatadir}/doc|$${PREFIX}/share/doc/${PORTNAME}|' \
 +		-e 's|install-data-am: install-freetuxtvdocDATA|install-data-am: |' \
 +		${WRKSRC}/Makefile.in
 +
 +.if ! ${PORT_OPTIONS:MNLS}
  CONFIGURE_ARGS+=	--disable-nls
 -PLIST_SUB+=	NLS="@comment "
  .endif
  
  post-install:
 -	${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png ${PREFIX}/share/pixmaps/
 +.if ${PORT_OPTIONS:MDOCS}
 +	@${MKDIR} ${DOCSDIR}
 +	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 +.endif
 +	${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png ${PREFIX}/share/pixmaps
  
  .include <bsd.port.mk>
 
 Modified: head/multimedia/freetuxtv/pkg-plist
 ==============================================================================
 --- head/multimedia/freetuxtv/pkg-plist	Tue Jun 25 13:31:45 2013	(r321743)
 +++ head/multimedia/freetuxtv/pkg-plist	Tue Jun 25 13:51:12 2013	(r321744)
 @@ -10,12 +10,6 @@ lib/libvlc-gtk.a
  lib/libvlc-gtk.la
  share/applications/freetuxtv.desktop
  %%DATADIR%%/channels_groups.xml
 -%%DATADIR%%/doc/AUTHORS
 -%%DATADIR%%/doc/COPYING
 -%%DATADIR%%/doc/ChangeLog
 -%%DATADIR%%/doc/INSTALL
 -%%DATADIR%%/doc/NEWS
 -%%DATADIR%%/doc/README
  %%DATADIR%%/images/channels/100pourcentradio.png
  %%DATADIR%%/images/channels/1onairconnect.png
  %%DATADIR%%/images/channels/2mmaroc.png
 @@ -440,22 +434,9 @@ share/icons/hicolor/scalable/apps/freetu
  %%NLS%%share/locale/zh_CN/LC_MESSAGES/freetuxtv.mo
  %%NLS%%share/locale/zh_TW/LC_MESSAGES/freetuxtv.mo
  share/pixmaps/freetuxtv.png
 -@dirrmtry share/icons/hicolor/scalable/apps
 -@dirrmtry share/icons/hicolor/scalable
 -@dirrmtry share/icons/hicolor/48x48/apps
 -@dirrmtry share/icons/hicolor/48x48
 -@dirrmtry share/icons/hicolor/32x32/apps
 -@dirrmtry share/icons/hicolor/32x32
 -@dirrmtry share/icons/hicolor/22x22/apps
 -@dirrmtry share/icons/hicolor/22x22
 -@dirrmtry share/icons/hicolor/16x16/apps
 -@dirrmtry share/icons/hicolor/16x16
 -@dirrmtry share/icons/hicolor
 -@dirrmtry share/icons
  @dirrm %%DATADIR%%/ui
  @dirrm %%DATADIR%%/images/channels
  @dirrm %%DATADIR%%/images
 -@dirrm %%DATADIR%%/doc
  @dirrm %%DATADIR%%
  @dirrmtry share/applications
  @dirrmtry include/libvlc-gtk
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
