8 files changed, 21 insertions, 75 deletions

diff --git a/comms/atslog/Makefile b/comms/atslog/Makefile
index 65b8dd82c39f..37e11646a4d3 100644
--- a/comms/atslog/Makefile
+++ b/comms/atslog/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	atslog
-PORTVERSION=	2.0.0
-PORTREVISION=	1
+PORTVERSION=	2.1.0
 CATEGORIES=	comms
 MASTER_SITES=	BERLIOS
 
@@ -20,7 +19,7 @@ OPTIONS=	LIBWRAP		"Enable TCP wrapper support"			on \
 		WWW		"Install web interface"				on \
 		WWWGD		"Graphic reports"				on
 
-HAS_CONFIGURE=	yes
+GNU_CONFIGURE=	yes
 USE_PERL5=	yes
 USE_RC_SUBR=	${PORTNAME}d
 PORTDOCS=	CHANGES ChangeLog DEINSTALL INSTALL LICENSE TODO UPDATING USAGE
@@ -28,7 +27,7 @@ SUB_FILES=	pkg-message
 MANLANG=	"" ru.KOI8-R
 MAN8=		${USE_RC_SUBR}.8 ${PORTNAME}master.8
 CONFIGS=	${PORTNAME}.conf.default ${PORTNAME}.conf.default.rus
-CONFIGURE_ARGS+=--prefix=${PREFIX} --localstatedir=/var
+CONFIGURE_ARGS+=--localstatedir=/var
 
 .include <bsd.port.pre.mk>
 
@@ -66,11 +65,11 @@ BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg
 .endif
 
-post-patch:
 .if defined(WITHOUT_LIBWRAP)
-	@${REINPLACE_CMD} -e 's|LIBWRAP=|#LIBWRAP=|' ${WRKSRC}/${USE_RC_SUBR}/Makefile
-	@${REINPLACE_CMD} -e 's|#define|//#define|' ${WRKSRC}/${USE_RC_SUBR}/${USE_RC_SUBR}.h
+CONFIGURE_ARGS+=--disable-libwrap
 .endif
+
+post-patch:
 	@${REINPLACE_CMD} -e 's|createsqltables.|${DATADIR}/sql/createsqltables.|g' \
 	    -e 's|data.sql|${DATADIR}/sql/data.sql|' ${WRKSRC}/data/sql/install-sql.pl
 
@@ -110,8 +109,9 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/data/sql/install-sql.pl ${DATADIR}/sql
 	${MKDIR} ${PREFIX}/libexec/${PORTNAME}
 	cd ${WRKSRC}/libexec && \
-	${FIND} . -type f -exec \
+	${FIND} . -type f ! -iregex ".*\.sh" -exec \
 		${INSTALL_DATA} "{}" "${PREFIX}/libexec/${PORTNAME}/{}" \;
+	${INSTALL_SCRIPT} ${WRKSRC}/libexec/genindex.sh ${PREFIX}/libexec/${PORTNAME}/
 .if !defined(WITHOUT_WWW)
 	${MKDIR} ${PREFIX}/www/${PORTNAME}
 	cd ${WRKSRC}/www && \
diff --git a/comms/atslog/distinfo b/comms/atslog/distinfo
index b7207a7463aa..54e37929bd2e 100644
--- a/comms/atslog/distinfo
+++ b/comms/atslog/distinfo
@@ -1,3 +1,3 @@
-MD5 (atslog-2.0.0.tar.gz) = 441c1fef1fae4a4a56a7de1f2841df94
-SHA256 (atslog-2.0.0.tar.gz) = 33dea90446f9dec22c9aaa6b2e59e21868574300cbf317a16b50ab265d75ce18
-SIZE (atslog-2.0.0.tar.gz) = 596792
+MD5 (atslog-2.1.0.tar.gz) = 42fc0fe0f7128f68067ed4a5f5420ab6
+SHA256 (atslog-2.1.0.tar.gz) = 6161ca706a0d5983b4fe557c9b28690f011d8f0506af4693921bc05dacf1dfd7
+SIZE (atslog-2.1.0.tar.gz) = 589123
diff --git a/comms/atslog/files/atslogd.in b/comms/atslog/files/atslogd.in
index e3341d6eeffc..fa17f8ec3981 100644
--- a/comms/atslog/files/atslogd.in
+++ b/comms/atslog/files/atslogd.in
@@ -27,6 +27,8 @@ extra_commands="reload writedb rotate alltodb cleardb"
 start_cmd="atslogd_command start"
 stop_cmd="atslogd_command stop"
 reload_cmd="atslogd_command reload"
