- Update to 2.1.1

- Take maintainership
- portlint(1)

PR:		95473
Submitted by:	Joerg Pulz <Joerg.Pulz___frm2.tum.de>

5 files changed, 65 insertions, 48 deletions

diff --git a/net/openmcu/Makefile b/net/openmcu/Makefile
index cb72050584e6..dfd606b98725 100644
--- a/net/openmcu/Makefile
+++ b/net/openmcu/Makefile
@@ -6,36 +6,52 @@
 #
 
 PORTNAME=	openmcu
-PORTVERSION=	1.1.7
-PORTREVISION=	2
+PORTVERSION=	2.1.1
 CATEGORIES=	net
-MASTER_SITES=	http://www.openh323.org/bin/ \
-		http://www.de.openh323.org/bin/ \
-		http://www.ru.openh323.org/bin/
-DISTNAME=	${PORTNAME}_${PORTVERSION}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	openh323
+DISTNAME=	${PORTNAME}-v${PORTVERSION:S/./_/g}-src
+EXTRACT_SUFX=	-tar.gz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	Joerg.Pulz@frm2.tum.de
 COMMENT=	OpenMCU hosts a conference call for H323 Video Conferencing users
 
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/net/openh323-112:build
+LIB_DEPENDS=	h323_r.1:${PORTSDIR}/net/openh323
 
-BROKEN=		Incomplete dependency list
-
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
-NOCLEANDEPENDS=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}_v${PORTVERSION:S/./_/g}
 
 USE_BISON=	yes
 USE_GMAKE=	yes
