From 42c1d49f8064a29a2d90165697b18bb28cbf06b2 Mon Sep 17 00:00:00 2001
From: jmcneill <jmcneill>
Date: Mon, 22 Sep 2008 23:43:12 +0000
Subject: opal-devel -> opal

---
 devel/Makefile                                     |   4 +-
 devel/opal-devel/DESCR                             |   5 -
 devel/opal-devel/Makefile                          |  47 ------
 devel/opal-devel/PLIST                             | 166 ---------------------
 devel/opal-devel/buildlink3.mk                     |  23 ---
 devel/opal-devel/distinfo                          |  13 --
 devel/opal-devel/patches/patch-configure           |  12 --
 devel/opal-devel/patches/patch-configure.tmp       |  12 --
 devel/opal-devel/patches/patch-plugins_configure   |  22 ---
 .../patch-plugins_video_H_263-1998_Makefile_in     |  13 --
 .../patches/patch-plugins_video_H_264_Makefile_in  |  20 ---
 .../patch-plugins_video_H_264_gpl_Makefile_in      |  13 --
 .../patch-plugins_video_MPEG4-ffmpeg_Makefile_in   |  13 --
 .../patches/patch-plugins_video_common_dyna_cxx    |  17 ---
 14 files changed, 2 insertions(+), 378 deletions(-)
 delete mode 100644 devel/opal-devel/DESCR
 delete mode 100644 devel/opal-devel/Makefile
 delete mode 100644 devel/opal-devel/PLIST
 delete mode 100644 devel/opal-devel/buildlink3.mk
 delete mode 100644 devel/opal-devel/distinfo
 delete mode 100644 devel/opal-devel/patches/patch-configure
 delete mode 100644 devel/opal-devel/patches/patch-configure.tmp
 delete mode 100644 devel/opal-devel/patches/patch-plugins_configure
 delete mode 100644 devel/opal-devel/patches/patch-plugins_video_H_263-1998_Makefile_in
 delete mode 100644 devel/opal-devel/patches/patch-plugins_video_H_264_Makefile_in
 delete mode 100644 devel/opal-devel/patches/patch-plugins_video_H_264_gpl_Makefile_in
 delete mode 100644 devel/opal-devel/patches/patch-plugins_video_MPEG4-ffmpeg_Makefile_in
 delete mode 100644 devel/opal-devel/patches/patch-plugins_video_common_dyna_cxx

diff --git a/devel/Makefile b/devel/Makefile
index d2f0faea973..446e80a03a1 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1033 2008/09/17 00:21:48 obache Exp $
+# $NetBSD: Makefile,v 1.1034 2008/09/22 23:43:12 jmcneill Exp $
 #
 
 COMMENT=	Development utilities
@@ -387,7 +387,7 @@ SUBDIR+=	ocaml-findlib
 SUBDIR+=	ocaml-lwt
 SUBDIR+=	ode
 SUBDIR+=	ogre
-SUBDIR+=	opal-devel
+SUBDIR+=	opal
 SUBDIR+=	opencm
 SUBDIR+=	opengrok
 SUBDIR+=	ossp-uuid
