ports/95695: net/asterisk-oh323: switch to devel/pwlib and net/openh323

[Joerg Pulz]

>Number:         95695
>Category:       ports
>Synopsis:       net/asterisk-oh323: switch to devel/pwlib and net/openh323
>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:   Thu Apr 13 14:30:12 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/asterisk-oh323 still depends on the old devel/pwlib152 and
	  net/openh323-112 ports
	- the patch changes the dependency to net/openh323 which implies
	  devel/pwlib
	- files/patch-Makefile
	  * switch to dynamic linking
	- files/patch-asterisk-driver::Makefile
	  * correct library path
	- files/patch-wrapper::check_ver (new)
	  * adopt to use the correct header files to extract the PWLIB_VERSION
	    and OPENH323_VERSION

	This brings us one step closer to the removal of the old devel/pwlib152
	and net/openh323-112 ports
>How-To-Repeat:
	
>Fix:

	- apply the patch and add files/patch-wrapper::check_ver to CVS

--- net_asterisk-oh323.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/asterisk-oh323/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile	5 Feb 2006 12:35:08 -0000	1.6
+++ Makefile	13 Apr 2006 13:08:16 -0000
@@ -7,23 +7,22 @@
 
 PORTNAME=	asterisk-oh323
 PORTVERSION=	0.7.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://www.inaccessnetworks.com/projects/asterisk-oh323/download/
 
 MAINTAINER=	bamby at portaone.com
 COMMENT=	A H.323 support module for the Asterisk soft PBX
 
-BUILD_DEPENDS= 	${NONEXISTENT}:${PORTSDIR}/devel/pwlib152:build \
-	    	${NONEXISTENT}:${PORTSDIR}/net/openh323-112:build \
-	    	${LOCALBASE}/sbin/asterisk:${PORTSDIR}/net/asterisk
+BUILD_DEPENDS= 	${LOCALBASE}/sbin/asterisk:${PORTSDIR}/net/asterisk
+LIB_DEPENDS=	h323_r.1:${PORTSDIR}/net/openh323
 
 USE_GMAKE=	yes
 MAKE_ENV=	MKDIR="${MKDIR}" \
-		PWLIBDIR=${WRKDIRPREFIX}${PORTSDIR}/devel/pwlib152/work/pwlib \
-		OPENH323DIR=${WRKDIRPREFIX}${PORTSDIR}/net/openh323-112/work/openh323 \
-		CPP="${CXX}" \
-		USE_OLD_CAPABILITIES_API="yes"
+		PWLIBDIR=${LOCALBASE}/share/pwlib \
+		OPENH323DIR=${LOCALBASE}/share/openh323 \
+		SYSLIBDIR=${LOCALBASE}/lib \
+		CPP="${CXX}"
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
Index: files/patch-Makefile
===================================================================
RCS file: /home/ncvs/ports/net/asterisk-oh323/files/patch-Makefile,v
retrieving revision 1.3
diff -u -r1.3 patch-Makefile
--- files/patch-Makefile	19 Jan 2006 22:40:42 -0000	1.3
+++ files/patch-Makefile	13 Apr 2006 13:08:16 -0000
@@ -1,5 +1,5 @@
---- Makefile.orig	Wed Jan 18 10:54:59 2006
-+++ Makefile	Wed Jan 18 11:50:59 2006
+--- Makefile.orig	Fri Sep  9 17:03:53 2005
++++ Makefile	Thu Apr 13 13:52:00 2006
 @@ -41,7 +41,7 @@
  # Install everything under this directory. If this is empty, then everything
  # will be installed under /
@@ -52,3 +52,12 @@
  
  #
  # Set WRAPTRACING to 1 to enable tracing information from the OpenH323Wrap