+restart_cmd="atslogd_command restart"
+status_cmd="atslogd_command status"
 writedb_cmd="atslogd_command writedb"
 rotate_cmd="atslogd_command rotate"
 alltodb_cmd="atslogd_command alltodb"
diff --git a/comms/atslog/files/patch-configure b/comms/atslog/files/patch-configure
deleted file mode 100644
index d2f02605b6bc..000000000000
--- a/comms/atslog/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Thu Jan 11 18:05:57 2007
-+++ configure	Tue Jan 16 15:13:59 2007
-@@ -2514,7 +2514,7 @@
- fi
- 
- # Check if version of Perl is sufficient
--ac_perl_version="5.0.0"
-+ac_perl_version="5"
- 
- if test "x$PERL" != "x"; then
-   echo "$as_me:$LINENO: checking for perl version greater than or equal to $ac_perl_version" >&5
diff --git a/comms/atslog/files/patch-diagram_bars.php b/comms/atslog/files/patch-diagram_bars.php
deleted file mode 100644
index 9abf2b21ee77..000000000000
--- a/comms/atslog/files/patch-diagram_bars.php
+++ /dev/null
@@ -1,26 +0,0 @@
---- www/diagram/diagram_bars_dur.php.orig	Thu Jan 11 05:43:48 2007
-+++ www/diagram/diagram_bars_dur.php		Thu Jan 11 20:22:30 2007
-@@ -107,23 +107,7 @@
- 	$prevDay=$mkday;
- 	$prevDOfMonth=$DayOfMonth;
-     }
--    $Columns = sizeof($allDays);
--    if($Columns > 30){
--	$delta = ceil($Columns/30);
- 
--	$giveDelta=0;
--	while (list($key, $val) = each($allDays)) {
--	    if($giveDelta == $key){
--		$giveDelta+=$delta;
--	    }else{
--	        $allDays[$key][0]='';
--	    }
--	    if($val[1] > $maxValue){
--		$maxValue=$val[1];
--	    }
--	}
--    }
--    
- //if($debug) print_r($allDays);
- //if($debug) print("I".$maxValue."I");
- 
diff --git a/comms/atslog/files/patch-diagram_bars_dur.php b/comms/atslog/files/patch-diagram_bars_dur.php
deleted file mode 100644
index 44574fbadf82..000000000000
--- a/comms/atslog/files/patch-diagram_bars_dur.php
+++ /dev/null
@@ -1,26 +0,0 @@
---- www/diagram/diagram_bars.php.orig	Thu Jan 11 05:43:48 2007
-+++ www/diagram/diagram_bars.php	Thu Jan 11 20:22:30 2007
-@@ -105,23 +105,6 @@
- 	$prevDOfMonth=$DayOfMonth;
-     }
- 
--    $Columns = sizeof($allDays);
--    if($Columns > 30){                             
--	$delta = ceil($Columns/30);                
--                                                   
--	$giveDelta=0;                              
--	while (list($key, $val) = each($allDays)) {
--    	    if($giveDelta == $key){                
--        	$giveDelta+=$delta;                
--    	    }else{                                 
--        	$allDays[$key][0]='';              
--    	    }                                      
--    	    if($val[1] > $maxValue){               
--        	$maxValue=$val[1];                 
--    	    }
--	}                                          
--    }
--
- if($debug) print_r($allDays);
- if($debug) print("I".$maxValue."I");
- 
diff --git a/comms/atslog/files/pkg-message.in b/comms/atslog/files/pkg-message.in
index d45a94026154..a9a20aff1874 100644
--- a/comms/atslog/files/pkg-message.in
+++ b/comms/atslog/files/pkg-message.in
@@ -5,7 +5,7 @@ To setup SQL tables for the ATSlog, please run:
 
 Please edit  %%PREFIX%%/etc/atslog.conf  to suit your needs.
 
