Date: Mon, 08 May 2006 15:58:28 -0400 From: Diane Bruce <db@db.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/96996: [PATCH] comms/thebridge: update to 0.81 Message-ID: <E1FdBsC-000AER-P2@heceta.db.net> Resent-Message-ID: <200605082000.k48K0UFS034209@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 96996
>Category: ports
>Synopsis: [PATCH] comms/thebridge: update to 0.81
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Mon May 08 20:00:30 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Diane Bruce
>Release: FreeBSD 4.11-RELEASE-p9 i386
>Organization:
>Environment:
System: FreeBSD heceta.db.net 4.11-RELEASE-p9 FreeBSD 4.11-RELEASE-p9 #4: Tue May 17 16:07:52 EDT 2005
>Description:
- Update to 0.81
Added file(s):
- files/patch-src_Makefile.in
Removed file(s):
- files/patch-FreeBSD-tbd.sh
- files/patch-src-Makefile.in
Port maintainer (db@db.net) is cc'd.
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:
--- thebridge-0.81.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/comms/thebridge/Makefile /usr/home/db/thebridge/Makefile
--- /usr/ports/comms/thebridge/Makefile Wed Feb 15 22:28:54 2006
+++ /usr/home/db/thebridge/Makefile Mon May 8 15:56:22 2006
@@ -2,11 +2,11 @@
# Date created: 22 June 2004
# Whom: db
#
-# $FreeBSD: ports/comms/thebridge/Makefile,v 1.2 2006/01/21 17:37:05 krion Exp $
+# $FreeBSD: ports/comms/thebridge/Makefile,v 1.3 2006/05/03 23:38:38 edwin Exp $
#
PORTNAME= thebridge
-PORTVERSION= 0.72
+PORTVERSION= 0.81
CATEGORIES= comms hamradio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= cqinet
@@ -16,13 +16,8 @@
COMMENT= Amateur Radio Echolink conference bridge
GNU_CONFIGURE= yes
-USE_REINPLACE= yes
PORTDOCS= README
-
-post-patch:
- @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/FreeBSD/tbd.sh
- @${MV} ${WRKSRC}/tbd.conf ${WRKSRC}/tbd.conf.sample
post-install:
.if !defined(NOPORTDOCS)
diff -ruN --exclude=CVS /usr/ports/comms/thebridge/distinfo /usr/home/db/thebridge/distinfo
--- /usr/ports/comms/thebridge/distinfo Wed Feb 15 22:28:54 2006
+++ /usr/home/db/thebridge/distinfo Mon May 8 15:18:13 2006
@@ -1,3 +1,3 @@
-MD5 (thebridge-0.72.tgz) = 29b934c6f28c72de1e8fc24027cf2f3a
-SHA256 (thebridge-0.72.tgz) = ae645c103bf84b2dbf041acec3bf73f076b823f497d851bf3391adfd867f4bd3
-SIZE (thebridge-0.72.tgz) = 286396
+MD5 (thebridge-0.81.tgz) = 3b531a67a3b39f80542b477db1deaf07
+SHA256 (thebridge-0.81.tgz) = 8cd855ce03ec864f7ffed539ef7cb4f37f380e346cff360562c3ac8278cfdb68
+SIZE (thebridge-0.81.tgz) = 343532
diff -ruN --exclude=CVS /usr/ports/comms/thebridge/files/patch-FreeBSD-tbd.sh /usr/home/db/thebridge/files/patch-FreeBSD-tbd.sh
--- /usr/ports/comms/thebridge/files/patch-FreeBSD-tbd.sh Sun Jun 27 09:56:54 2004
+++ /usr/home/db/thebridge/files/patch-FreeBSD-tbd.sh Wed Dec 31 19:00:00 1969
@@ -1,11 +0,0 @@
---- FreeBSD/tbd.sh.orig Wed Jun 23 16:02:28 2004
-+++ FreeBSD/tbd.sh Wed Jun 23 16:02:59 2004
-@@ -2,7 +2,7 @@
- # $Id: tbd.sh,v 1.1.1.1 2002/08/10 20:33:40 wb6ymh Exp $
-
- pidfiledir=/var/run
--tbd=/usr/local/libexec/tbd
-+tbd=%%PREFIX%%/libexec/tbd
-
- # start
- if [ "x$1" = "x" -o "x$1" = "xstart" ]; then
diff -ruN --exclude=CVS /usr/ports/comms/thebridge/files/patch-Makefile.in /usr/home/db/thebridge/files/patch-Makefile.in
--- /usr/ports/comms/thebridge/files/patch-Makefile.in Sun Jun 27 09:56:54 2004
+++ /usr/home/db/thebridge/files/patch-Makefile.in Mon May 8 15:48:04 2006
@@ -1,16 +1,11 @@
---- Makefile.in.orig Tue Sep 9 17:06:55 2003
-+++ Makefile.in Wed Jun 23 17:50:24 2004
-@@ -85,10 +85,10 @@
- RANLIB = @RANLIB@
- VERSION = @VERSION@
-
+--- Makefile.in.orig Mon May 8 15:47:37 2006
++++ Makefile.in Mon May 8 15:47:49 2006
+@@ -138,7 +138,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+
-SUBDIRS = common zlib src inc tbdcmd
--EXTRA_DIST = theBridge.dsp tbd.conf README.txt FreeBSD RedHat config SCRIPTING.txt
+SUBDIRS = common src inc tbdcmd
-+EXTRA_DIST = theBridge.dsp tbd.conf.sample README.txt FreeBSD RedHat config SCRIPTING.txt
-
--sysconf_DATA = tbd.conf
-+sysconf_DATA = tbd.conf.sample
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
- CONFIG_HEADER = config.h
+ EXTRA_DIST = theBridge.dsp tbd.conf.sample README.txt FreeBSD RedHat config SCRIPTING.txt
+
+ sysconf_DATA = tbd.conf.sample
diff -ruN --exclude=CVS /usr/ports/comms/thebridge/files/patch-configure /usr/home/db/thebridge/files/patch-configure
--- /usr/ports/comms/thebridge/files/patch-configure Sun Jun 27 09:56:54 2004
+++ /usr/home/db/thebridge/files/patch-configure Mon May 8 15:47:27 2006
@@ -1,20 +1,19 @@
---- configure.orig Thu Jun 24 14:32:44 2004
-+++ configure Thu Jun 24 14:33:09 2004
-@@ -1961,7 +1961,7 @@
- ac_given_srcdir=$srcdir
- ac_given_INSTALL="$INSTALL"
-
--trap 'rm -fr `echo "Makefile src/Makefile common/Makefile inc/Makefile tbdcmd/Makefile zlib/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-+trap 'rm -fr `echo "Makefile src/Makefile common/Makefile inc/Makefile tbdcmd/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
- EOF
- cat >> $CONFIG_STATUS <<EOF
-
-@@ -2054,7 +2054,7 @@
-
- cat >> $CONFIG_STATUS <<EOF
-
--CONFIG_FILES=\${CONFIG_FILES-"Makefile src/Makefile common/Makefile inc/Makefile tbdcmd/Makefile zlib/Makefile"}
-+CONFIG_FILES=\${CONFIG_FILES-"Makefile src/Makefile common/Makefile inc/Makefile tbdcmd/Makefile "}
- EOF
- cat >> $CONFIG_STATUS <<\EOF
- for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
+--- configure.orig Mon May 8 15:46:41 2006
++++ configure Mon May 8 15:47:02 2006
+@@ -4352,7 +4352,7 @@
+ _ACEOF
+
+
+- ac_config_files="$ac_config_files Makefile src/Makefile common/Makefile inc/Makefile tbdcmd/Makefile zlib/Makefile"
++ ac_config_files="$ac_config_files Makefile src/Makefile common/Makefile inc/Makefile tbdcmd/Makefile"
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+ # tests run on this system so they can be shared between configure
+@@ -4906,7 +4906,6 @@
+ "common/Makefile" ) CONFIG_FILES="$CONFIG_FILES common/Makefile" ;;
+ "inc/Makefile" ) CONFIG_FILES="$CONFIG_FILES inc/Makefile" ;;
+ "tbdcmd/Makefile" ) CONFIG_FILES="$CONFIG_FILES tbdcmd/Makefile" ;;
+- "zlib/Makefile" ) CONFIG_FILES="$CONFIG_FILES zlib/Makefile" ;;
+ "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+ "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+ *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
diff -ruN --exclude=CVS /usr/ports/comms/thebridge/files/patch-src-Makefile.in /usr/home/db/thebridge/files/patch-src-Makefile.in
--- /usr/ports/comms/thebridge/files/patch-src-Makefile.in Sun Jun 27 09:56:54 2004
+++ /usr/home/db/thebridge/files/patch-src-Makefile.in Wed Dec 31 19:00:00 1969
@@ -1,21 +0,0 @@
---- src/Makefile.in.orig Tue Sep 9 23:06:56 2003
-+++ src/Makefile.in Sun Jun 27 15:46:18 2004
-@@ -86,7 +86,7 @@
- tbd_SOURCES = conference.c conference.h configvars.c configvars.h dirclient.c dirclient.h thebridge.c users.c users.h hostfile.c hostfile.h eventhook.c eventhook.h
-
-
--tbd_LDADD = $(top_builddir)/common/libcommon.a $(top_builddir)/zlib/libzlib.a
-+tbd_LDADD = $(top_builddir)/common/libcommon.a -lz
-
- AM_CPPFLAGS = -I$(top_srcdir)/inc
- AM_CFLAGS = -Wall -DSYSCON_DIR=\"$(sysconfdir)\"
-@@ -102,8 +102,7 @@
- LIBS = @LIBS@
- tbd_OBJECTS = conference.o configvars.o dirclient.o thebridge.o users.o \
- hostfile.o eventhook.o
--tbd_DEPENDENCIES = $(top_builddir)/common/libcommon.a \
--$(top_builddir)/zlib/libzlib.a
-+tbd_DEPENDENCIES = $(top_builddir)/common/libcommon.a
- tbd_LDFLAGS =
- CFLAGS = @CFLAGS@
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff -ruN --exclude=CVS /usr/ports/comms/thebridge/files/patch-src_Makefile.in /usr/home/db/thebridge/files/patch-src_Makefile.in
--- /usr/ports/comms/thebridge/files/patch-src_Makefile.in Wed Dec 31 19:00:00 1969
+++ /usr/home/db/thebridge/files/patch-src_Makefile.in Mon May 8 15:53:57 2006
@@ -0,0 +1,27 @@
+--- src/Makefile.in.orig Sat Jan 8 19:01:27 2005
++++ src/Makefile.in Mon May 8 15:53:09 2006
+@@ -145,11 +145,11 @@
+ eventhook.c eventhook.h avrs.c avrs.h
+
+
+-tbd_LDADD = $(top_builddir)/common/libcommon.a $(top_builddir)/zlib/libzlib.a \
+- -lm
++tbd_LDADD = $(top_builddir)/common/libcommon.a \
++ -lz -lm
+
+
+-AM_CPPFLAGS = -I$(top_srcdir)/inc -I$(top_srcdir)/zlib
++AM_CPPFLAGS = -I$(top_srcdir)/inc -Izlib
+ AM_CFLAGS = -Wall -DSYSCON_DIR=\"$(sysconfdir)\"
+ subdir = src
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+@@ -163,8 +163,7 @@
+ dirclient.$(OBJEXT) thebridge.$(OBJEXT) users.$(OBJEXT) \
+ hostfile.$(OBJEXT) eventhook.$(OBJEXT) avrs.$(OBJEXT)
+ tbd_OBJECTS = $(am_tbd_OBJECTS)
+-tbd_DEPENDENCIES = $(top_builddir)/common/libcommon.a \
+- $(top_builddir)/zlib/libzlib.a
++tbd_DEPENDENCIES = $(top_builddir)/common/libcommon.a
+ tbd_LDFLAGS =
+
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
--- thebridge-0.81.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1FdBsC-000AER-P2>