Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 7 Jun 2014 14:57:47 +0000 (UTC)
From:      Thomas Zander <riggs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r356909 - in branches/2014Q2/multimedia/ogmrip: . files
Message-ID:  <201406071457.s57EvlKV058141@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: riggs
Date: Sat Jun  7 14:57:47 2014
New Revision: 356909
URL: http://svnweb.freebsd.org/changeset/ports/356909
QAT: https://qat.redports.org/buildarchive/r356909/

Log:
  MFH: r356899
  
  - New upstream release 1.0.1
  - Un-break build with clang
  - Stagify
  - Introduce NLS OPTION
  - USE_* -> USES
  - Shared lib convention: shlib.X -> libshlib.so
  - Pet portlint
  
  Approved by:	portmgr (swills), mentors (implicit)

Added:
  branches/2014Q2/multimedia/ogmrip/files/
     - copied from r356899, head/multimedia/ogmrip/files/
Modified:
  branches/2014Q2/multimedia/ogmrip/Makefile
  branches/2014Q2/multimedia/ogmrip/distinfo
  branches/2014Q2/multimedia/ogmrip/pkg-plist
Directory Properties:
  branches/2014Q2/   (props changed)

Modified: branches/2014Q2/multimedia/ogmrip/Makefile
==============================================================================
--- branches/2014Q2/multimedia/ogmrip/Makefile	Sat Jun  7 14:50:56 2014	(r356908)
+++ branches/2014Q2/multimedia/ogmrip/Makefile	Sat Jun  7 14:57:47 2014	(r356909)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ogmrip
-PORTVERSION=	1.0.0
-PORTREVISION=	1
+PORTVERSION=	1.0.1
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION}
 
@@ -16,42 +15,40 @@ LICENSE_COMB=	multi
 BUILD_DEPENDS=	mencoder:${PORTSDIR}/multimedia/mencoder \
 		mplayer:${PORTSDIR}/multimedia/mplayer \
 		gsed:${PORTSDIR}/textproc/gsed
-LIB_DEPENDS=	enca.5:${PORTSDIR}/converters/enca \
-		png15:${PORTSDIR}/graphics/png \
-		tiff.4:${PORTSDIR}/graphics/tiff \
-		dvdread.4:${PORTSDIR}/multimedia/libdvdread
+LIB_DEPENDS=	libenca.so:${PORTSDIR}/converters/enca \
+		libpng.so:${PORTSDIR}/graphics/png \
+		libtiff.so:${PORTSDIR}/graphics/tiff \
+		libdvdread.so:${PORTSDIR}/multimedia/libdvdread
 RUN_DEPENDS=	lame:${PORTSDIR}/audio/lame \
 		oggenc:${PORTSDIR}/audio/vorbis-tools \
 		mencoder:${PORTSDIR}/multimedia/mencoder \
 		mplayer:${PORTSDIR}/multimedia/mplayer \
 		ogmmerge:${PORTSDIR}/multimedia/ogmtools
 
-OPTIONS_DEFINE=	GTK2 ENCHANT MATROSKA MP4BOX THEORA FAAC SRT DEBUG
-OPTIONS_DEFAULT=GTK2
+OPTIONS_DEFINE=	GTK2 ENCHANT MATROSKA MP4BOX NLS THEORA FAAC SRT DEBUG
+OPTIONS_DEFAULT=GTK2 NLS
 ENCHANT_DESC=	Enable spell checking for text subtitles
 MATROSKA_DESC=	Enable Matroska container support
 MP4BOX_DESC=	Enable Mpeg-4 container support
 THEORA_DESC=	Enable Ogg Theora video codec support
 SRT_DESC=	Enable SRT text subtitles support
 
-USES=        pathfix gettext gmake pkgconfig
+USES=		desktop-file-utils gmake libtool:keepla pathfix pkgconfig
 USE_GNOME=	glib20 intlhack libxml2
-USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 
+GNU_CONFIGURE=	yes
+
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-MAN1=		dvdcpy.1 avibox.1
-
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGTK2}
 CONFIGURE_ARGS+=	--enable-gtk-support --enable-dbus-support \
 			--enable-libnotify-support
-LIB_DEPENDS+=		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-			notify.4:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS+=		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
+			libnotify.so:${PORTSDIR}/devel/libnotify
 USE_GNOME+=		gconf2 libglade2
 GCONF_SCHEMAS=		ogmrip.schemas
 PLIST_SUB+=		GTK2_SUPPORT=""
@@ -63,7 +60,7 @@ PLIST_SUB+=		GTK2_SUPPORT="@comment "
 
 .if ${PORT_OPTIONS:MENCHANT}
 CONFIGURE_ARGS+=	--enable-enchant-support
-LIB_DEPENDS+=		enchant:${PORTSDIR}/textproc/enchant
+LIB_DEPENDS+=		libenchant.so:${PORTSDIR}/textproc/enchant
 PLIST_SUB+=		ENCHANT_SUPPORT=""
 .else
 CONFIGURE_ARGS+=	--disable-enchant-support
@@ -88,9 +85,17 @@ CONFIGURE_ARGS+=	--disable-mp4-support
 PLIST_SUB+=		MP4BOX_SUPPORT="@comment "
 .endif
 
+.if ${PORT_OPTIONS:MNLS}
+USES+=			gettext
+PLIST_SUB+=		NLS=""
+.else
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=		NLS="@comment "
+.endif
+
 .if ${PORT_OPTIONS:MTHEORA}
 CONFIGURE_ARGS+=	--enable-theora-support
