ports/95488: net/callgen: repomove, update, unbreak, take maintainership

Sun May 7 16:07:00 UTC 2006

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1


Hi,

here is an updated version of the patch, as we found out that the default 
thread library on sparc64 for OSVERSION prior to 700004 is missing a 
required symbol.
The patch contains now some lines to mark this port BROKEN for
.if ${ARCH} == sparc64 && ${OSVERSION} <= 700003

This patch completely supersedes the previous patch from the PR.

I send this patch inline and attached to have a viewable version in GNATS 
and a usable version for the committer (i think my mailclient is modifying 
lines which begin with "--" ).

regards
Joerg

- --- net_callgen323.diff2 begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/callgen/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
- --- Makefile	5 Feb 2006 12:35:08 -0000	1.5
+++ Makefile	7 May 2006 15:56:50 -0000
@@ -4,38 +4,43 @@
  #
  # $FreeBSD: ports/net/callgen/Makefile,v 1.5 2006/02/05 12:35:08 netchild Exp $

- -PORTNAME=	callgen
- -PORTVERSION=	1.2.6
- -PORTREVISION=	1
+PORTNAME=	callgen323
+DISTVERSION=	2.0.0.cvs.20060407
  CATEGORIES=	net
- -MASTER_SITES=	http://www.openh323.org/bin/
- -DISTNAME=	callgen323_${PORTVERSION}
+MASTER_SITES=	ftp://ftp.frm2.tum.de/jpulz/FreeBSD/distfiles/
+PKGNAMESUFFIX?=	-openh323

- -MAINTAINER=	jacke at bofh.pl
+MAINTAINER=	Joerg.Pulz at frm2.tum.de
  COMMENT=	H.323 Call Generator

- -BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/net/openh323-112:configure
- -
- -NOCLEANDEPENDS=	yes
  USE_GMAKE=	yes
- -WRKSRC=		${WRKDIR}/callgen323
- -MAKE_ENV=	PWLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../../devel/pwlib152/work/pwlib \
- -		OPENH323DIR=${WRKDIRPREFIX}${.CURDIR}/../openh323-112/work/openh323
- -THE_MACHTYPE=	${ARCH:S/i386/x86/}
+ALL_TARGET=	optshared
+MAKE_ENV=	PWLIBDIR=${LOCALBASE}/share/pwlib \
+		OPENH323DIR=${LOCALBASE}/share/openh323 \
+		OPALDIR=${LOCALBASE}/share/opal \
+		SYSLIBDIR=${LOCALBASE}/lib
+MAKE_ARGS=	OSTYPE=${OPSYS} MACHTYPE=${ARCH:S/i386/x86/} \
+		OSRELEASE=${OSVERSION} CPLUS=${CXX}

  PLIST_FILES=	bin/callgen323

  .include <bsd.port.pre.mk>

- -.if ${OSVERSION} >= 502126
- -BROKEN=		"Does not compile on FreeBSD >= 5.x"
+.if ${ARCH} == sparc64 && ${OSVERSION} <= 700003
+BROKEN= does not link due to missing symbol in default thread library
  .endif

- -.if ${ARCH} == "amd64"
- -BROKEN=		"Does not build on amd64 (shared libraries must be compiled with -fPIC)"
+.ifndef (WITH_OPAL)
+LIB_DEPENDS=	h323_r.1:${PORTSDIR}/net/openh323
+OBJ_DIR=	obj_r
+.else
+LIB_DEPENDS=	opal_r.2:${PORTSDIR}/net/opal
+PKGNAMESUFFIX=	-opal
+MAKE_ENV+=	USE_OPAL=1
+OBJ_DIR=	obj_opal_r
  .endif

  do-install:
- -	${INSTALL_PROGRAM} ${WRKSRC}/obj_${OPSYS}_${THE_MACHTYPE}_d/callgen323 ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/${OBJ_DIR}/callgen323 ${PREFIX}/bin

  .include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/net/callgen/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
- --- distinfo	1 Feb 2006 22:46:08 -0000	1.3
+++ distinfo	7 May 2006 15:56:50 -0000
@@ -1,3 +1,3 @@
- -MD5 (callgen323_1.2.6.tar.gz) = 1428f738e3ad43e5c57aa99e132065dc
- -SHA256 (callgen323_1.2.6.tar.gz) = aefb35f13f9f4920c687f22e0b3bdcc8e9c1d21ddd7bdf9102f8d07a8c5d0581
- -SIZE (callgen323_1.2.6.tar.gz) = 12846
+MD5 (callgen323-2.0.0.cvs.20060407.tar.gz) = 01c8cdc59b1537709375ad4b1c66b34e
+SHA256 (callgen323-2.0.0.cvs.20060407.tar.gz) = b59cfa3456f55b135502f611c82eab6a2f8e4281b1fdc13e11cf0953d20e0065
+SIZE (callgen323-2.0.0.cvs.20060407.tar.gz) = 17433
- --- net_callgen323.diff2 ends here ---

