Switch to new USE_GETOPT_LONG ports option

9 files changed, 15 insertions, 15 deletions

diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile
index 801a6d6553d0..1739cfc618fb 100644
--- a/multimedia/ffmpeg-devel/Makefile
+++ b/multimedia/ffmpeg-devel/Makefile
@@ -15,8 +15,7 @@ MASTER_SITE_SUBDIR=	ffmpeg
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	Hyper fast realtime audio/video encoder/converter, streaming server
 
-LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-
+USE_GETOPT_LONG=	yes
 HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 801a6d6553d0..1739cfc618fb 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -15,8 +15,7 @@ MASTER_SITE_SUBDIR=	ffmpeg
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	Hyper fast realtime audio/video encoder/converter, streaming server
 
-LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-
+USE_GETOPT_LONG=	yes
 HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
diff --git a/multimedia/ffmpeg045/Makefile b/multimedia/ffmpeg045/Makefile
index 1a440cc49a0d..0a59b0cdb256 100644
--- a/multimedia/ffmpeg045/Makefile
+++ b/multimedia/ffmpeg045/Makefile
@@ -17,11 +17,11 @@ MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	Hyper fast realtime audio/video encoder/converter, streaming server
 
 BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
-LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 ONLY_FOR_ARCHS=	i386
+USE_GETOPT_LONG=	yes
 HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
diff --git a/multimedia/gtksubtitler/Makefile b/multimedia/gtksubtitler/Makefile
index bdc880d7c5a9..22003e2c1a93 100644
--- a/multimedia/gtksubtitler/Makefile
+++ b/multimedia/gtksubtitler/Makefile
@@ -14,9 +14,8 @@ DISTNAME=	${PORTNAME}-v${PORTVERSION:C/.p(.)$/pre\1/}
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	A small GNOME program for editing and converting subtitles
 
-LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-
 USE_X_PREFIX=	yes
+USE_GETOPT_LONG=	yes
 USE_GNOMENG=	yes
 USE_GNOME=	gnomeprefix gnomelibs
 USE_REINPLACE=	yes
diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile
index 6373eee4b2bb..e9a111a4365b 100644
--- a/multimedia/mjpegtools/Makefile
+++ b/multimedia/mjpegtools/Makefile
@@ -97,7 +97,7 @@ CONFIGURE_ARGS+=	--with-dv=${LOCALBASE}
 .endif
 #
 .ifdef(WITH_LIBGNUGETOPT)
-LIB_DEPENDS+=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+USE_GETOPT_LONG=	yes
 .endif
 #
 .ifdef(WITH_LIBMOVTAR)
@@ -172,6 +172,9 @@ post-patch:
 	@${REINPLACE_CMD} -E -e 's|(AVIPLAY_LIBS \=.*)|\1 -lgnugetopt|' \
 		${WRKSRC}/lavtools/Makefile.in
 .endif
+# link to pthreads
+	@${REINPLACE_CMD} -E -e 's|(AVIPLAY_LIBS \=.*)|\1 ${PTHREAD_LIBS}|' \
+		${WRKSRC}/lavtools/Makefile.in
 
 post-configure:
 	@${CP} -f ${LOCALBASE}/bin/${LIBTOOL} ${WRKSRC}
diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile
index 5eb8ca7fb969..f9e3e0aa4760 100644
--- a/multimedia/mpeg4ip/Makefile
+++ b/multimedia/mpeg4ip/Makefile
@@ -19,9 +19,9 @@ BUILD_DEPENDS=	libtool:${PORTSDIR}/devel/libtool \
 		pkg-config:${PORTSDIR}/devel/pkgconfig
 LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
 		glib-2.0.200:${PORTSDIR}/devel/glib20 \
-		gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
 		gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
 
+USE_GETOPT_LONG=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 USE_REINPLACE=	yes
diff --git a/net-p2p/dctc/Makefile b/net-p2p/dctc/Makefile
index 85b18a39a0c9..1f54803a8666 100644
--- a/net-p2p/dctc/Makefile
+++ b/net-p2p/dctc/Makefile
@@ -16,9 +16,9 @@ MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	A DirectConnect (www.neo-modus.com) text client for file sharing
 
 BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend
-LIB_DEPENDS=	db4.0:${PORTSDIR}/databases/db4 \
-		gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+LIB_DEPENDS=	db4.0:${PORTSDIR}/databases/db4
 
+USE_GETOPT_LONG=	yes
 USE_GNOMENG=	yes
 USE_GNOME=	glib12
 USE_PERL5_RUN=	yes
diff --git a/net/dctc/Makefile b/net/dctc/Makefile
index 85b18a39a0c9..1f54803a8666 100644
--- a/net/dctc/Makefile
+++ b/net/dctc/Makefile
@@ -16,9 +16,9 @@ MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	A DirectConnect (www.neo-modus.com) text client for file sharing
 
 BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend
-LIB_DEPENDS=	db4.0:${PORTSDIR}/databases/db4 \
-		gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+LIB_DEPENDS=	db4.0:${PORTSDIR}/databases/db4
 
+USE_GETOPT_LONG=	yes
 USE_GNOMENG=	yes
 USE_GNOME=	glib12
 USE_PERL5_RUN=	yes
diff --git a/sysutils/vobcopy/Makefile b/sysutils/vobcopy/Makefile
index e1d5710d6218..a3df1a4aa5a1 100644
--- a/sysutils/vobcopy/Makefile
+++ b/sysutils/vobcopy/Makefile
@@ -13,10 +13,10 @@ MASTER_SITES=	http://lpn.rnbhq.org/download/
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	Decrypts and copies DVD .vob files
 
-LIB_DEPENDS=	dvdread.3:${PORTSDIR}/multimedia/libdvdread \
-		gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+LIB_DEPENDS=	dvdread.3:${PORTSDIR}/multimedia/libdvdread
 
 USE_BZIP2=	yes
+USE_GETOPT_LONG=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	configure.sh
 USE_REINPLACE=	yes