-LIB_DEPENDS+=		theora:${PORTSDIR}/multimedia/libtheora
+LIB_DEPENDS+=		libtheora.so:${PORTSDIR}/multimedia/libtheora
 PLIST_SUB+=		THEORA_SUPPORT=""
 .else
 CONFIGURE_ARGS+=	--disable-theora-support
@@ -135,9 +140,4 @@ post-patch:
 	@${REINPLACE_CMD} -e \
 		'/PROGRAM/s|MP4Box|mp4box|g' ${WRKSRC}/libogmrip/ogmrip-mp4.c
 
-post-install:
-	@${ECHO_MSG} ""
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG} ""
-
 .include <bsd.port.mk>

Modified: branches/2014Q2/multimedia/ogmrip/distinfo
==============================================================================
--- branches/2014Q2/multimedia/ogmrip/distinfo	Sat Jun  7 14:50:56 2014	(r356908)
+++ branches/2014Q2/multimedia/ogmrip/distinfo	Sat Jun  7 14:57:47 2014	(r356909)
@@ -1,2 +1,2 @@
-SHA256 (ogmrip-1.0.0.tar.gz) = 6848a622152a62899b6e876e70ec36df1af7be9803b8b9c809ed631196bc18cc
-SIZE (ogmrip-1.0.0.tar.gz) = 3262205
+SHA256 (ogmrip-1.0.1.tar.gz) = 1c7bb9a346f94a0b6ba783d71df7d21ce021b2f179f5c1a2ebf870366d53ed56
+SIZE (ogmrip-1.0.1.tar.gz) = 3276396

Modified: branches/2014Q2/multimedia/ogmrip/pkg-plist
==============================================================================
--- branches/2014Q2/multimedia/ogmrip/pkg-plist	Sat Jun  7 14:50:56 2014	(r356908)
+++ branches/2014Q2/multimedia/ogmrip/pkg-plist	Sat Jun  7 14:57:47 2014	(r356909)
@@ -74,30 +74,37 @@ include/ogmrip/ogmrip.h
 %%GTK2_SUPPORT%%lib/libogmdvd-gtk.la
 %%GTK2_SUPPORT%%lib/libogmdvd-gtk.so
 %%GTK2_SUPPORT%%lib/libogmdvd-gtk.so.1
+%%GTK2_SUPPORT%%lib/libogmdvd-gtk.so.1.0.0
 lib/libogmdvd.a
 lib/libogmdvd.la
 lib/libogmdvd.so
 lib/libogmdvd.so.1
+lib/libogmdvd.so.1.0.0
 lib/libogmjob.a
 lib/libogmjob.la
 lib/libogmjob.so
 lib/libogmjob.so.1
+lib/libogmjob.so.1.0.0
 %%GTK2_SUPPORT%%lib/libogmrip-gtk.a
 %%GTK2_SUPPORT%%lib/libogmrip-gtk.la
 %%GTK2_SUPPORT%%lib/libogmrip-gtk.so
 %%GTK2_SUPPORT%%lib/libogmrip-gtk.so.1
+%%GTK2_SUPPORT%%lib/libogmrip-gtk.so.1.0.0
 lib/libogmrip-lavc.a
 lib/libogmrip-lavc.la
 lib/libogmrip-lavc.so
 lib/libogmrip-lavc.so.1
+lib/libogmrip-lavc.so.1.0.0
 lib/libogmrip-mplayer.a
 lib/libogmrip-mplayer.la
 lib/libogmrip-mplayer.so
 lib/libogmrip-mplayer.so.1
+lib/libogmrip-mplayer.so.1.0.0
 lib/libogmrip.a
 lib/libogmrip.la
 lib/libogmrip.so
 lib/libogmrip.so.1
+lib/libogmrip.so.1.0.0
 %%FAAC_SUPPORT%%lib/ogmrip/audio-plugins/libogmrip-aac.a
 %%FAAC_SUPPORT%%lib/ogmrip/audio-plugins/libogmrip-aac.la
 %%FAAC_SUPPORT%%lib/ogmrip/audio-plugins/libogmrip-aac.so
@@ -163,13 +170,17 @@ libdata/pkgconfig/ogmdvd.pc
 libdata/pkgconfig/ogmjob.pc
 libdata/pkgconfig/ogmrip-gtk.pc
 libdata/pkgconfig/ogmrip.pc
+man/man1/dvdcpy.1.gz
+man/man1/avibox.1.gz
+%%SRT_SUPPORT%%man/man1/subp2pgm.1.gz
+%%SRT_SUPPORT%%man/man1/subptools.1.gz
 %%GTK2_SUPPORT%%share/applications/ogmrip.desktop
-share/locale/cs/LC_MESSAGES/ogmrip.mo
-share/locale/de/LC_MESSAGES/ogmrip.mo
-share/locale/fr/LC_MESSAGES/ogmrip.mo
-share/locale/nb/LC_MESSAGES/ogmrip.mo
-share/locale/ru/LC_MESSAGES/ogmrip.mo
-share/locale/sk/LC_MESSAGES/ogmrip.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/ogmrip.mo
+%%NLS%%share/locale/de/LC_MESSAGES/ogmrip.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/ogmrip.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/ogmrip.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/ogmrip.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/ogmrip.mo
 %%GTK2_SUPPORT%%%%DATADIR%%/ogmrip-crop.glade
 %%GTK2_SUPPORT%%%%DATADIR%%/ogmrip-lavc.glade
 %%GTK2_SUPPORT%%%%DATADIR%%/ogmrip-main.glade



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406071457.s57EvlKV058141>