From owner-svn-ports-all@FreeBSD.ORG Tue Jun 25 13:51:13 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id AA8295C7; Tue, 25 Jun 2013 13:51:13 +0000 (UTC) (envelope-from wg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 9C3391C3A; Tue, 25 Jun 2013 13:51:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5PDpDLL022698; Tue, 25 Jun 2013 13:51:13 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5PDpD79022696; Tue, 25 Jun 2013 13:51:13 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201306251351.r5PDpD79022696@svn.freebsd.org> From: William Grzybowski Date: Tue, 25 Jun 2013 13:51:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r321744 - in head/multimedia/freetuxtv: . files 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Jun 2013 13:51:13 -0000 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 [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 # $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 -.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 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