Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 7 Apr 2001 13:40:41 +0100 (BST)
From:      Orion Hodson <oh@btinternet.com>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/26401: ports/mbone/rat update
Message-ID:  <200104071240.f37Cef808990@adelie.btinternet.com>

next in thread | raw e-mail | index | archive | help

>Number:         26401
>Category:       ports
>Synopsis:       ports/mbone/rat update
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Apr 07 05:50:00 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator:     Orion Hodson
>Release:        FreeBSD 4.3-BETA i386
>Organization:
>Environment:

	

>Description:

Update to latest RAT release and lower port maintenance.

All existing patches in ports/mbone/rat/files/ are now defunct and
need removing from CVS.  The patches were of two types: minor code
tweaks and RAT version number removal from binary names.  Code related
patches are now incorporated into rat's codebase and version number
munging has been fixed by using PLIST_SUB and by including a shell
script that run's the right RAT version.  It's much cleaner now.

Have tested with portlint, doing install, and package building.

>How-To-Repeat:

	

>Fix:

Remove the patches in port/mbone/rat/files and apply the patch below.

Thanks!
- Orion

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/mbone/rat/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- Makefile	2001/04/06 02:26:09	1.15
+++ Makefile	2001/04/07 12:34:06
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	rat
-PORTVERSION=	4.2.13
-PORTREVISION=	0
+PORTVERSION=	4.2.14
 CATEGORIES=	mbone audio ipv6
-MASTER_SITES=	http://www-mice.cs.ucl.ac.uk/multimedia/software/rat/4.2.13/ \
+MASTER_SITES=	http://www-mice.cs.ucl.ac.uk/multimedia/software/rat/${PORTVERSION}/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	cpiazza
 
@@ -17,26 +16,33 @@
 
 LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
 
-USE_AUTOCONF=	yes
 USE_GMAKE=	yes
 MAN1=		rat.1
 MANCOMPRESSED=	no
 
 RAT_BUILD_DIRS=	common rat
+EXENAME=	${PORTNAME}-${PORTVERSION}
 
+# pkg substitution needs version
+PLIST_SUB=	EXENAME=${EXENAME}
+
 .include <bsd.port.pre.mk>
 
+# Can build with different tcl/tk versions.  Match with LIB_DEPENDS.
+TCLTK_VERSION=  8.2
+
 .if ${OSVERSION} >= 400014
 ENABLE_IPv6=	--enable-ipv6
 .endif
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/rat/rat ${PREFIX}/bin/rat
-	${INSTALL_PROGRAM} ${WRKSRC}/rat/rat-ui ${PREFIX}/bin/rat-ui
-	${INSTALL_PROGRAM} ${WRKSRC}/rat/rat-media ${PREFIX}/bin/rat-media
-	${INSTALL_MAN}  ${WRKSRC}/rat/man/man1/rat.1 ${PREFIX}/man/man1
+	${INSTALL_SCRIPT}  ${WRKSRC}/rat/rat               ${PREFIX}/bin/rat
+	${INSTALL_PROGRAM} ${WRKSRC}/rat/${EXENAME}       ${PREFIX}/bin/${EXENAME}
+	${INSTALL_PROGRAM} ${WRKSRC}/rat/${EXENAME}-media ${PREFIX}/bin/${EXENAME}-media
+	${INSTALL_PROGRAM} ${WRKSRC}/rat/${EXENAME}-ui    ${PREFIX}/bin/${EXENAME}-ui
+	${INSTALL_MAN}     ${WRKSRC}/rat/man/man1/rat.1    ${PREFIX}/man/man1
 	${MKDIR} ${LOCALBASE}/etc/sdr/plugins
-	${INSTALL_DATA} ${WRKSRC}/rat/sdr2.plugin.S02.audio.rtp.*.rat ${LOCALBASE}/etc/sdr/plugins
+	${INSTALL_DATA} ${WRKSRC}/rat/sdr2.plugin.S02.audio.rtp.*.${EXENAME} ${LOCALBASE}/etc/sdr/plugins
 
 do-build:
 .for d in ${RAT_BUILD_DIRS}
@@ -44,7 +50,7 @@
 .endfor
 
 do-configure:
-	cd ${WRKSRC}/common && autoconf && ./configure ${CONFIGURE_ARGS} ${ENABLE_IPv6}
-	cd ${WRKSRC}/rat && autoconf && ./configure ${CONFIGURE_ARGS} --with-tcl=${LOCALBASE} --with-tk=${LOCALBASE} ${ENABLE_IPv6}
+	cd ${WRKSRC}/common && ./configure ${CONFIGURE_ARGS} ${ENABLE_IPv6}
+	cd ${WRKSRC}/rat && ./configure ${CONFIGURE_ARGS} --with-tcltk-version=${TCLTK_VERSION} --with-tcl=${LOCALBASE} --with-tk=${LOCALBASE} ${ENABLE_IPv6}
 
 .include "bsd.port.post.mk"
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/mbone/rat/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo	2001/04/02 07:05:32	1.3
+++ distinfo	2001/04/07 12:34:06
@@ -1 +1 @@
-MD5 (rat-4.2.13.tar.gz) = 6524f9805772e60072de8769aea1945f
+MD5 (rat-4.2.14.tar.gz) = 22bc2287c55d946b325cd17ff700e86f
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/mbone/rat/pkg-plist,v
retrieving revision 1.4
diff -u -r1.4 pkg-plist
--- pkg-plist	2000/09/18 16:06:05	1.4
+++ pkg-plist	2001/04/07 12:34:06
@@ -1,6 +1,7 @@
+bin/%%EXENAME%%
+bin/%%EXENAME%%-ui
+bin/%%EXENAME%%-media
 bin/rat
-bin/rat-ui
-bin/rat-media
-etc/sdr/plugins/sdr2.plugin.S02.audio.rtp.-.rat
+etc/sdr/plugins/sdr2.plugin.S02.audio.rtp.-.%%EXENAME%%
 @dirrm etc/sdr/plugins
 @dirrm etc/sdr
>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200104071240.f37Cef808990>