Bug 179950 - [MAINTAINER] multimedia/freetuxtv: Trim to use only GCC, fix docs and NLS
Summary: [MAINTAINER] multimedia/freetuxtv: Trim to use only GCC, fix docs and NLS
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: William Grzybowski
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-06-25 09:10 UTC by nemysis
Modified: 2013-06-25 15:00 UTC (History)
1 user (show)

See Also:


Attachments
freetuxtv-0.6.5_3.patch (3.86 KB, patch)
2013-06-25 09:10 UTC, nemysis
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description nemysis 2013-06-25 09:10:01 UTC
- 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/
Comment 1 William Grzybowski freebsd_committer freebsd_triage 2013-06-25 12:59:14 UTC
Responsible Changed
From-To: freebsd-ports-bugs->wg

I'll take it.
Comment 2 William Grzybowski freebsd_committer freebsd_triage 2013-06-25 14:51:24 UTC
State Changed
From-To: open->closed

Committed, with minor changes. Thanks!
Comment 3 dfilter service freebsd_committer freebsd_triage 2013-06-25 14:51:26 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"