-Don't forget to add   atslogd_enable="YES"  into your /etc/rc.conf.
+Don't forget to add  atslogd_enable="YES"  into your /etc/rc.conf.
 
 To make ATSlog www interface available through your web site, I suggest
 that you add something like the following to httpd.conf:
diff --git a/comms/atslog/pkg-plist b/comms/atslog/pkg-plist
index 3c6792cf7fe6..f67ddb21b155 100644
--- a/comms/atslog/pkg-plist
+++ b/comms/atslog/pkg-plist
@@ -12,6 +12,7 @@ etc/atslog.conf.default.rus
 libexec/atslog/4200e.lib
 libexec/atslog/gd-320.lib
 libexec/atslog/gdk-100.lib
+libexec/atslog/genindex.sh
 libexec/atslog/ghx-46.lib
 libexec/atslog/gps-6a.lib
 libexec/atslog/hicom-250.lib
@@ -24,6 +25,8 @@ libexec/atslog/kx-td500.lib
 libexec/atslog/kx-td816ru.lib
 libexec/atslog/kx-tda100.lib
 libexec/atslog/ldk-300.lib
+libexec/atslog/modules.lst
+libexec/atslog/neax-2000.lib
 libexec/atslog/nx-820.lib
 libexec/atslog/officeserv-7200.lib
 libexec/atslog/skp-816.lib
@@ -47,6 +50,7 @@ libexec/atslog/skp-816.lib
 %%EXAMPLESDIR%%/textlogs/LG GMX-1232.TXT
 %%EXAMPLESDIR%%/textlogs/LG LDK-100 (variant 1).txt
 %%EXAMPLESDIR%%/textlogs/LG LDK-100 (variant 2).txt
+%%EXAMPLESDIR%%/textlogs/LG LDK-300 with CID.txt
 %%EXAMPLESDIR%%/textlogs/LG LDK-300.txt
 %%EXAMPLESDIR%%/textlogs/Meridian-1 (variant 1).txt
 %%EXAMPLESDIR%%/textlogs/Meridian-1 (variant 2).txt
@@ -56,6 +60,7 @@ libexec/atslog/skp-816.lib
 %%EXAMPLESDIR%%/textlogs/Multicom G1260.txt
 %%EXAMPLESDIR%%/textlogs/Multicom MAXICOM MP80.TXT
 %%EXAMPLESDIR%%/textlogs/Multicom Maxicom MXM300.txt
+%%EXAMPLESDIR%%/textlogs/NEC NEAX2000 IPS.txt
 %%EXAMPLESDIR%%/textlogs/Panasonic 816.txt
 %%EXAMPLESDIR%%/textlogs/Panasonic DBS-90.txt
 %%EXAMPLESDIR%%/textlogs/Panasonic KX-T1232-RU.txt
@@ -84,11 +89,13 @@ libexec/atslog/skp-816.lib
 %%EXAMPLESDIR%%/textlogs/Samsung NX-1232.txt
 %%EXAMPLESDIR%%/textlogs/Samsung NX-820(variant 1).txt
 %%EXAMPLESDIR%%/textlogs/Samsung NX-820(variant 2).txt
+%%EXAMPLESDIR%%/textlogs/Samsung OfficeServ 500.txt
 %%EXAMPLESDIR%%/textlogs/Samsung OfficeServ 7200.txt
 %%EXAMPLESDIR%%/textlogs/Samsung SKP 56_120.txt
 %%EXAMPLESDIR%%/textlogs/Samsung SKP-36HX.txt
 %%EXAMPLESDIR%%/textlogs/Samsung SKP-816.txt
 %%EXAMPLESDIR%%/textlogs/Samsung iDCS 500.txt
+%%EXAMPLESDIR%%/textlogs/Siemens HIPATH-3750.txt
 %%EXAMPLESDIR%%/textlogs/Siemens Hicom 118.txt
 %%EXAMPLESDIR%%/textlogs/Siemens Hicom 150 OfficeCom (Wide).txt
 %%EXAMPLESDIR%%/textlogs/Siemens Hicom-250.txt