+@@ -120,7 +120,7 @@
+ # With this flag on the channel driver is huge, in size, but Asterisk boots
+ # faster!
+ #
+-OH323STAT=1
++#OH323STAT=1
+ 
+ #
+ # Define options that were used during Asterisk compilation. It is
Index: files/patch-asterisk-driver::Makefile
===================================================================
RCS file: /home/ncvs/ports/net/asterisk-oh323/files/patch-asterisk-driver::Makefile,v
retrieving revision 1.3
diff -u -r1.3 patch-asterisk-driver::Makefile
--- files/patch-asterisk-driver::Makefile	19 Jan 2006 22:40:42 -0000	1.3
+++ files/patch-asterisk-driver::Makefile	13 Apr 2006 13:08:16 -0000
@@ -1,5 +1,33 @@
---- asterisk-driver/Makefile.orig	Wed Jan 18 11:43:28 2006
-+++ asterisk-driver/Makefile	Wed Jan 18 11:55:34 2006
+--- asterisk-driver/Makefile.orig	Fri Sep  9 16:35:25 2005
++++ asterisk-driver/Makefile	Thu Apr 13 14:22:51 2006
+@@ -40,9 +40,9 @@
+ 		endif
+ 	else
+ 		ifeq ($(OH323BUILDTYPE),debug) # Shared, debug
+-			LIBPTPATH=$(word 1,$(shell ls $(PWLIBDIR)/lib/libpt*d.so))
++			LIBPTPATH=$(word 1,$(shell ls $(SYSLIBDIR)/libpt*d.so))
+ 		else                           # Shared, opt
+-			LIBPTPATH=$(word 1,$(shell ls $(PWLIBDIR)/lib/libpt*r.so))
++			LIBPTPATH=$(word 1,$(shell ls $(SYSLIBDIR)/libpt*r.so))
+ 		endif
+ 	endif
+ 	LIBPTNAME=$(subst lib,,$(basename $(notdir $(LIBPTPATH))))
+@@ -69,12 +69,12 @@
+ 		endif
+ 	else
+ 		ifeq ($(OH323BUILDTYPE),debug)   # Shared, debug
+-			LIBH323PATH=$(word 1,$(shell ls $(OPENH323DIR)/lib/libh323*d.so))
++			LIBH323PATH=$(word 1,$(shell ls $(SYSLIBDIR)/libh323*d.so))
+ 		else
+ 			ifeq ($(OH323BUILDTYPE),opt) # Shared, opt
+-				LIBH323PATH=$(word 1,$(shell ls $(OPENH323DIR)/lib/libh323*r.so))
++				LIBH323PATH=$(word 1,$(shell ls $(SYSLIBDIR)/libh323*r.so))
+ 			else                         # Shared, opt, no trace
+-				LIBH323PATH=$(word 1,$(shell ls $(OPENH323DIR)/lib/libh323*n.so))
++				LIBH323PATH=$(word 1,$(shell ls $(SYSLIBDIR)/libh323*n.so))
+ 			endif
+ 		endif
+ 	endif
 @@ -90,7 +90,7 @@
  LIBH323=$(LIBH323NAME)
  
Index: files/patch-wrapper::check_ver
===================================================================
RCS file: files/patch-wrapper::check_ver
diff -N files/patch-wrapper::check_ver
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-wrapper::check_ver	13 Apr 2006 13:08:16 -0000
@@ -0,0 +1,27 @@
+--- wrapper/check_ver.orig	Thu Apr 13 14:02:00 2006
++++ wrapper/check_ver	Thu Apr 13 14:11:54 2006
+@@ -1,10 +1,17 @@
+ #!/bin/sh
+ 
+-if [ -f .$2_version ]; then
+-	mv .$2_version .$2_version.old
++if [ -f .${2}_version ]; then
++	mv .${2}_version .${2}_version.old
+ fi
+-
+-MAJOR_VER=`cat $1/version.h | grep "#define MAJOR_VERSION" | awk -F\  '{print $3}'`
+-MINOR_VER=`cat $1/version.h | grep "#define MINOR_VERSION" | awk -F\  '{print $3}'`
+-BUILD_NUM=`cat $1/version.h | grep "#define BUILD_NUMBER" | awk -F\  '{print $3}'`
+-echo -e "$MAJOR_VER.$MINOR_VER.$BUILD_NUM" > .$2_version
++case ${2} in
++	pwlib)
++	grep "PWLIB_VERSION" ${1}/../../include/ptbuildopts.h | \
++	  awk -F\  '{print $3}' > .${2}_version
++	;;
++	openh323)
++	grep "OPENH323_VERSION" ${1}/../../include/${2}/${2}buildopts.h | \
++	  awk -F\  '{print $3}' > .${2}_version
++	;;
++	*)
++	;;
++esac
--- net_asterisk-oh323.diff ends here ---


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