4 files changed, 62 insertions, 26 deletions

diff --git a/net/asterisk-oh323/Makefile b/net/asterisk-oh323/Makefile
index bb9ca214090e..eb8fa3212869 100644
--- a/net/asterisk-oh323/Makefile
+++ b/net/asterisk-oh323/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	asterisk-oh323
 PORTVERSION=	0.6.5
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.inaccessnetworks.com/asterisk-oh323/download/
 
@@ -19,10 +20,15 @@ BUILD_DEPENDS= 	${NONEXISTENT}:${PORTSDIR}/devel/pwlib:build \
 
 USE_GMAKE=	yes
 
-PLIST_FILES=	lib/liboh323wrapd.a
+PLIST_FILES=	lib/liboh323wrap_s.a
 PLIST_FILES+=	lib/asterisk/modules/chan_oh323.so
 PLIST_FILES+=	etc/asterisk/oh323.conf.sample
 
+MAKE_ENV=	MKDIR="${MKDIR}" \
+		PWLIBDIR=${WRKDIRPREFIX}${PORTSDIR}/devel/pwlib/work/pwlib \
+		OPENH323DIR=${WRKDIRPREFIX}${PORTSDIR}/net/openh323/work/openh323 \
+		CPP="${CXX}"
+
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/net/asterisk-oh323/files/patch-Makefile b/net/asterisk-oh323/files/patch-Makefile
index 02bda87e5745..57096640f842 100644
--- a/net/asterisk-oh323/files/patch-Makefile
+++ b/net/asterisk-oh323/files/patch-Makefile
@@ -1,40 +1,43 @@
---- Makefile.orig	Wed Nov  3 13:52:59 2004
-+++ Makefile	Fri Jun 17 15:58:04 2005
+
+$FreeBSD$
+
+--- Makefile.orig
++++ Makefile
 @@ -39,7 +39,7 @@
  # Install everything under this directory. If this is empty, then everything
  # will be installed under /
  #
 -DESTDIR=
-+DESTDIR=/usr/local
++DESTDIR=$(PREFIX)
  
  #
  # Set PWLIBDIR variable to the directory containing the sources of 
-@@ -49,7 +49,7 @@ DESTDIR=
+@@ -49,7 +49,7 @@
  # compile asterisk-oh323. Do not use the installed library of your
  # distribution. It won't work.
  #
 -PWLIBDIR=/root/src/oh323/pwlib
-+PWLIBDIR=/usr/ports/devel/pwlib/work/pwlib
++PWLIBDIR?=/root/src/oh323/pwlib
  
  #
  # Set OPENH323LIBDIR variable to the directory containing the sources of
-@@ -59,13 +59,13 @@ PWLIBDIR=/root/src/oh323/pwlib
+@@ -59,13 +59,13 @@
  # compile asterisk-oh323. Do not use the installed library of your
  # distribution. It won't work.
  #
 -OPENH323DIR=/root/src/oh323/openh323
-+OPENH323DIR=/usr/ports/net/openh323/work/openh323
++OPENH323DIR?=/root/src/oh323/openh323
  
  #
  # Set ASTERISKINCDIR variable to the directory containing the include files of
  # Asterisk PBX.
  #
 -ASTERISKINCDIR=/root/src/asterisk/include
-+ASTERISKINCDIR=/usr/local/include
++ASTERISKINCDIR=$(LOCALBASE)/include
  
  #
  # Set ASTERISKMODDIR variable to the directory where ASTERISK's modules reside.
-@@ -73,7 +73,7 @@ ASTERISKINCDIR=/root/src/asterisk/includ
+@@ -73,7 +73,7 @@
  #
  # Note: This directory is created under $DESTDIR.
  #
@@ -43,7 +46,7 @@
  
  #
  # Set ASTERISKETCDIR variable to the directory where ASTERISK's configuration
-@@ -91,7 +91,7 @@ ASTERISKETCDIR=/etc/asterisk
+@@ -91,7 +91,7 @@
  #
  # Note: This directory is created under $DESTDIR.
  #
@@ -52,15 +55,19 @@
  
  #
  # Set SSLINCDIR variable to the directory where ssl/crypto
-@@ -159,7 +159,6 @@ SUBDIRS=wrapper asterisk-driver
+@@ -157,9 +157,8 @@
+ SUBDIRS=wrapper asterisk-driver
+ .PHONY: all build install clean subdirs_build subdir_install subdir_clean \
  		rpm rpm_clean help $(SUBDIRS)
- CC=gcc
- CPP=g++
+-CC=gcc
+-CPP=g++
 -MAKE=make
++CC?=gcc
++CPP?=g++
  INSTALL=install
  TOUCH=touch
  AR=ar
-@@ -191,7 +190,7 @@ endif
+@@ -191,12 +190,12 @@
  ifdef	P_PTHREADS
  OPENH323USERFLAGS += P_PTHREADS=1
  endif
@@ -68,8 +75,15 @@
 +OPENH323FLAGS=$(shell $(MAKE) $(OPENH323USERFLAGS) --no-print-directory -s \
  		-C $(OPENH323DIR) \
  		PWLIBDIR=$(PWLIBDIR) OPENH323DIR=$(OPENH323DIR) ccflags)
