From 6584d445503e69137cfa902669b4c515a1e0219a Mon Sep 17 00:00:00 2001 From: Seiichirou Hiraoka Date: Tue, 5 Oct 1999 04:52:23 +0000 Subject: Update to 2.5 PR: ports/13689 Submitted by: dervish@ikhala.tcimet.net --- www/wwwcount/Makefile | 18 ++++++++--------- www/wwwcount/distinfo | 2 +- www/wwwcount/files/patch-aa | 47 +++++++++++++++++++++++---------------------- www/wwwcount/files/patch-ab | 8 ++++---- www/wwwcount/pkg-descr | 17 ++++++++++++++-- www/wwwcount/pkg-plist | 32 +++++++++++++++++++++++++----- 6 files changed, 79 insertions(+), 45 deletions(-) (limited to 'www') diff --git a/www/wwwcount/Makefile b/www/wwwcount/Makefile index 030739794003..973fc6da66cb 100644 --- a/www/wwwcount/Makefile +++ b/www/wwwcount/Makefile @@ -1,19 +1,15 @@ # New ports collection makefile for: wwwcount -# Version required: 2.4 +# Version required: 2.5 # Date created: 16 May 1996 # Whom: ache # # $FreeBSD$ # -# WWW site: http://www.fccc.edu/users/muquit/Count.html -# For digit images look at: -# http://www.digitmania.holowww.com/ - -DISTNAME= wwwcount2.4 -PKGNAME= wwwcount-2.4 +DISTNAME= wwwcount2.5 +PKGNAME= wwwcount-2.5 CATEGORIES= www -MASTER_SITES= http://www.fccc.edu/users/muquit/src/wwwcount2.4/ +MASTER_SITES= http://www.fccc.edu/users/muquit/src/wwwcount2.5/ MAINTAINER= dervish@ikhala.tcimet.net @@ -23,15 +19,17 @@ USE_GMAKE= yes MAN1= mkstrip.1 pre-configure: - cd ${WRKSRC}; yes "" | PREFIX=${PREFIX} ./Count-config + cd ${WRKSRC}; PREFIX=${PREFIX} ./Count-config post-build: cd ${WRKSRC}; ./Gen-conf do-install: cd ${WRKSRC}; yes "" | ./Count-install + cd ${WRKSRC}/utils/extdgts; \ + ${INSTALL_PROGRAM} extdgts ${PREFIX}/bin; cd ${WRKSRC}/utils/mkstrip; \ - ${INSTALL_PROGRAM} extdgts mkstrip ${PREFIX}/bin; \ + ${INSTALL_PROGRAM} mkstrip ${PREFIX}/bin; \ ${INSTALL_MAN} mkstrip.1 ${PREFIX}/man/man1; \ ${INSTALL_SCRIPT} mkstrip.sh ${PREFIX}/lib/Counter/digits diff --git a/www/wwwcount/distinfo b/www/wwwcount/distinfo index 8aa8d55b7943..aaee4a4d44ce 100644 --- a/www/wwwcount/distinfo +++ b/www/wwwcount/distinfo @@ -1 +1 @@ -MD5 (wwwcount2.4.tar.gz) = b9efab88431a1fd32f3908ba278d9375 +MD5 (wwwcount2.5.tar.gz) = 5e81fd01692269bb9fb56c2828e7dc74 diff --git a/www/wwwcount/files/patch-aa b/www/wwwcount/files/patch-aa index 084c3a56d692..83c8e5a625da 100644 --- a/www/wwwcount/files/patch-aa +++ b/www/wwwcount/files/patch-aa @@ -1,8 +1,8 @@ -*** Count-config.orig Mon Nov 24 04:49:51 1997 ---- Count-config Sat Nov 29 18:50:53 1997 +*** Count-config.orig Fri Sep 10 13:26:09 1999 +--- Count-config Fri Sep 10 13:40:21 1999 *************** *** 20,26 **** - trap 'echo '';echo "Interrupt Detected..exiting";rm -f "./Config.tmpl" 2>/dev/null;rm -f "./.alfcf" ;rm -f "./strict" 2>/dev/null;echo '';exit 1' 1 2 3 15 + trap 'echo '';echo "Interrupt detected..exiting";rm -f "./Config.tmpl" 2>/dev/null;rm -f "./.alfcf" ;rm -f "./strict" 2>/dev/null;echo '';exit 1' 1 2 3 15 Tmpl="./Config.tmpl" ! CgiBinDir="/usr/local/etc/httpd/cgi-bin" @@ -10,7 +10,7 @@ if [ ! -f "./VERSION" ] then --- 20,26 ---- - trap 'echo '';echo "Interrupt Detected..exiting";rm -f "./Config.tmpl" 2>/dev/null;rm -f "./.alfcf" ;rm -f "./strict" 2>/dev/null;echo '';exit 1' 1 2 3 15 + trap 'echo '';echo "Interrupt detected..exiting";rm -f "./Config.tmpl" 2>/dev/null;rm -f "./.alfcf" ;rm -f "./strict" 2>/dev/null;echo '';exit 1' 1 2 3 15 Tmpl="./Config.tmpl" ! CgiBinDir="${PREFIX}/www/cgi-bin" @@ -18,7 +18,7 @@ if [ ! -f "./VERSION" ] then *************** -*** 37,49 **** +*** 37,50 **** Version=`cat ./VERSION` Basedir="wwwcount$Version" ConfigH="src/config.h" @@ -28,8 +28,9 @@ ! DigitDir="$BaseDir/digits" DataDir="$BaseDir/data" ! LogDir="$BaseDir/logs" -! LogFile="Count$Version.log" - RgbFile="./wcount/rgb.txt" +! ext=`echo $Version | sed 's/\./_/g'` +! LogFile="Count$ext.log" + RgbFile="./data/rgb.txt" # --- 37,50 ---- @@ -44,11 +45,11 @@ DataDir="$BaseDir/data" ! LogDir="/var/log" ! LogFile="Counter.log" - RgbFile="./wcount/rgb.txt" + RgbFile="./data/rgb.txt" # *************** -*** 117,123 **** +*** 118,124 **** if [ .$answer = . ] then @@ -65,7 +66,7 @@ until [ $answer = "y" -o $answer = "Y" -o $answer = "n" -o $answer = "N" ] do *************** -*** 183,191 **** +*** 186,194 **** then BaseDir=$newpath ConfigDir=$BaseDir/conf @@ -75,9 +76,9 @@ fi # ---- 184,190 ---- +--- 186,192 ---- *************** -*** 374,380 **** +*** 377,383 **** if [ .$answer = . ] then @@ -85,7 +86,7 @@ fi until [ $answer = "y" -o $answer = "Y" -o $answer = "n" -o $answer = "N" ] do ---- 373,379 ---- +--- 375,381 ---- if [ .$answer = . ] then @@ -94,7 +95,7 @@ until [ $answer = "y" -o $answer = "Y" -o $answer = "n" -o $answer = "N" ] do *************** -*** 517,523 **** +*** 519,525 **** ** so RGB names can be looked up, but yet not allow users to make constant ** use of this very ineffiecient lookup. */ @@ -102,7 +103,7 @@ EOX cat<>$ConfigH ---- 516,522 ---- +--- 517,523 ---- ** so RGB names can be looked up, but yet not allow users to make constant ** use of this very ineffiecient lookup. */ @@ -111,17 +112,17 @@ cat<>$ConfigH *************** -*** 535,540 **** ---- 534,540 ---- - ## - echo "creating variables template file $Tmpl for the install program.." - echo "BASE_DIR=\"$BaseDir\"" > $Tmpl +*** 540,545 **** +--- 538,544 ---- + echo "CGIBIN_DIR=\"$CgiBinDir\"" > $Tmpl + + echo "BASE_DIR=\"$BaseDir\"" >> $Tmpl + echo "LIB_DIR=\"$LibDir\"" >> $Tmpl - echo "CGIBIN_DIR=\"$CgiBinDir\"" >> $Tmpl echo "CONFIG_FILE=\"$ConfFile\"" >> $Tmpl echo "CONFIG_DIR=\"$ConfigDir\"" >> $Tmpl + echo "DIGIT_DIR=\"$DigitDir\"" >> $Tmpl *************** -*** 543,549 **** +*** 547,553 **** echo "LOG_DIR=\"$LogDir\"" >> $Tmpl echo "LOG_FILE=\"$LogFile\"" >> $Tmpl echo "RGB_FILE=\"$RgbFile\"" >> $Tmpl @@ -129,7 +130,7 @@ ## # create template for install program --ends ## ---- 543,549 ---- +--- 546,552 ---- echo "LOG_DIR=\"$LogDir\"" >> $Tmpl echo "LOG_FILE=\"$LogFile\"" >> $Tmpl echo "RGB_FILE=\"$RgbFile\"" >> $Tmpl diff --git a/www/wwwcount/files/patch-ab b/www/wwwcount/files/patch-ab index f4c58de6415e..7ea5632bb520 100644 --- a/www/wwwcount/files/patch-ab +++ b/www/wwwcount/files/patch-ab @@ -1,7 +1,7 @@ -*** configure.bak Sat Oct 25 08:47:50 1997 ---- configure Thu Nov 6 00:59:05 1997 +*** configure.orig Fri Sep 10 13:57:04 1999 +--- configure Fri Sep 10 13:58:36 1999 *************** -*** 1587,1593 **** +*** 1573,1579 **** s%@CFLAGS@%$CFLAGS%g s%@CPPFLAGS@%$CPPFLAGS%g s%@CXXFLAGS@%$CXXFLAGS%g @@ -9,7 +9,7 @@ s%@LDFLAGS@%$LDFLAGS%g s%@LIBS@%$LIBS%g s%@exec_prefix@%$exec_prefix%g ---- 1587,1593 ---- +--- 1573,1579 ---- s%@CFLAGS@%$CFLAGS%g s%@CPPFLAGS@%$CPPFLAGS%g s%@CXXFLAGS@%$CXXFLAGS%g diff --git a/www/wwwcount/pkg-descr b/www/wwwcount/pkg-descr index 496e8161489e..9ac526801406 100644 --- a/www/wwwcount/pkg-descr +++ b/www/wwwcount/pkg-descr @@ -1,4 +1,17 @@ -The counter, clock and date, all in one program. The single program can -be used for any number of web pages, for any number of users. +The counter, clock and date all in one program. This is a CGI +program to record the number of raw hits on a web page. It generates +a GIF image of the number of hits and returns to the browser as an +in-lined image. The program also has a run-time option not to show +the digit images, this way the hits can be kept without being displayed. +The hits can be be monitored without incrementing from a separate page +as well. The program can also display the time and date of any timezone. +It has a option to countdown to a specific date (past or future). Almost +all of the features are run-time options. The single program can be used +for any number of web pages, for any number of users. + +For digit images look at: http://www.digitmania.holowww.com/ WWW: http://www.fccc.edu/users/muquit/Count.html + +- Bush Dcotor +dervish@ikhala.tcimet.net diff --git a/www/wwwcount/pkg-plist b/www/wwwcount/pkg-plist index 0dbd766014d4..9c3a1e81a4f4 100644 --- a/www/wwwcount/pkg-plist +++ b/www/wwwcount/pkg-plist @@ -1,17 +1,39 @@ -www/cgi-bin/Count.cgi +bin/extdgts +bin/mkstrip etc/Counter/conf/count.cfg etc/Counter/data/sample.dat -lib/Counter/rgb.txt +etc/Counter/mirror_count.sh lib/Counter/digits/A/strip.gif +lib/Counter/digits/A/peng.gif +lib/Counter/digits/A/yeehaw.gif lib/Counter/digits/B/strip.gif lib/Counter/digits/C/strip.gif lib/Counter/digits/D/strip.gif lib/Counter/digits/D/lenna.gif lib/Counter/digits/E/strip.gif +lib/Counter/digits/E/foo.gif +lib/Counter/digits/cd/strip.gif +lib/Counter/digits/cdr/strip.gif +lib/Counter/digits/cdd/strip.gif +lib/Counter/digits/bang/strip.gif lib/Counter/digits/mkstrip.sh -bin/mkstrip -bin/extdgts +lib/Counter/rgb.txt +www/cgi-bin/Count.cgi @exec touch /var/log/Counter.log -@exec chown nobody.nogroup /var/log/Counter.log +@exec chown nobody:nobody /var/log/Counter.log @exec chmod 644 /var/log/Counter.log @unexec rm /var/log/Counter.log +@dirrm etc/Counter/conf +@dirrm etc/Counter/data +@dirrm etc/Counter +@dirrm lib/Counter/digits/A +@dirrm lib/Counter/digits/B +@dirrm lib/Counter/digits/C +@dirrm lib/Counter/digits/D +@dirrm lib/Counter/digits/E +@dirrm lib/Counter/digits/cd +@dirrm lib/Counter/digits/cdr +@dirrm lib/Counter/digits/cdd +@dirrm lib/Counter/digits/bang +@dirrm lib/Counter/digits +@dirrm lib/Counter -- cgit v1.2.3