- -- 
The beginning is the most important part of the work.
 				-Plato
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (FreeBSD)

iD8DBQFEXhsSSPOsGF+KA+MRAmc9AJ4nUXZjfMgOjLExkB5UiC9iEZl1XACeNEh1
NG3Cjp9pUNWUWvC7q3uCvC8=
=DDw5
-----END PGP SIGNATURE-----
-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/callgen/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile

--- Makefile	5 Feb 2006 12:35:08 -0000	1.5
+++ Makefile	7 May 2006 15:56:50 -0000
@@ -4,38 +4,43 @@
 #
 # $FreeBSD: ports/net/callgen/Makefile,v 1.5 2006/02/05 12:35:08 netchild Exp $
 
-PORTNAME=	callgen
-PORTVERSION=	1.2.6
-PORTREVISION=	1
+PORTNAME=	callgen323
+DISTVERSION=	2.0.0.cvs.20060407
 CATEGORIES=	net
-MASTER_SITES=	http://www.openh323.org/bin/
-DISTNAME=	callgen323_${PORTVERSION}
+MASTER_SITES=	ftp://ftp.frm2.tum.de/jpulz/FreeBSD/distfiles/
+PKGNAMESUFFIX?=	-openh323
 
-MAINTAINER=	jacke at bofh.pl
+MAINTAINER=	Joerg.Pulz at frm2.tum.de
 COMMENT=	H.323 Call Generator
 
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/net/openh323-112:configure
-
-NOCLEANDEPENDS=	yes
 USE_GMAKE=	yes
-WRKSRC=		${WRKDIR}/callgen323
-MAKE_ENV=	PWLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../../devel/pwlib152/work/pwlib \
-		OPENH323DIR=${WRKDIRPREFIX}${.CURDIR}/../openh323-112/work/openh323
-THE_MACHTYPE=	${ARCH:S/i386/x86/}
+ALL_TARGET=	optshared
+MAKE_ENV=	PWLIBDIR=${LOCALBASE}/share/pwlib \
+		OPENH323DIR=${LOCALBASE}/share/openh323 \
+		OPALDIR=${LOCALBASE}/share/opal \
+		SYSLIBDIR=${LOCALBASE}/lib
+MAKE_ARGS=	OSTYPE=${OPSYS} MACHTYPE=${ARCH:S/i386/x86/} \
+		OSRELEASE=${OSVERSION} CPLUS=${CXX}
 
 PLIST_FILES=	bin/callgen323
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 502126
-BROKEN=		"Does not compile on FreeBSD >= 5.x"
+.if ${ARCH} == sparc64 && ${OSVERSION} <= 700003
+BROKEN= does not link due to missing symbol in default thread library
 .endif
 
-.if ${ARCH} == "amd64"
-BROKEN=		"Does not build on amd64 (shared libraries must be compiled with -fPIC)"
+.ifndef (WITH_OPAL)
+LIB_DEPENDS=	h323_r.1:${PORTSDIR}/net/openh323
+OBJ_DIR=	obj_r
+.else
+LIB_DEPENDS=	opal_r.2:${PORTSDIR}/net/opal
+PKGNAMESUFFIX=	-opal
+MAKE_ENV+=	USE_OPAL=1
+OBJ_DIR=	obj_opal_r
 .endif
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/obj_${OPSYS}_${THE_MACHTYPE}_d/callgen323 ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/${OBJ_DIR}/callgen323 ${PREFIX}/bin
 
 .include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/net/callgen/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo	1 Feb 2006 22:46:08 -0000	1.3
+++ distinfo	7 May 2006 15:56:50 -0000
@@ -1,3 +1,3 @@
-MD5 (callgen323_1.2.6.tar.gz) = 1428f738e3ad43e5c57aa99e132065dc
-SHA256 (callgen323_1.2.6.tar.gz) = aefb35f13f9f4920c687f22e0b3bdcc8e9c1d21ddd7bdf9102f8d07a8c5d0581
-SIZE (callgen323_1.2.6.tar.gz) = 12846
+MD5 (callgen323-2.0.0.cvs.20060407.tar.gz) = 01c8cdc59b1537709375ad4b1c66b34e
+SHA256 (callgen323-2.0.0.cvs.20060407.tar.gz) = b59cfa3456f55b135502f611c82eab6a2f8e4281b1fdc13e11cf0953d20e0065
+SIZE (callgen323-2.0.0.cvs.20060407.tar.gz) = 17433