diff --git a/devel/opal-devel/DESCR b/devel/opal-devel/DESCR
deleted file mode 100644
index 4c2cb4a2cff..00000000000
--- a/devel/opal-devel/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-OPAL is the "next generation" of OpenH323 that has a new architecture.
-Not only does it support H.323 and SIP, but new VoIP protocols or
-devices can be added very easily.
-BTW: OPAL is an acronym for Open Phone Abstraction Library, but
-that is not really important :)
diff --git a/devel/opal-devel/Makefile b/devel/opal-devel/Makefile
deleted file mode 100644
index d1be5cb0ba0..00000000000
--- a/devel/opal-devel/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2008/09/14 13:41:38 jmcneill Exp $
-#
-
-DISTNAME=		opal-snapshot-20080912
-PKGNAME=		opal-3.3.0.20080912
-OPALLIBDIR=		opal-3.3.1
-
-CATEGORIES=		devel net comms
-MASTER_SITES=		http://snapshots.ekiga.net/snapshots/sources/archives/
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.ekiga.net/
-COMMENT=		Open Phone Abstraction Library
-
-USE_LIBTOOL=		yes
-USE_PKGLOCALEDIR=	yes
-GNU_CONFIGURE=		yes
-BUILD_TARGET=		opt
-
-CONFIGURE_ARGS+=	--enable-h264
-# ekiga developers say that the ffmpeg-h263 plugin is
-# not used and should be disabled in favour of the
-# h263+ plugin, so do so
-CONFIGURE_ARGS+=	--disable-ffmpeg-h263
-
-USE_LANGUAGES=		c c++
-USE_TOOLS+=		gmake
-USE_TOOLS+=		pkg-config
-
-WRKSRC=			${WRKDIR}/opal
-
-PLIST_SUBST+=		OPALLIBDIR=${OPALLIBDIR:Q}
-
-.if "${MACHINE_ARCH}" == "i386"
-PLIST_SUBST+=		LIBARCH=x86
-.else
-PLIST_SUBST+=		LIBARCH=${MACHINE_ARCH:Q}
-.endif
-
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/version.h ${PREFIX}/share/opal
-
-.include "../../devel/ptlib/buildlink3.mk"
-.include "../../databases/openldap-client/buildlink3.mk"
-.include "../../multimedia/ffmpeg/buildlink3.mk"
-.include "../../multimedia/x264-devel/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/devel/opal-devel/PLIST b/devel/opal-devel/PLIST
deleted file mode 100644
index ac8c1aec39a..00000000000
--- a/devel/opal-devel/PLIST
+++ /dev/null
@@ -1,166 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2008/09/14 13:41:38 jmcneill Exp $
-include/opal.h
-include/opal/asn/gcc.h
-include/opal/asn/h225.h
-include/opal/asn/h235.h
-include/opal/asn/h235_srtp.h
-include/opal/asn/h245.h
-include/opal/asn/h248.h
-include/opal/asn/h4501.h
-include/opal/asn/h45010.h
-include/opal/asn/h45011.h
-include/opal/asn/h4502.h
-include/opal/asn/h4503.h
-include/opal/asn/h4504.h
-include/opal/asn/h4505.h
-include/opal/asn/h4506.h
-include/opal/asn/h4507.h
-include/opal/asn/h4508.h
-include/opal/asn/h4509.h
-include/opal/asn/h501.h
-include/opal/asn/mcs.h
-include/opal/asn/t38.h
-include/opal/asn/x880.h
-include/opal/codec/echocancel.h
-include/opal/codec/g711a1_plc.h
-include/opal/codec/g711codec.h
-include/opal/codec/opalplugin.h
-include/opal/codec/opalpluginmgr.h
-include/opal/codec/opalwavfile.h
-include/opal/codec/rfc2833.h
-include/opal/codec/rfc4175.h
-include/opal/codec/silencedetect.h
-include/opal/codec/vidcodec.h
-include/opal/h323/channels.h
-include/opal/h323/gkclient.h
-include/opal/h323/gkserver.h
-include/opal/h323/h225ras.h
-include/opal/h323/h235auth.h
-include/opal/h323/h323.h
-include/opal/h323/h323annexg.h
-include/opal/h323/h323caps.h
-include/opal/h323/h323con.h
-include/opal/h323/h323ep.h
-include/opal/h323/h323neg.h
-include/opal/h323/h323pdu.h
-include/opal/h323/h323rtp.h
-include/opal/h323/h323trans.h
-include/opal/h323/h450pdu.h
-include/opal/h323/h501pdu.h
-include/opal/h323/peclient.h
-include/opal/h323/q931.h
-include/opal/h323/svcctrl.h
-include/opal/h323/transaddr.h
-include/opal/h460/h460.h
-include/opal/h460/h4601.h
-include/opal/h460/h46018.h
-include/opal/h460/h46019.h
-include/opal/h460/h4609.h
-include/opal/h460/h460p.h
-include/opal/h460/h460pres.h
-include/opal/h460/h460tm.h
-include/opal/iax2/callprocessor.h
-include/opal/iax2/causecode.h
-include/opal/iax2/frame.h
-include/opal/iax2/iax2.h
-include/opal/iax2/iax2con.h
-include/opal/iax2/iax2ep.h
-include/opal/iax2/iax2jitter.h
-include/opal/iax2/iax2medstrm.h
-include/opal/iax2/iedata.h
-include/opal/iax2/ies.h
-include/opal/iax2/overview.h
-include/opal/iax2/processor.h
-include/opal/iax2/receiver.h
-include/opal/iax2/regprocessor.h
-include/opal/iax2/remote.h
-include/opal/iax2/safestrings.h
-include/opal/iax2/sound.h
-include/opal/iax2/specialprocessor.h
-include/opal/iax2/transmit.h
-include/opal/iax2/version.h
-include/opal/lids/lid.h
-include/opal/lids/lidep.h
-include/opal/lids/lidplugin.h
-include/opal/lids/lidpluginmgr.h
-include/opal/opal/audiorecord.h
-include/opal/opal/buildopts.h
-include/opal/opal/call.h
-include/opal/opal/connection.h
-include/opal/opal/endpoint.h
-include/opal/opal/guid.h
-include/opal/opal/ivr.h
-include/opal/opal/localep.h
-include/opal/opal/manager.h
-include/opal/opal/mediacmd.h
-include/opal/opal/mediafmt.h
-include/opal/opal/mediastrm.h
-include/opal/opal/mediatype.h
-include/opal/opal/opalmixer.h
-include/opal/opal/opalvxml.h
-include/opal/opal/patch.h
-include/opal/opal/pcss.h
-include/opal/opal/rtpconn.h
-include/opal/opal/rtpep.h
-include/opal/opal/transcoders.h
-include/opal/opal/transports.h
-include/opal/rtp/jitter.h
-include/opal/rtp/rtp.h
-include/opal/rtp/srtp.h
-include/opal/rtp/zrtpudp.h
-include/opal/sip/handlers.h
-include/opal/sip/sdp.h
-include/opal/sip/sdpcaps.h
-include/opal/sip/sip.h
-include/opal/sip/sipcon.h
-include/opal/sip/sipep.h
-include/opal/sip/sippdu.h
-include/opal/t120/h323t120.h
-include/opal/t120/t120proto.h
-include/opal/t120/x224.h
-include/opal/t38/h323t38.h
-include/opal/t38/sipt38.h
-include/opal/t38/t38proto.h
-include/opal/zrtp/opalzrtp.h
-include/opal/zrtp/zrtpeventproc.h
-lib/libopal.so
-lib/libopal_${OPSYS}_${LIBARCH}.so
-lib/libopal_${OPSYS}_${LIBARCH}.so.3
-lib/libopal_${OPSYS}_${LIBARCH}.so.3.3
-lib/libopal_${OPSYS}_${LIBARCH}.so.3.3-beta1
-lib/${OPALLIBDIR}/codecs/audio/g726_audio_pwplugin.so
-lib/${OPALLIBDIR}/codecs/audio/gsm0610_audio_pwplugin.so
-lib/${OPALLIBDIR}/codecs/audio/gsmamrcodec_pwplugin.so
-lib/${OPALLIBDIR}/codecs/audio/ilbc_audio_pwplugin.so
-lib/${OPALLIBDIR}/codecs/audio/ima_adpcm_audio_pwplugin.so
-lib/${OPALLIBDIR}/codecs/audio/lpc10_audio_pwplugin.so
-lib/${OPALLIBDIR}/codecs/audio/speex_audio_pwplugin.so
-lib/${OPALLIBDIR}/codecs/video/h261-vic_video_pwplugin.so
-lib/${OPALLIBDIR}/codecs/video/h263-1998_video_pwplugin.so
-lib/${OPALLIBDIR}/codecs/video/h264_video_pwplugin.so
-lib/${OPALLIBDIR}/codecs/video/h264_video_pwplugin_helper
-lib/${OPALLIBDIR}/codecs/video/mpeg4-ffmpeg_video_pwplugin.so
-lib/${OPALLIBDIR}/codecs/video/theora_video_pwplugin.so
-lib/${OPALLIBDIR}/lid/vpb_lid_pwplugin.so
-lib/pkgconfig/opal.pc
-share/opal/opal_inc.mak
-share/opal/version.h
-@dirrm share/opal
-@dirrm lib/${OPALLIBDIR}/lid
-@dirrm lib/${OPALLIBDIR}/codecs/video
-@dirrm lib/${OPALLIBDIR}/codecs/audio
-@dirrm lib/${OPALLIBDIR}/codecs
-@dirrm lib/${OPALLIBDIR}
-@dirrm include/opal/zrtp
-@dirrm include/opal/t38
-@dirrm include/opal/t120
-@dirrm include/opal/sip
-@dirrm include/opal/rtp
-@dirrm include/opal/opal
-@dirrm include/opal/lids
-@dirrm include/opal/iax2
-@dirrm include/opal/h460
-@dirrm include/opal/h323
-@dirrm include/opal/codec
-@dirrm include/opal/asn
-@dirrm include/opal
diff --git a/devel/opal-devel/buildlink3.mk b/devel/opal-devel/buildlink3.mk
deleted file mode 100644
index 6043048a999..00000000000
--- a/devel/opal-devel/buildlink3.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/09/12 13:22:05 jmcneill Exp $
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-OPAL_BUILDLINK3_MK:=	${OPAL_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	opal
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nopal}
-BUILDLINK_PACKAGES+=	opal
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}opal
-
-.if !empty(OPAL_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.opal+=	opal>=3.3.0
-BUILDLINK_ABI_DEPENDS.opal?=	opal>=3.3.0
-BUILDLINK_PKGSRCDIR.opal?=	../../devel/opal-devel
-.endif	# OPAL_BUILDLINK3_MK
-
-.include "../../devel/ptlib/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/opal-devel/distinfo b/devel/opal-devel/distinfo
deleted file mode 100644
index d61604a9a40..00000000000
--- a/devel/opal-devel/distinfo
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: distinfo,v 1.6 2008/09/14 14:19:14 jmcneill Exp $
-
-SHA1 (opal-snapshot-20080912.tar.gz) = d0c8359a1406ab2da3e354c944a7cefde7858a3a
-RMD160 (opal-snapshot-20080912.tar.gz) = 15e32b8479547e4b9fc7674fd172f5f4dfd4c9a8
-Size (opal-snapshot-20080912.tar.gz) = 22973261 bytes
-SHA1 (patch-configure) = 9c4cf98787f0f6505ba419e101fed5677cb14456
-SHA1 (patch-configure.tmp) = c0601b8974f53d455f3016806c6875afe1cd809f
-SHA1 (patch-plugins_configure) = a41ea74bbec80c12a2361b646810a8e6a5b24588
-SHA1 (patch-plugins_video_H_263-1998_Makefile_in) = 384002e69862d690f02609843f0103c878626ed9
-SHA1 (patch-plugins_video_H_264_Makefile_in) = f31d2554bc84c640936cded8e03e69d6529a2ed0
-SHA1 (patch-plugins_video_H_264_gpl_Makefile_in) = ac9ec46e18a1ab3e925396befd3d16adc9edec9f
-SHA1 (patch-plugins_video_MPEG4-ffmpeg_Makefile_in) = 7bae6bfc8c4cce9b7d70cff244176462032ba236
-SHA1 (patch-plugins_video_common_dyna_cxx) = 5a82442434ba455197361e1da27c1b83db6716d8
diff --git a/devel/opal-devel/patches/patch-configure b/devel/opal-devel/patches/patch-configure
deleted file mode 100644
index c0e4d9223a0..00000000000
--- a/devel/opal-devel/patches/patch-configure
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2008/09/12 20:56:17 sborrill Exp $
---- configure.orig	2008-09-12 21:51:50.000000000 +0100
-+++ configure	2008-09-12 21:52:06.000000000 +0100
-@@ -7366,7 +7366,7 @@
- 
- done
- 
--  if test "${OPAL_JAVA:-unset}" == "unset" ; then
-+  if test "${OPAL_JAVA:-unset}" = "unset" ; then
-     if test "${JDK_ROOT}:-unset" != "unset" ; then
-       as_ac_File=`echo "ac_cv_file_${JDK_ROOT}/include/jni.h" | $as_tr_sh`
- { echo "$as_me:$LINENO: checking for ${JDK_ROOT}/include/jni.h" >&5
diff --git a/devel/opal-devel/patches/patch-configure.tmp b/devel/opal-devel/patches/patch-configure.tmp
deleted file mode 100644
index 281c15b02c9..00000000000
--- a/devel/opal-devel/patches/patch-configure.tmp
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-configure.tmp,v 1.1 2008/09/12 20:56:17 sborrill Exp $
---- plugins/.svn/tmp/configure.tmp.orig	2008-09-12 21:54:32.000000000 +0100
-+++ plugins/.svn/tmp/configure.tmp	2008-09-12 21:54:45.000000000 +0100
-@@ -4118,7 +4118,7 @@
- fi
- 
- 
--    if test "x$GSM" == "x2"; then
-+    if test "x$GSM" = "x2"; then
-       H323_SYSTEM_GSM=1
-       { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
diff --git a/devel/opal-devel/patches/patch-plugins_configure b/devel/opal-devel/patches/patch-plugins_configure
deleted file mode 100644
index aa617dbd056..00000000000
--- a/devel/opal-devel/patches/patch-plugins_configure
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-plugins_configure,v 1.1 2008/09/14 13:41:38 jmcneill Exp $
-
---- plugins/configure.orig	2008-09-12 17:01:04.000000000 -0400
-+++ plugins/configure	2008-09-13 16:44:36.000000000 -0400
-@@ -9145,7 +9145,7 @@
-             { echo "$as_me:$LINENO: result: cannot determine - using defaults" >&5
- echo "${ECHO_T}cannot determine - using defaults" >&6; }
-           else
--            LIBAVCODEC_LIB_NAME=`ldd ./conftest | grep libavcodec | awk '{print $1; }'`
-+            LIBAVCODEC_LIB_NAME=`objdump -x ./conftest | grep 'NEEDED.*libavcodec' | awk '{print $2; }'`
-             { echo "$as_me:$LINENO: result: $LIBAVCODEC_LIB_NAME" >&5
- echo "${ECHO_T}$LIBAVCODEC_LIB_NAME" >&6; }
- 
-@@ -9638,7 +9638,7 @@
-             { echo "$as_me:$LINENO: result: cannot determine - using defaults" >&5
- echo "${ECHO_T}cannot determine - using defaults" >&6; }
-           else
--            X264_LIB_NAME=`ldd ./conftest | grep libx264 | awk '{print $1; }'`
-+            X264_LIB_NAME=`objdump -x ./conftest | grep 'NEEDED.*libx264' | awk '{print $2; }'`
-             { echo "$as_me:$LINENO: result: $X264_LIB_NAME" >&5
- echo "${ECHO_T}$X264_LIB_NAME" >&6; }
- 
diff --git a/devel/opal-devel/patches/patch-plugins_video_H_263-1998_Makefile_in b/devel/opal-devel/patches/patch-plugins_video_H_263-1998_Makefile_in
deleted file mode 100644
index 999420aaadf..00000000000
--- a/devel/opal-devel/patches/patch-plugins_video_H_263-1998_Makefile_in
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-plugins_video_H_263-1998_Makefile_in,v 1.1 2008/09/14 13:41:38 jmcneill Exp $
-
---- plugins/video/H.263-1998/Makefile.in.orig	2008-09-14 09:22:08.000000000 -0400
-+++ plugins/video/H.263-1998/Makefile.in	2008-09-14 09:22:17.000000000 -0400
-@@ -62,7 +62,7 @@
- OBJECTS = $(addprefix $(OBJDIR)/,$(patsubst %.cxx,%.o,$(notdir $(SRCS))))
- 
- $(PLUGIN): $(OBJECTS)
--	$(CXX) $(LDSO) $(DL_LIBS) -o $@ $^
-+	$(CXX) $(LDSO) $(DL_LIBS) $(LDFLAGS) -o $@ $^
- 
- install:
- 	mkdir -p $(DESTDIR)$(libdir)/$(VC_PLUGIN_DIR)
diff --git a/devel/opal-devel/patches/patch-plugins_video_H_264_Makefile_in b/devel/opal-devel/patches/patch-plugins_video_H_264_Makefile_in
deleted file mode 100644
index 5dafead679d..00000000000
--- a/devel/opal-devel/patches/patch-plugins_video_H_264_Makefile_in
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-plugins_video_H_264_Makefile_in,v 1.1 2008/09/14 13:41:38 jmcneill Exp $
-
---- plugins/video/H.264/Makefile.in.orig	2008-09-14 09:21:14.000000000 -0400
-+++ plugins/video/H.264/Makefile.in	2008-09-14 09:21:26.000000000 -0400
-@@ -122,7 +122,7 @@
- 
- $(PLUGIN): $(OBJECTS)
- 	@set -e; $(foreach dir,$(SUBDIRS),if test -d ${dir} ; then $(MAKE) -C $(dir); fi ; )
--	$(CXX) $(LDSO) $(DL_LIBS) -o $@ $^
-+	$(CXX) $(LDSO) $(DL_LIBS) $(LDFLAGS) -o $@ $^
- 
- install:
- 	@set -e; $(foreach dir,$(SUBDIRS),if test -d ${dir} ; then $(MAKE) -C $(dir) install; fi ; )
-@@ -138,4 +138,4 @@
- 	@set -e; $(foreach dir,$(SUBDIRS),if test -d ${dir} ; then $(MAKE) -C $(dir) clean; fi ; )
- 
- ###########################################
--                        
-\ No newline at end of file
-+                        
diff --git a/devel/opal-devel/patches/patch-plugins_video_H_264_gpl_Makefile_in b/devel/opal-devel/patches/patch-plugins_video_H_264_gpl_Makefile_in
deleted file mode 100644
index 12c011e026e..00000000000
--- a/devel/opal-devel/patches/patch-plugins_video_H_264_gpl_Makefile_in
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-plugins_video_H_264_gpl_Makefile_in,v 1.1 2008/09/14 14:19:14 jmcneill Exp $
-
---- plugins/video/H.264/gpl/Makefile.in.orig	2008-09-14 10:01:58.000000000 -0400
-+++ plugins/video/H.264/gpl/Makefile.in	2008-09-14 10:02:09.000000000 -0400
-@@ -136,7 +136,7 @@
- OBJECTS = $(addprefix $(OBJDIR)/,$(patsubst %.c,%.o,$(patsubst %.cxx,%.o,$(notdir $(SRCS)))))
- 
- $(PLUGIN): $(OBJECTS)
--	$(CXX) -o $@ $^ $(X264_LIBS)
-+	$(CXX) $(LDFLAGS) -o $@ $^ $(X264_LIBS)
- 
- install:
- 	mkdir -p $(DESTDIR)$(libdir)/$(VC_PLUGIN_DIR)
diff --git a/devel/opal-devel/patches/patch-plugins_video_MPEG4-ffmpeg_Makefile_in b/devel/opal-devel/patches/patch-plugins_video_MPEG4-ffmpeg_Makefile_in
deleted file mode 100644
index 18251c2cf39..00000000000
--- a/devel/opal-devel/patches/patch-plugins_video_MPEG4-ffmpeg_Makefile_in
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-plugins_video_MPEG4-ffmpeg_Makefile_in,v 1.1 2008/09/14 13:41:38 jmcneill Exp $
-
---- plugins/video/MPEG4-ffmpeg/Makefile.in.orig	2008-09-14 09:20:27.000000000 -0400
-+++ plugins/video/MPEG4-ffmpeg/Makefile.in	2008-09-14 09:20:40.000000000 -0400
-@@ -93,7 +93,7 @@
- OBJECTS = $(addprefix $(OBJDIR)/,$(patsubst %.cxx,%.o,$(notdir $(SRCS))))
- 
- $(PLUGIN): $(OBJECTS)
--	$(CXX) $(LDSO) $(DL_LIBS) -o $@ $^
-+	$(CXX) $(LDSO) $(DL_LIBS) $(LDFLAGS) -o $@ $^
- 
- install:
- 	mkdir -p $(DESTDIR)$(libdir)/$(VC_PLUGIN_DIR)
diff --git a/devel/opal-devel/patches/patch-plugins_video_common_dyna_cxx b/devel/opal-devel/patches/patch-plugins_video_common_dyna_cxx
deleted file mode 100644
index a569f15f9fe..00000000000
--- a/devel/opal-devel/patches/patch-plugins_video_common_dyna_cxx
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-plugins_video_common_dyna_cxx,v 1.1 2008/09/14 13:41:38 jmcneill Exp $
-
---- plugins/video/common/dyna.cxx.orig	2008-07-28 17:01:45.000000000 -0400
-+++ plugins/video/common/dyna.cxx	2008-09-13 17:27:40.000000000 -0400
-@@ -136,6 +136,12 @@
-   return true;
- #else
-   void * p = dlsym(_hDLL, (const char *)name);
-+# ifdef __NetBSD__
-+  if (p == NULL) {
-+    (void)dlerror(); /* clear error */
-+    p = dlsym(RTLD_NEXT, (const char *)name);
-+  }
-+# endif /* __NetBSD__ */
-   if (p == NULL)
-     return false;
-   func = (Function &)p;
-- 
cgit v1.2.3