- Update to release 0.96 [1]

- Put addons into DATADIR for now
- Pet portlint

PR:		ports/121932 [1]
Submitted by:	Takefu <takefu@airport.fm>

6 files changed, 44 insertions, 38 deletions

diff --git a/comms/thebridge/Makefile b/comms/thebridge/Makefile
index 30e88708c95c..e768ce44671f 100644
--- a/comms/thebridge/Makefile
+++ b/comms/thebridge/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	thebridge
-PORTVERSION=	0.89
+PORTVERSION=	0.96
 CATEGORIES=	comms hamradio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	cqinet
@@ -25,5 +25,8 @@ post-install:
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
+	${MKDIR} ${DATADIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/addons/usermgmt.cgi ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/addons/README ${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/comms/thebridge/distinfo b/comms/thebridge/distinfo
index c1d79388398f..e0eff41e00f2 100644
--- a/comms/thebridge/distinfo
+++ b/comms/thebridge/distinfo
@@ -1,3 +1,3 @@
-MD5 (thebridge-0.89.tgz) = 718616900eda6de62018c19b5f2b67c8
-SHA256 (thebridge-0.89.tgz) = 5e8fbe8b04bae437295c74c3069db459980dbf2570a2839588dc2d38947c033b
-SIZE (thebridge-0.89.tgz) = 383412
+MD5 (thebridge-0.96.tgz) = 21f8754c61bbcc1d0ccaab20f05ca6b9
+SHA256 (thebridge-0.96.tgz) = 0e4d7dba7c049b6cbd3184cd6f802d6c9165f7197700eed9f6b9fe8d645d7f33
+SIZE (thebridge-0.96.tgz) = 400359
diff --git a/comms/thebridge/files/patch-Makefile.in b/comms/thebridge/files/patch-Makefile.in
index b6bd69bedc7a..14ebf6a8f1b1 100644
--- a/comms/thebridge/files/patch-Makefile.in
+++ b/comms/thebridge/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Mon Jul  2 22:45:44 2007
-+++ Makefile.in	Sat Jul 21 00:33:00 2007
-@@ -192,7 +192,7 @@
+--- Makefile.in.orig	2008-03-06 23:42:41.000000000 +0900
++++ Makefile.in	2008-03-21 11:53:08.000000000 +0900
+@@ -201,7 +201,7 @@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
--SUBDIRS = common zlib src inc tbdcmd
-+SUBDIRS = common src inc tbdcmd
+-SUBDIRS = common zlib src inc tbdcmd addons
++SUBDIRS = common src inc tbdcmd addons
  EXTRA_DIST = theBridge.dsp tbd.conf.sample README.txt FreeBSD RedHat SCRIPTING.txt
  sysconf_DATA = tbd.conf.sample
  all: config.h
diff --git a/comms/thebridge/files/patch-configure b/comms/thebridge/files/patch-configure
index 6631e505aedb..1e893e365185 100644
--- a/comms/thebridge/files/patch-configure
+++ b/comms/thebridge/files/patch-configure
@@ -1,19 +1,19 @@
---- configure.orig	Mon Jul  2 22:44:49 2007
-+++ configure	Sat Jul 21 00:33:56 2007
-@@ -4668,7 +4668,7 @@
+--- configure.orig	2008-03-06 23:42:42.000000000 +0900
++++ configure	2008-03-21 11:54:15.000000000 +0900
+@@ -4886,7 +4886,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"
+-                                                                      ac_config_files="$ac_config_files Makefile src/Makefile common/Makefile inc/Makefile tbdcmd/Makefile zlib/Makefile addons/Makefile"
++                                                                      ac_config_files="$ac_config_files Makefile src/Makefile common/Makefile inc/Makefile tbdcmd/Makefile addons/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
-@@ -5230,7 +5230,6 @@
+@@ -5469,7 +5469,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" ;;
+   "addons/Makefile" ) CONFIG_FILES="$CONFIG_FILES addons/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 --git a/comms/thebridge/files/patch-src_Makefile.in b/comms/thebridge/files/patch-src_Makefile.in
index 919e9508b248..afec861ff502 100644
--- a/comms/thebridge/files/patch-src_Makefile.in
+++ b/comms/thebridge/files/patch-src_Makefile.in
@@ -1,35 +1,35 @@
---- src/Makefile.in.orig	2008-02-10 02:05:09.000000000 +0900
-+++ src/Makefile.in	2008-02-11 16:26:34.000000000 +0900
-@@ -109,7 +109,7 @@
- @LINK_BOX_FALSE@	avrs.$(OBJEXT)
+--- src/Makefile.in.orig	2008-03-06 09:42:41.000000000 -0500
++++ src/Makefile.in	2008-03-21 16:04:16.000000000 -0400
+@@ -114,7 +114,7 @@
  tbd_OBJECTS = $(am_tbd_OBJECTS)
+ am__DEPENDENCIES_1 =
  @LINK_BOX_FALSE@tbd_DEPENDENCIES = $(top_builddir)/common/libcommon.a \
--@LINK_BOX_FALSE@	$(top_builddir)/zlib/libzlib.a
-+@LINK_BOX_FALSE@	-lz -lm
+-@LINK_BOX_FALSE@	$(top_builddir)/zlib/libzlib.a \
++@LINK_BOX_FALSE@	-lz -lm \
+ @LINK_BOX_FALSE@	$(am__DEPENDENCIES_1)
  DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/config/depcomp
- am__depfiles_maybe = depfiles
-@@ -214,12 +214,12 @@
- @LINK_BOX_TRUE@		  dirclient.c dirclient.h thebridge.c users.c users.h \
- @LINK_BOX_TRUE@		  hostfile.c hostfile.h eventhook.c eventhook.h avrs.c avrs.h 
+@@ -223,12 +223,12 @@
+ @LINK_BOX_TRUE@		   dirclient.c dirclient.h thebridge.c users.c users.h \
+ @LINK_BOX_TRUE@		   hostfile.c hostfile.h eventhook.c eventhook.h avrs.c avrs.h 
  
 -@LINK_BOX_FALSE@AM_CPPFLAGS = -I$(top_srcdir)/inc -I$(top_srcdir)/zlib -I$(top_srcdir)/spandsp \
-+@LINK_BOX_FALSE@AM_CPPFLAGS = -I$(top_srcdir)/inc -Izlib -I$(top_srcdir)/spandsp \
- @LINK_BOX_FALSE@                -DSYSCON_DIR=\"$(sysconfdir)\"
++@LINK_BOX_FALSE@AM_CPPFLAGS = -I$(top_srcdir)/inc -I$(top_srcdir)/spandsp \
+ @LINK_BOX_FALSE@	      -DSYSCON_DIR=\"$(sysconfdir)\"
  
  @LINK_BOX_TRUE@AM_CPPFLAGS = -I$(top_srcdir)/inc \
  @LINK_BOX_TRUE@	-I$(top_srcdir)/gsm/inc -DLINK_BOX \
 -@LINK_BOX_TRUE@	-I$(top_srcdir)/zlib -I$(top_srcdir)/linkbox \
-+@LINK_BOX_TRUE@	-Izlib -I$(top_srcdir)/linkbox \
++@LINK_BOX_TRUE@	-I$(top_srcdir)/linkbox \
  @LINK_BOX_TRUE@	-DSYSCON_DIR=\"$(sysconfdir)\" $(am__append_1)
- @LINK_BOX_FALSE@AM_CFLAGS = -Wall  -lm
- @LINK_BOX_TRUE@AM_CFLAGS = -Wall 
-@@ -227,7 +227,7 @@
- @LINK_BOX_FALSE@        dirclient.h thebridge.c users.c users.h hostfile.c hostfile.h \
- @LINK_BOX_FALSE@        eventhook.c eventhook.h avrs.c avrs.h
+ @LINK_BOX_FALSE@AM_CFLAGS = -Wall -lm $(am__append_2)
+ @LINK_BOX_TRUE@AM_CFLAGS = -Wall $(am__append_2)
+@@ -236,7 +236,7 @@
+ @LINK_BOX_FALSE@	dirclient.h thebridge.c users.c users.h hostfile.c hostfile.h \
+ @LINK_BOX_FALSE@	eventhook.c eventhook.h avrs.c avrs.h
  
--@LINK_BOX_FALSE@tbd_LDADD = $(top_builddir)/common/libcommon.a $(top_builddir)/zlib/libzlib.a
-+@LINK_BOX_FALSE@tbd_LDADD = $(top_builddir)/common/libcommon.a -lz
- all: all-am
+-@LINK_BOX_FALSE@tbd_LDADD = $(top_builddir)/common/libcommon.a $(top_builddir)/zlib/libzlib.a \
++@LINK_BOX_FALSE@tbd_LDADD = $(top_builddir)/common/libcommon.a -lz \
+ @LINK_BOX_FALSE@	    $(LIBDMALLOC)
  
- .SUFFIXES:
+ all: all-am
diff --git a/comms/thebridge/pkg-plist b/comms/thebridge/pkg-plist
index 8b9ccddfb0af..58f6f6af4ee2 100644
--- a/comms/thebridge/pkg-plist
+++ b/comms/thebridge/pkg-plist
@@ -2,3 +2,6 @@ bin/tbdcmd
 bin/tbdchat
 etc/tbd.conf.sample
 libexec/tbd
+%%DATADIR%%/README
+%%DATADIR%%/usermgmt.cgi
+@dirrm %%DATADIR%%