- CPPFLAGS=$(OPENH323FLAGS) -Wall -x c++ -Os
-@@ -223,7 +222,7 @@ install: subdirs_build subdirs_install
+-CPPFLAGS=$(OPENH323FLAGS) -Wall -x c++ -Os
++CPPFLAGS=$(CXXFLAGS) $(OPENH323FLAGS) -Wall -x c++ -Os
+ ASTERISKINCLUDE=-I$(ASTERISKINCDIR) -I../wrapper
+-CFLAGS=-Wall
++CFLAGS+=-Wall
+ ifdef	HAS_OH323MODS
+ CPPFLAGS += -DHAS_OH323MODS
+ CFLAGS += -DHAS_OH323MODS
+@@ -223,7 +222,7 @@
   
  clean: subdirs_clean rpm_clean
  
diff --git a/net/asterisk-oh323/files/patch-asterisk-driver::Makefile b/net/asterisk-oh323/files/patch-asterisk-driver::Makefile
index 34cf24053f38..74e8a42106de 100644
--- a/net/asterisk-oh323/files/patch-asterisk-driver::Makefile
+++ b/net/asterisk-oh323/files/patch-asterisk-driver::Makefile
@@ -1,6 +1,9 @@
---- asterisk-driver/Makefile.orig	Mon Oct  4 14:52:09 2004
-+++ asterisk-driver/Makefile	Fri Jun 17 13:51:08 2005
-@@ -33,9 +33,9 @@ TARGET_OBJ=chan_oh323.o
+
+$FreeBSD$
+
+--- asterisk-driver/Makefile.orig
++++ asterisk-driver/Makefile
+@@ -33,9 +33,9 @@
  
  ifndef SKIP_SUFFIX
  	ifeq ($(OH323STAT),1)
@@ -12,7 +15,7 @@
  	endif
  	LIBPTNAME=$(subst lib,,$(basename $(notdir $(LIBPTPATH))))
  	LIBPTSSUF=$(findstring _r_s,$(LIBPTNAME))	# Static lib suffix
-@@ -54,9 +54,9 @@ ifndef SKIP_SUFFIX
+@@ -54,9 +54,9 @@
  		LIBH323PATH=$(word 1,$(shell ls $(OPENH323DIR)/lib/libh323*s.a))
  	else
  		ifdef NOTRACE
@@ -24,7 +27,7 @@
  		endif
  	endif
  	LIBH323NAME=$(subst lib,,$(basename $(notdir $(LIBH323PATH))))
-@@ -76,7 +76,7 @@ else
+@@ -76,7 +76,7 @@
  endif
  
  ifndef SKIP_EXTLIBS
@@ -33,11 +36,23 @@
  endif
  
  CFLAGS += -pipe -Wall -Wstrict-prototypes -Wmissing-prototypes \
-@@ -101,6 +101,7 @@ install:
+@@ -95,14 +95,15 @@
+ 
+ install:
+ 	if [ ! -d $(DESTDIR)$(ASTERISKMODDIR) ]; then \
+-		$(INSTALL) -d $(DESTDIR)$(ASTERISKMODDIR); \
++		$(MKDIR) $(DESTDIR)$(ASTERISKMODDIR); \
+ 	fi
+-	$(INSTALL) $(TARGET) $(DESTDIR)$(ASTERISKMODDIR)
++	$(BSD_INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(ASTERISKMODDIR)
  	if [ ! -d $(DESTDIR)$(ASTERISKETCDIR) ]; then \
- 		$(INSTALL) -d $(DESTDIR)$(ASTERISKETCDIR); \
+-		$(INSTALL) -d $(DESTDIR)$(ASTERISKETCDIR); \
++		$(MKDIR) $(DESTDIR)$(ASTERISKETCDIR); \
  	fi
-+	$(INSTALL) -m 0644 oh323.conf.sample $(DESTDIR)$(ASTERISKETCDIR)/oh323.conf.sample
++	$(BSD_INSTALL_DATA) oh323.conf.sample $(DESTDIR)$(ASTERISKETCDIR)/oh323.conf.sample
  	if [ ! -f $(DESTDIR)$(ASTERISKETCDIR)/oh323.conf ]; then \
- 		$(INSTALL) -m 0644 oh323.conf.sample $(DESTDIR)$(ASTERISKETCDIR)/oh323.conf; \
+-		$(INSTALL) -m 0644 oh323.conf.sample $(DESTDIR)$(ASTERISKETCDIR)/oh323.conf; \
++		$(BSD_INSTALL_DATA) oh323.conf.sample $(DESTDIR)$(ASTERISKETCDIR)/oh323.conf; \
  	fi
+ 	@echo
+ 	@echo " +----------   Asterisk-oh323 Installation Complete   ----------+ "
diff --git a/net/asterisk-oh323/pkg-message b/net/asterisk-oh323/pkg-message
index 6c14d7d2ba80..3e89d18ed561 100644
--- a/net/asterisk-oh323/pkg-message
+++ b/net/asterisk-oh323/pkg-message
@@ -6,3 +6,4 @@
 * likely prevent the Asterisk from working! *
 *                                           *
 *********************************************
+