ports/95464: net/opal, net/ekiga: avoid double underscore in the library name, ...

[Joerg Pulz]

>Number:         95464
>Category:       ports
>Synopsis:       net/opal, net/ekiga: avoid double underscore in the library name, ...
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Apr 07 09:20:17 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Joerg Pulz
>Release:        FreeBSD 6.1-PRERELEASE i386
>Organization:
TU-Munich / ZWE FRM-II
>Environment:
System: FreeBSD hades.admin.frm2 6.1-PRERELEASE FreeBSD 6.1-PRERELEASE #11: Wed Feb 22 19:01:44 CET 2006 root at hades.admin.frm2:/usr/obj/usr/src/sys/HADES i386


	
>Description:
	- net/opal
	  * add a patch to avoid the double underscore in the library name
	    now it gets installed as libopal_r.* instead of libopal__r.*
	  * fix pkg-plist to catch all libraries and change to one underscore
	  * add WITH_FFMPEG knob to enable h263avcodec support
	  * add WITH_SPEEX knob to build with speex from audio/speex-devel
	    instead of the bundled version
	    NOTE: there is an explicit BUILD_DEPENDS to make sure
	    audio/speex-devel is installed as audio/speex and audio/speex-devel
	    install the same shared library version!!

	- net/ekiga
	  * chase the net/opal library name change
	  * let bsd.gnome.mk handle the evolutiondataserver dependency
	  * allow the user to disable avahi support by defining WITHOUT_AVAHI
	    hide the net/avahi dependency inside the knob
	  * allow the user to enable dbus support by defining WITH_DBUS
	    add an explicit dependency on devel/dbus for the case one defines
	    WITHOUT_AVAHI and! WITH_DBUS
>How-To-Repeat:
	
>Fix:

	- apply the patch
	- add new file to CVS

--- net_opal.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/opal/Makefile,v
retrieving revision 1.73
diff -u -r1.73 Makefile
--- Makefile	6 Apr 2006 05:21:47 -0000	1.73
+++ Makefile	7 Apr 2006 07:20:07 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	opal
 PORTVERSION=	2.2.1
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.voxgratia.org/releases/
 DISTNAME=	${PORTNAME}-v${PORTVERSION:S/./_/g}-src-
@@ -24,8 +25,24 @@
 USE_AUTOTOOLS=	autoconf:259
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
+NO_FILTER_SHLIBS=	yes
 
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${WRKSRC}/include" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.ifdef (WITH_FFMPEG)
+LIB_DEPENDS+=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg
+CONFIGURE_ARGS+=	--enable-h263avcodec=${LOCALBASE}/include/ffmpeg
+.endif
+
+.ifdef (WITH_SPEEX)
+LIB_DEPENDS+=	speex.3:${PORTSDIR}/audio/speex-devel
+BUILD_DEPENDS+=	${LOCALBASE}/include/speex/speex_echo.h:${PORTSDIR}/audio/speex-devel
+CONFIGURE_ARGS+=	--enable-localspeex=no
+.else
+CONFIGURE_ARGS+=	--enable-localspeex=yes
+.endif
+
+.include <bsd.port.post.mk>
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/net/opal/pkg-plist,v
retrieving revision 1.8
diff -u -r1.8 pkg-plist
--- pkg-plist	6 Apr 2006 05:21:47 -0000	1.8
+++ pkg-plist	7 Apr 2006 07:20:07 -0000
@@ -108,11 +108,11 @@
 include/opal/t38/h323t38.h
 include/opal/t38/t38proto.h
 lib/libopal.so
-lib/libopal__r.so
-lib/libopal__r.so.2.2
-lib/libopal__r.so.2.2.1
+lib/libopal_r.so
+lib/libopal_r.so.2
+lib/libopal_r.so.2.2
+lib/libopal_r.so.2.2.1
 share/opal/opal_inc.mak
- at unexec rm %D/lib/libopal__r.so.2.2 2>/dev/null || true
 @dirrm share/opal
 @dirrm include/opal/t38
 @dirrm include/opal/t120
Index: files/patch-opal_inc.mak.in
===================================================================
RCS file: files/patch-opal_inc.mak.in
diff -N files/patch-opal_inc.mak.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-opal_inc.mak.in	7 Apr 2006 07:20:07 -0000
@@ -0,0 +1,11 @@
+--- opal_inc.mak.in.orig	Fri Apr  7 08:12:16 2006
++++ opal_inc.mak.in	Fri Apr  7 08:13:55 2006
+@@ -103,7 +103,7 @@
+ endif
+ 
+ 
+-OPAL_BASE  = opal_$(PLATFORM_TYPE)_$(OPAL_SUFFIX)
++OPAL_BASE  = opal_$(OPAL_SUFFIX)
+ OPAL_FILE  = lib$(OPAL_BASE)$(LIB_TYPE).$(LIB_SUFFIX)
+ 
+ LDFLAGS	    += -L$(OPAL_LIBDIR)
--- net_opal.diff ends here ---

--- net_ekiga.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/ekiga/Makefile,v
retrieving revision 1.57
diff -u -r1.57 Makefile
--- Makefile	6 Apr 2006 13:04:59 -0000	1.57
+++ Makefile	7 Apr 2006 08:43:41 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	ekiga
 PORTVERSION=	2.0.1
+PORTEVISION=	1
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.0
@@ -14,15 +15,14 @@
 MAINTAINER=	jbq at caraldi.com
 COMMENT=	VoIP phone for Gnome
 
-LIB_DEPENDS=	opal__r.2:${PORTSDIR}/net/opal \
-		avahi-core.4:${PORTSDIR}/net/avahi \
-		ebook-1.2.5:${PORTSDIR}/databases/evolution-data-server
+LIB_DEPENDS=	opal_r.2:${PORTSDIR}/net/opal
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_SDL=	sdl
-USE_GNOME=	libgnomeui libbonobo gnomeprefix gnomehack gnomelibs gnomedocutils
+USE_GNOME=	libgnomeui libbonobo gnomeprefix gnomehack gnomelibs \
+		gnomedocutils evolutiondataserver
 USE_AUTOTOOLS=	libtool:15
 LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 CONFIGURE_ENV=	SDL_CONFIG=${LOCALBASE}/bin/sdl11-config LDFLAGS="${LDFLAGS}"
@@ -33,4 +33,20 @@
 GCONF_SCHEMAS=	ekiga.schemas
 MAN1=		ekiga.1
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.ifndef (WITHOUT_AVAHI)
+LIB_DEPENDS+=	avahi-core.4:${PORTSDIR}/net/avahi
+CONFIGURE_ARGS+=	--enable-avahi
+.else
+CONFIGURE_ARGS+=	--disable-avahi
+.endif
+
+.ifdef (WITH_DBUS)
+LIB_DEPENDS+=	dbus-1.2:${PORTSDIR}/devel/dbus
+CONFIGURE_ARGS+=	--enable-dbus
+.else
+CONFIGURE_ARGS+=	--disable-dbus
+.endif
+
+.include <bsd.port.post.mk>
--- net_ekiga.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: