- Fix openh323u.mak to ports can use.

- Bump PORTREVISION
- Reorganize Makefile
- portlint(1)

PR:		94234
Submitted by:	maintainer
Approved by:	portmgr (marcus)

6 files changed, 117 insertions, 36 deletions

diff --git a/net/opal/Makefile b/net/opal/Makefile
index 10517f59056f..205f557afca5 100644
--- a/net/opal/Makefile
+++ b/net/opal/Makefile
@@ -7,10 +7,11 @@
 
 PORTNAME=	openh323
 PORTVERSION=	1.17.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://www.voxgratia.org/releases/
-DISTFILES=	openh323-v1_17_3-src-tar.gz
+DISTNAME=	${PORTNAME}-v${PORTVERSION:S/./_/g}-src-
+EXTRACT_SUFX=	tar.gz
 
 MAINTAINER=	steve@energistic.com
 COMMENT=	A H323 Video Conferencing library
@@ -18,7 +19,7 @@ COMMENT=	A H323 Video Conferencing library
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2 \
 		pt_r.1:${PORTSDIR}/devel/pwlib
 
-WRKSRC=	${WRKDIR}/openh323_v1_17_3
+WRKSRC=		${WRKDIR}/${PORTNAME}_v${PORTVERSION:S/./_/g}
 
 USE_BISON=	yes
 USE_GMAKE=	yes
@@ -27,15 +28,16 @@ USE_AUTOTOOLS=	autoconf:259
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 
+ALL_TARGET=	optshared
+CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${WRKSRC}/include" \
+		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" BUILDTIME="YES"
+MAKE_ENV=	BUILDTIME="YES"
+NO_FILTER_SHLIBS=	yes
+
 .include <bsd.port.pre.mk>
 
 .if (${ARCH} == "amd64") || (${ARCH} == "ia64") || (${ARCH} == "sparc64")
 CFLAGS+=	-fPIC
 .endif
 
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${WRKSRC}/include" LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" BUILDTIME="YES"
-NO_FILTER_SHLIBS=	yes
-ALL_TARGET=	optshared
-MAKE_ENV=	BUILDTIME="YES"
-
 .include <bsd.port.post.mk>
diff --git a/net/opal/files/patch-openh323u.mak.in b/net/opal/files/patch-openh323u.mak.in
index 50c7a21841f4..e68b8c4420b9 100644
--- a/net/opal/files/patch-openh323u.mak.in
+++ b/net/opal/files/patch-openh323u.mak.in
@@ -1,17 +1,42 @@
---- openh323u.mak.in.orig	Mon Jan  3 07:25:51 2005
-+++ openh323u.mak.in	Tue Feb 14 22:41:55 2006
-@@ -203,6 +203,10 @@
+--- openh323u.mak.in.orig	Tue Mar  7 15:45:47 2006
++++ openh323u.mak.in	Tue Mar  7 15:50:52 2006
+@@ -163,7 +163,15 @@
+ #
+ 
+ PWLIBDIR	= @PWLIBDIR@
++
++ifdef BUILDTIME
+ OPENH323DIR	= @OPENH323DIR@
++endif
++
++ifndef OPENH323DIR
++OPENH323DIR	= /usr/local/share/openh323
++endif
++
+ STDCCFLAGS	+= @STDCCFLAGS@
+ LDFLAGS		+= @LDFLAGS@
+ LDLIBS		+= @LDLIBS@
+@@ -197,12 +205,19 @@
+ #OH323_SUPPRESS_H235	= 1
+ 
+ OH323_SRCDIR = $(OPENH323DIR)/src
++
+ ifdef PREFIX
+ OH323_INCDIR = $(PREFIX)/include/openh323
++OH323_LIBDIR = $(PREFIX)/lib
+ else
  OH323_INCDIR = $(OPENH323DIR)/include
  endif # PREFIX
  
 +ifdef BUILDTIME
 +OH323_INCDIR = ${OPENH323DIR}/include
++OH323_LIBDIR = $(OPENH323DIR)/lib
 +endif #BUILDTIME
 +
  ifndef OH323_LIBDIR
  OH323_LIBDIR = $(OPENH323DIR)/lib
  endif # OH323_LIBDIR
-@@ -216,7 +220,7 @@
+@@ -216,7 +231,7 @@
  OH323_SUFFIX = $(OBJ_SUFFIX)
  endif # NOTRACE
  
diff --git a/net/opal3/Makefile b/net/opal3/Makefile
index 10517f59056f..205f557afca5 100644
--- a/net/opal3/Makefile
+++ b/net/opal3/Makefile
@@ -7,10 +7,11 @@
 
 PORTNAME=	openh323
 PORTVERSION=	1.17.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://www.voxgratia.org/releases/
-DISTFILES=	openh323-v1_17_3-src-tar.gz
+DISTNAME=	${PORTNAME}-v${PORTVERSION:S/./_/g}-src-
+EXTRACT_SUFX=	tar.gz
 
 MAINTAINER=	steve@energistic.com
 COMMENT=	A H323 Video Conferencing library
@@ -18,7 +19,7 @@ COMMENT=	A H323 Video Conferencing library
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2 \
 		pt_r.1:${PORTSDIR}/devel/pwlib
 
-WRKSRC=	${WRKDIR}/openh323_v1_17_3
+WRKSRC=		${WRKDIR}/${PORTNAME}_v${PORTVERSION:S/./_/g}
 
 USE_BISON=	yes
 USE_GMAKE=	yes
@@ -27,15 +28,16 @@ USE_AUTOTOOLS=	autoconf:259
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 
+ALL_TARGET=	optshared
+CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${WRKSRC}/include" \
+		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" BUILDTIME="YES"
+MAKE_ENV=	BUILDTIME="YES"
+NO_FILTER_SHLIBS=	yes
+
 .include <bsd.port.pre.mk>
 
 .if (${ARCH} == "amd64") || (${ARCH} == "ia64") || (${ARCH} == "sparc64")
 CFLAGS+=	-fPIC
 .endif
 
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${WRKSRC}/include" LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" BUILDTIME="YES"
-NO_FILTER_SHLIBS=	yes
-ALL_TARGET=	optshared
-MAKE_ENV=	BUILDTIME="YES"
-
 .include <bsd.port.post.mk>
diff --git a/net/opal3/files/patch-openh323u.mak.in b/net/opal3/files/patch-openh323u.mak.in
index 50c7a21841f4..e68b8c4420b9 100644
--- a/net/opal3/files/patch-openh323u.mak.in
+++ b/net/opal3/files/patch-openh323u.mak.in
@@ -1,17 +1,42 @@
---- openh323u.mak.in.orig	Mon Jan  3 07:25:51 2005
-+++ openh323u.mak.in	Tue Feb 14 22:41:55 2006
-@@ -203,6 +203,10 @@
+--- openh323u.mak.in.orig	Tue Mar  7 15:45:47 2006
++++ openh323u.mak.in	Tue Mar  7 15:50:52 2006
+@@ -163,7 +163,15 @@
+ #
+ 
+ PWLIBDIR	= @PWLIBDIR@
++
++ifdef BUILDTIME
+ OPENH323DIR	= @OPENH323DIR@
++endif
++
++ifndef OPENH323DIR
++OPENH323DIR	= /usr/local/share/openh323
++endif
++
+ STDCCFLAGS	+= @STDCCFLAGS@
+ LDFLAGS		+= @LDFLAGS@
+ LDLIBS		+= @LDLIBS@
+@@ -197,12 +205,19 @@
+ #OH323_SUPPRESS_H235	= 1
+ 
+ OH323_SRCDIR = $(OPENH323DIR)/src
++
+ ifdef PREFIX
+ OH323_INCDIR = $(PREFIX)/include/openh323
++OH323_LIBDIR = $(PREFIX)/lib
+ else
  OH323_INCDIR = $(OPENH323DIR)/include
  endif # PREFIX
  
 +ifdef BUILDTIME
 +OH323_INCDIR = ${OPENH323DIR}/include
++OH323_LIBDIR = $(OPENH323DIR)/lib
 +endif #BUILDTIME
 +
  ifndef OH323_LIBDIR
  OH323_LIBDIR = $(OPENH323DIR)/lib
  endif # OH323_LIBDIR
-@@ -216,7 +220,7 @@
+@@ -216,7 +231,7 @@
  OH323_SUFFIX = $(OBJ_SUFFIX)
  endif # NOTRACE
  
diff --git a/net/openh323/Makefile b/net/openh323/Makefile
index 10517f59056f..205f557afca5 100644
--- a/net/openh323/Makefile
+++ b/net/openh323/Makefile
@@ -7,10 +7,11 @@
 
 PORTNAME=	openh323
 PORTVERSION=	1.17.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://www.voxgratia.org/releases/
-DISTFILES=	openh323-v1_17_3-src-tar.gz
+DISTNAME=	${PORTNAME}-v${PORTVERSION:S/./_/g}-src-
+EXTRACT_SUFX=	tar.gz
 
 MAINTAINER=	steve@energistic.com
 COMMENT=	A H323 Video Conferencing library
@@ -18,7 +19,7 @@ COMMENT=	A H323 Video Conferencing library
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2 \
 		pt_r.1:${PORTSDIR}/devel/pwlib
 
-WRKSRC=	${WRKDIR}/openh323_v1_17_3
+WRKSRC=		${WRKDIR}/${PORTNAME}_v${PORTVERSION:S/./_/g}
 
 USE_BISON=	yes
 USE_GMAKE=	yes
@@ -27,15 +28,16 @@ USE_AUTOTOOLS=	autoconf:259
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 
+ALL_TARGET=	optshared
+CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${WRKSRC}/include" \
+		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" BUILDTIME="YES"
+MAKE_ENV=	BUILDTIME="YES"
+NO_FILTER_SHLIBS=	yes
+
 .include <bsd.port.pre.mk>
 
 .if (${ARCH} == "amd64") || (${ARCH} == "ia64") || (${ARCH} == "sparc64")
 CFLAGS+=	-fPIC
 .endif
 
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${WRKSRC}/include" LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" BUILDTIME="YES"
-NO_FILTER_SHLIBS=	yes
-ALL_TARGET=	optshared
-MAKE_ENV=	BUILDTIME="YES"
-
 .include <bsd.port.post.mk>
diff --git a/net/openh323/files/patch-openh323u.mak.in b/net/openh323/files/patch-openh323u.mak.in
index 50c7a21841f4..e68b8c4420b9 100644
--- a/net/openh323/files/patch-openh323u.mak.in
+++ b/net/openh323/files/patch-openh323u.mak.in
@@ -1,17 +1,42 @@
---- openh323u.mak.in.orig	Mon Jan  3 07:25:51 2005
-+++ openh323u.mak.in	Tue Feb 14 22:41:55 2006
-@@ -203,6 +203,10 @@
+--- openh323u.mak.in.orig	Tue Mar  7 15:45:47 2006
++++ openh323u.mak.in	Tue Mar  7 15:50:52 2006
+@@ -163,7 +163,15 @@
+ #
+ 
+ PWLIBDIR	= @PWLIBDIR@
++
++ifdef BUILDTIME
+ OPENH323DIR	= @OPENH323DIR@
++endif
++
++ifndef OPENH323DIR
++OPENH323DIR	= /usr/local/share/openh323
++endif
++
+ STDCCFLAGS	+= @STDCCFLAGS@
+ LDFLAGS		+= @LDFLAGS@
+ LDLIBS		+= @LDLIBS@
+@@ -197,12 +205,19 @@
+ #OH323_SUPPRESS_H235	= 1
+ 
+ OH323_SRCDIR = $(OPENH323DIR)/src
++
+ ifdef PREFIX
+ OH323_INCDIR = $(PREFIX)/include/openh323
++OH323_LIBDIR = $(PREFIX)/lib
+ else
  OH323_INCDIR = $(OPENH323DIR)/include
  endif # PREFIX
  
 +ifdef BUILDTIME
 +OH323_INCDIR = ${OPENH323DIR}/include
++OH323_LIBDIR = $(OPENH323DIR)/lib
 +endif #BUILDTIME
 +
  ifndef OH323_LIBDIR
  OH323_LIBDIR = $(OPENH323DIR)/lib
  endif # OH323_LIBDIR
-@@ -216,7 +220,7 @@
+@@ -216,7 +231,7 @@
  OH323_SUFFIX = $(OBJ_SUFFIX)
  endif # NOTRACE