-ALL_TARGET=	optnoshared
-MAKE_ENV=	PWLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../../devel/pwlib152/work/pwlib \
-		OPENH323DIR=${WRKDIRPREFIX}${.CURDIR}/../openh323-112/work/openh323
-THE_MACHTYPE=	${ARCH:S/i386/x86/}
-MAKE_ARGS=	OSTYPE=${OPSYS} MACHTYPE=${THE_MACHTYPE} OSRELEASE=${OSVERSION} CPLUS=${CXX}
+ALL_TARGET=	optshared
+MAKE_ENV=	PWLIBDIR=${LOCALBASE}/share/pwlib \
+		OPENH323DIR=${LOCALBASE}/share/openh323 \
+		SYSLIBDIR=${LOCALBASE}/lib
+MAKE_ARGS=	OSTYPE=${OPSYS} MACHTYPE=${ARCH:S/i386/x86/} \
+		OSRELEASE=${OSVERSION} CPLUS=${CXX}
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/obj_${OPSYS}_${THE_MACHTYPE}_r/openmcu ${PREFIX}/bin
-	${MKDIR} ${PREFIX}/share/doc/openh323/openmcu
-	${INSTALL_DATA} ${WRKSRC}/ReadMe.txt ${PREFIX}/share/doc/openh323/openmcu
+MAN1=		openmcu.1
+
+PLIST_SUB=	PORTNAME=${PORTNAME}
+DOCSDIR=	${PREFIX}/share/doc/openh323
+EXAMPLESDIR=	${PREFIX}/share/examples/openh323
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+pre-install:
+	@${SED}	-e 's|%%EXAMPLESDIR%%|${EXAMPLESDIR}|g' \
+		-e 's|%%PORTNAME%%|${PORTNAME}|g' \
+		${FILESDIR}/openmcu.ini.sample > ${WRKDIR}/openmcu.ini
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/obj_r/openmcu ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MAN1PREFIX}/man/man1
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/ReadMe.txt ${DOCSDIR}/${PORTNAME}
+.endif
+	@${MKDIR} ${EXAMPLESDIR}/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/*.wav ${EXAMPLESDIR}/${PORTNAME}
+	${INSTALL_DATA} ${WRKDIR}/openmcu.ini ${EXAMPLESDIR}/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/server.pem ${EXAMPLESDIR}/${PORTNAME}
+
+.include <bsd.port.post.mk>
diff --git a/net/openmcu/distinfo b/net/openmcu/distinfo
index 93567fd9283b..66f832fc8b20 100644
--- a/net/openmcu/distinfo
+++ b/net/openmcu/distinfo
@@ -1,3 +1,3 @@
-MD5 (openmcu_1.1.7.tar.gz) = 041c468256f426e9e5a8cec0cdc769f6
-SHA256 (openmcu_1.1.7.tar.gz) = 13b8bb31c9d45268b175ed9ab334652c78b965f516b228a85a93759e6ed5fed8
-SIZE (openmcu_1.1.7.tar.gz) = 34535
+MD5 (openmcu-v2_1_1-src-tar.gz) = db561a73bc96557b105625f2107b03ef
+SHA256 (openmcu-v2_1_1-src-tar.gz) = 67955ce910b3845e1353b7020353bd91ac7c77985f0ed1345bc5a09cac191aad
+SIZE (openmcu-v2_1_1-src-tar.gz) = 78701
diff --git a/net/openmcu/files/openmcu.ini.sample b/net/openmcu/files/openmcu.ini.sample
new file mode 100644
index 000000000000..2b699b0dff62
--- /dev/null
+++ b/net/openmcu/files/openmcu.ini.sample
@@ -0,0 +1,13 @@
+[Parameters]
+Password=
+Log Level=2
+HTTP Certificate=%%EXAMPLESDIR%%/%%PORTNAME%%/server.pem
+HTTP Port=1420
+Gatekeeper Mode=Find gatekeeper
+Interface Array Size=0
+Default room=room101
+Connecting WAV File=%%EXAMPLESDIR%%/%%PORTNAME%%/connecting.wav
+Entering WAV File=%%EXAMPLESDIR%%/%%PORTNAME%%/entering.wav
+Leaving WAV File=%%EXAMPLESDIR%%/%%PORTNAME%%/leaving.wav
+Call log filename=/var/log/%%PORTNAME%%/%%PORTNAME%%_call.log
+
diff --git a/net/openmcu/files/patch-main b/net/openmcu/files/patch-main
deleted file mode 100644
index d5edeaf0f5f7..000000000000
--- a/net/openmcu/files/patch-main
+++ /dev/null
@@ -1,19 +0,0 @@
-*** main.cxx.orig	Thu Aug 28 08:27:00 2003
---- main.cxx	Thu Aug 28 08:27:11 2003
-***************
-*** 261,267 ****
-  #include "speexcodec.h"
-  #ifndef NO_VIDEO
-  #include "h261codec.h"
-! #include "videoio.h"
-  #endif
-  #include "main.h"
-  
---- 261,267 ----
-  #include "speexcodec.h"
-  #ifndef NO_VIDEO
-  #include "h261codec.h"
-! //#include "videoio.h"
-  #endif
-  #include "main.h"
-  
diff --git a/net/openmcu/pkg-plist b/net/openmcu/pkg-plist
index 43fe50d03d4f..792c6bf50f78 100644
--- a/net/openmcu/pkg-plist
+++ b/net/openmcu/pkg-plist
@@ -1,4 +1,11 @@
 bin/openmcu
-share/doc/openh323/openmcu/ReadMe.txt
-@dirrmtry share/doc/openh323/openmcu
-@dirrmtry share/doc/openh323
+%%EXAMPLESDIR%%/%%PORTNAME%%/connecting.wav
+%%EXAMPLESDIR%%/%%PORTNAME%%/entering.wav
+%%EXAMPLESDIR%%/%%PORTNAME%%/leaving.wav
+%%EXAMPLESDIR%%/%%PORTNAME%%/openmcu.ini
+%%EXAMPLESDIR%%/%%PORTNAME%%/server.pem
+@dirrm %%EXAMPLESDIR%%/%%PORTNAME%%
+@dirrmtry %%EXAMPLESDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/%%PORTNAME%%/ReadMe.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/%%PORTNAME%%
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%