From 85d7dc78af587ca1434189bdb62acdd8fba9879a Mon Sep 17 00:00:00 2001 From: form Date: Tue, 11 Aug 1998 03:16:49 +0000 Subject: [PATCH] update to 2.4 --- www/wwwcount/Makefile | 36 ++++--- www/wwwcount/files/md5 | 2 +- www/wwwcount/patches/patch-aa | 172 ++++++++++++---------------------- www/wwwcount/patches/patch-ab | 36 +++---- www/wwwcount/patches/patch-ac | 19 ---- www/wwwcount/patches/patch-ad | 19 ---- www/wwwcount/patches/patch-ae | 72 +++++++------- www/wwwcount/patches/patch-af | 19 ---- www/wwwcount/pkg/PLIST | 20 ++-- 9 files changed, 143 insertions(+), 252 deletions(-) delete mode 100644 www/wwwcount/patches/patch-ac delete mode 100644 www/wwwcount/patches/patch-ad delete mode 100644 www/wwwcount/patches/patch-af diff --git a/www/wwwcount/Makefile b/www/wwwcount/Makefile index 905ffc0a201..bee6622d16c 100644 --- a/www/wwwcount/Makefile +++ b/www/wwwcount/Makefile @@ -1,29 +1,41 @@ -# OpenBSD makefile for: wwwcount -# Version required: 2.3 -# Date created: 17 Nov 1997 -# Whom: ejovi +# OpenBSD makefile for: wwwcount +# Version required: 2.3 +# Date created: 17 Nov 1997 +# Whom: ejovi # -# $OpenBSD: Makefile,v 1.2 1997/11/19 01:07:58 joey Exp $ +# $OpenBSD: Makefile,v 1.3 1998/08/11 03:16:49 form Exp $ # # WWW site: http://www.fccc.edu/users/muquit/Count.html # For digit images look at: # http://www.digitmania.holowww.com/ -DISTNAME= wwwcount2.3 -PKGNAME= wwwcount-2.3 -CATEGORIES= www -MASTER_SITES= http://www.fccc.edu/users/muquit/src/wwwcount2.3/ +DISTNAME= wwwcount2.4 +PKGNAME= wwwcount-2.4 +CATEGORIES= www +MASTER_SITES= http://www.fccc.edu/users/muquit/src/wwwcount2.4/ -MAINTAINER= joey@OpenBSD.ORG +MAINTAINER= form@vs.itam.nsc.ru -GNU_CONFIGURE= yes -IS_INTERACTIVE= yes +GNU_CONFIGURE= yes +IS_INTERACTIVE= yes MAN1= mkstrip.1 +.if defined(USE_RELOAD) +COUNT_RELOAD= -DCOUNT_RELOAD=1 +.endif + pre-configure: cd ${WRKSRC}; yes "" | PREFIX=${PREFIX} ./Count-config +pre-build: +.if !defined(USE_RELOAD) + @echo "***" + @echo "*** Do \"make USE_RELOAD=yes\" if you want to disable" + @echo "*** \"reload ignore\" feature." + @echo "***" +.endif + post-build: cd ${WRKSRC}/utils; ${MAKE} cd ${WRKSRC}; ./Gen-conf diff --git a/www/wwwcount/files/md5 b/www/wwwcount/files/md5 index f2d8bf6aa91..8aa8d55b794 100644 --- a/www/wwwcount/files/md5 +++ b/www/wwwcount/files/md5 @@ -1 +1 @@ -MD5 (wwwcount2.3.tar.gz) = 3577b6117c1cd3a764882c100b060e7c +MD5 (wwwcount2.4.tar.gz) = b9efab88431a1fd32f3908ba278d9375 diff --git a/www/wwwcount/patches/patch-aa b/www/wwwcount/patches/patch-aa index 306a61d958d..38f94e987d5 100644 --- a/www/wwwcount/patches/patch-aa +++ b/www/wwwcount/patches/patch-aa @@ -1,5 +1,5 @@ -*** Count-config.orig Fri May 3 06:20:27 1996 ---- Count-config Fri Sep 6 18:05:28 1996 +*** Count-config.orig Mon Nov 24 04:49:51 1997 +--- Count-config Sat Nov 29 18:50:53 1997 *************** *** 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 @@ -18,37 +18,37 @@ if [ ! -f "./VERSION" ] then *************** -*** 36,48 **** +*** 37,49 **** Version=`cat ./VERSION` Basedir="wwwcount$Version" - ConfigH="config.h" + ConfigH="src/config.h" ! BaseDir="/usr/local/etc/Counter" - ConfigDir="conf" + ConfigDir="$BaseDir/conf" ConfFile="count.cfg" - DigitDir="digits" - DataDir="data" -! LogDir="Log" +! DigitDir="$BaseDir/digits" + DataDir="$BaseDir/data" +! LogDir="$BaseDir/logs" ! LogFile="Count$Version.log" RgbFile="./wcount/rgb.txt" - #allow_f_cr=0 - #strict_mode=0 ---- 36,49 ---- + + # +--- 37,50 ---- Version=`cat ./VERSION` Basedir="wwwcount$Version" - ConfigH="config.h" -! BaseDir="${PREFIX}/etc/Counter" + ConfigH="src/config.h" +! BaseDir="/var/www/Counter" ! LibDir="${PREFIX}/lib/Counter" - ConfigDir="conf" + ConfigDir="$BaseDir/conf" ConfFile="count.cfg" - DigitDir="digits" - DataDir="data" -! LogDir="/var/log" +! DigitDir="$LibDir/digits" + DataDir="$BaseDir/data" +! LogDir="/var/www/logs" ! LogFile="Counter.log" RgbFile="./wcount/rgb.txt" - #allow_f_cr=0 - #strict_mode=0 + + # *************** -*** 114,120 **** +*** 117,123 **** if [ .$answer = . ] then @@ -56,7 +56,7 @@ fi until [ $answer = "y" -o $answer = "Y" -o $answer = "n" -o $answer = "N" ] do ---- 115,121 ---- +--- 118,124 ---- if [ .$answer = . ] then @@ -65,49 +65,19 @@ until [ $answer = "y" -o $answer = "Y" -o $answer = "n" -o $answer = "N" ] do *************** -*** 245,251 **** - You need to enter the directory of the Log file. - - EOB -! echo $n "*Log directory [$BaseDir/$LogDir]:$c " - read newpath - if [ .$newpath != . ] +*** 183,191 **** then ---- 246,252 ---- - You need to enter the directory of the Log file. + BaseDir=$newpath + ConfigDir=$BaseDir/conf +- DigitDir=$BaseDir/digits + DataDir=$BaseDir/data +- LogDir=$BaseDir/logs + fi - EOB -! echo $n "*Log directory [$LogDir]:$c " - read newpath - if [ .$newpath != . ] - then + # +--- 184,190 ---- *************** -*** 289,299 **** - echo "++++++++++++++++++++++++++++++" - echo "CgiBinDir=$CgiBinDir" - echo "BaseDir= $BaseDir" -! echo "DigitDir= $BaseDir/$DigitDir" - echo "ConfDir = $BaseDir/$ConfigDir" - echo "ConfFile= $ConfFile" - echo "DataDir= $BaseDir/$DataDir" -! echo "LogDir= $BaseDir/$LogDir" - echo "LogFile= $LogFile" - echo "++++++++++++++++++++++++++++++" - ---- 290,300 ---- - echo "++++++++++++++++++++++++++++++" - echo "CgiBinDir=$CgiBinDir" - echo "BaseDir= $BaseDir" -! echo "DigitDir= $LibDir/$DigitDir" - echo "ConfDir = $BaseDir/$ConfigDir" - echo "ConfFile= $ConfFile" - echo "DataDir= $BaseDir/$DataDir" -! echo "LogDir= $LogDir" - echo "LogFile= $LogFile" - echo "++++++++++++++++++++++++++++++" - -*************** -*** 302,308 **** +*** 374,380 **** if [ .$answer = . ] then @@ -115,7 +85,7 @@ fi until [ $answer = "y" -o $answer = "Y" -o $answer = "n" -o $answer = "N" ] do ---- 303,309 ---- +--- 373,379 ---- if [ .$answer = . ] then @@ -124,69 +94,43 @@ until [ $answer = "y" -o $answer = "Y" -o $answer = "n" -o $answer = "N" ] do *************** -*** 338,345 **** - echo "#define ConfigDir \"$BaseDir/$ConfigDir\"" >> $ConfigH - echo "#define ConfigFile \"$ConfFile\"" >> $ConfigH - echo "#define DataDir \"$BaseDir/$DataDir\"" >> $ConfigH -! echo "#define DigitDir \"$BaseDir/$DigitDir\"" >> $ConfigH -! echo "#define LogDir \"$BaseDir/$LogDir\"" >> $ConfigH - echo "#define LogFile \"$LogFile\"" >> $ConfigH - - cat<>$ConfigH ---- 339,346 ---- - echo "#define ConfigDir \"$BaseDir/$ConfigDir\"" >> $ConfigH - echo "#define ConfigFile \"$ConfFile\"" >> $ConfigH - echo "#define DataDir \"$BaseDir/$DataDir\"" >> $ConfigH -! echo "#define DigitDir \"$LibDir/$DigitDir\"" >> $ConfigH -! echo "#define LogDir \"$LogDir\"" >> $ConfigH - echo "#define LogFile \"$LogFile\"" >> $ConfigH - - cat<>$ConfigH -*************** -*** 381,387 **** - * so RGB names can be looked up, but yet not allow users to make constant - * use of this very ineffiecient lookup. - *****************************************************************************/ -! #define RgbMappingDict "$BaseDir/rgb.txt" +*** 517,523 **** + ** so RGB names can be looked up, but yet not allow users to make constant + ** use of this very ineffiecient lookup. + */ +! #define RGB_MAPPING_DICT "$BaseDir/rgb.txt" EOX - #if [ $allow_f_cr -eq 1 ] ---- 382,388 ---- - * so RGB names can be looked up, but yet not allow users to make constant - * use of this very ineffiecient lookup. - *****************************************************************************/ -! #define RgbMappingDict "$LibDir/rgb.txt" + cat<>$ConfigH +--- 516,522 ---- + ** so RGB names can be looked up, but yet not allow users to make constant + ** use of this very ineffiecient lookup. + */ +! #define RGB_MAPPING_DICT "$LibDir/rgb.txt" EOX - #if [ $allow_f_cr -eq 1 ] + cat<>$ConfigH *************** -*** 413,427 **** - ## - echo "creating variables template file $Tmpl for the install program.." - echo "BASE_DIR=\"$BaseDir\"" > $Tmpl - echo "CGIBIN_DIR=\"$CgiBinDir\"" >> $Tmpl - echo "CONFIG_FILE=\"$ConfFile\"" >> $Tmpl - echo "CONFIG_DIR=\"$BaseDir/$ConfigDir\"" >> $Tmpl -! echo "DIGIT_DIR=\"$BaseDir/$DigitDir\"" >> $Tmpl - echo "DATA_DIR=\"$BaseDir/$DataDir\"" >> $Tmpl -! echo "LOG_DIR=\"$BaseDir/$LogDir\"" >> $Tmpl - echo "LOG_FILE=\"$LogFile\"" >> $Tmpl - echo "RGB_FILE=\"$RgbFile\"" >> $Tmpl -! echo "RGB_DIR=\"$BaseDir\"" >> $Tmpl - ## - # create template for install program --ends - ## ---- 414,429 ---- +*** 535,540 **** +--- 534,540 ---- ## echo "creating variables template file $Tmpl for the install program.." echo "BASE_DIR=\"$BaseDir\"" > $Tmpl + echo "LIB_DIR=\"$LibDir\"" >> $Tmpl echo "CGIBIN_DIR=\"$CgiBinDir\"" >> $Tmpl echo "CONFIG_FILE=\"$ConfFile\"" >> $Tmpl - echo "CONFIG_DIR=\"$BaseDir/$ConfigDir\"" >> $Tmpl -! echo "DIGIT_DIR=\"$LibDir/$DigitDir\"" >> $Tmpl - echo "DATA_DIR=\"$BaseDir/$DataDir\"" >> $Tmpl -! echo "LOG_DIR=\"$LogDir\"" >> $Tmpl + echo "CONFIG_DIR=\"$ConfigDir\"" >> $Tmpl +*************** +*** 543,549 **** + echo "LOG_DIR=\"$LogDir\"" >> $Tmpl + echo "LOG_FILE=\"$LogFile\"" >> $Tmpl + echo "RGB_FILE=\"$RgbFile\"" >> $Tmpl +! echo "RGB_DIR=\"$BaseDir\"" >> $Tmpl + ## + # create template for install program --ends + ## +--- 543,549 ---- + echo "LOG_DIR=\"$LogDir\"" >> $Tmpl echo "LOG_FILE=\"$LogFile\"" >> $Tmpl echo "RGB_FILE=\"$RgbFile\"" >> $Tmpl ! echo "RGB_DIR=\"$LibDir\"" >> $Tmpl diff --git a/www/wwwcount/patches/patch-ab b/www/wwwcount/patches/patch-ab index 7dd5a832c2b..f4c58de6415 100644 --- a/www/wwwcount/patches/patch-ab +++ b/www/wwwcount/patches/patch-ab @@ -1,19 +1,19 @@ -*** Makefile.in.bak Fri May 3 06:20:33 1996 ---- Makefile.in Thu May 16 05:43:27 1996 +*** configure.bak Sat Oct 25 08:47:50 1997 +--- configure Thu Nov 6 00:59:05 1997 *************** -*** 22,28 **** - ## - ACCESS_AUTH= -DACCESS_AUTH=1 - DEFINES= $(INCLUDES) $(DEFS) $(ACCESS_AUTH) -D__USE_FIXED_PROTOTYPES__ -! CFLAGS= -O $(DEFINES) -DSYS_UNIX=1 -DDEBUG=1 - - - OBJS= main.o parse.o strimage.o ---- 22,28 ---- - ## - ACCESS_AUTH= -DACCESS_AUTH=1 - DEFINES= $(INCLUDES) $(DEFS) $(ACCESS_AUTH) -D__USE_FIXED_PROTOTYPES__ -! CFLAGS+= $(DEFINES) -DSYS_UNIX=1 -DDEBUG=1 - - - OBJS= main.o parse.o strimage.o +*** 1587,1593 **** + s%@CFLAGS@%$CFLAGS%g + s%@CPPFLAGS@%$CPPFLAGS%g + s%@CXXFLAGS@%$CXXFLAGS%g +! s%@DEFS@%$DEFS%g + s%@LDFLAGS@%$LDFLAGS%g + s%@LIBS@%$LIBS%g + s%@exec_prefix@%$exec_prefix%g +--- 1587,1593 ---- + s%@CFLAGS@%$CFLAGS%g + s%@CPPFLAGS@%$CPPFLAGS%g + s%@CXXFLAGS@%$CXXFLAGS%g +! s%@DEFS@%$CFLAGS $DEFS%g + s%@LDFLAGS@%$LDFLAGS%g + s%@LIBS@%$LIBS%g + s%@exec_prefix@%$exec_prefix%g diff --git a/www/wwwcount/patches/patch-ac b/www/wwwcount/patches/patch-ac deleted file mode 100644 index 3b441499b0e..00000000000 --- a/www/wwwcount/patches/patch-ac +++ /dev/null @@ -1,19 +0,0 @@ -*** combine/Makefile.in.bak Fri May 3 04:19:02 1996 ---- combine/Makefile.in Thu May 16 21:50:06 1996 -*************** -*** 16,22 **** - # replace -O with -g in order to debug - - DEFINES= $(INCLUDES) $(DEFS) -D__USE_FIXED_PROTOTYPES__ -DSYS_UNIX=1 -! CFLAGS= -O $(DEFINES) - - SRCS = crbasei.c allocim.c readgif.c rddata.c dstraimg.c\ - readblk.c lzwdec.c syncimg.c duplicim.c writegif.c lsbfwrs.c\ ---- 16,22 ---- - # replace -O with -g in order to debug - - DEFINES= $(INCLUDES) $(DEFS) -D__USE_FIXED_PROTOTYPES__ -DSYS_UNIX=1 -! CFLAGS+= $(DEFINES) - - SRCS = crbasei.c allocim.c readgif.c rddata.c dstraimg.c\ - readblk.c lzwdec.c syncimg.c duplicim.c writegif.c lsbfwrs.c\ diff --git a/www/wwwcount/patches/patch-ad b/www/wwwcount/patches/patch-ad deleted file mode 100644 index ba38ffd04c4..00000000000 --- a/www/wwwcount/patches/patch-ad +++ /dev/null @@ -1,19 +0,0 @@ -*** utils/Makefile.in.bak Mon Apr 8 03:20:07 1996 ---- utils/Makefile.in Thu May 16 21:53:01 1996 -*************** -*** 7,13 **** - CC= @CC@ - DEFS= @DEFS@ - DEFINES= $(INCLUDES) $(DEFS) -D__USE_FIXED_PROTOTYPES_ -! CFLAGS= -O $(DEFINES) - - BINARY=mkstrip - LIBS= ../combine/libCombine.a ---- 7,13 ---- - CC= @CC@ - DEFS= @DEFS@ - DEFINES= $(INCLUDES) $(DEFS) -D__USE_FIXED_PROTOTYPES_ -! CFLAGS+= $(DEFINES) - - BINARY=mkstrip - LIBS= ../combine/libCombine.a diff --git a/www/wwwcount/patches/patch-ae b/www/wwwcount/patches/patch-ae index adc106e86bc..888160fbe56 100644 --- a/www/wwwcount/patches/patch-ae +++ b/www/wwwcount/patches/patch-ae @@ -1,5 +1,5 @@ -*** Count-install.orig Fri May 3 06:20:31 1996 ---- Count-install Fri Sep 6 18:05:28 1996 +*** Count-install.orig Sat May 9 16:53:02 1998 +--- Count-install Sun Jun 7 15:03:51 1998 *************** *** 193,199 **** @@ -55,7 +55,7 @@ read answer if [ .$answer = . ] then -! answer=nobody +! answer=www fi until [ $answer != "x" ] do @@ -80,24 +80,17 @@ read answer if [ .$answer = . ] then -! answer=nogroup +! answer=www fi until [ $answer != "x" ] do *************** -*** 298,318 **** - # enter groud id -ends - ## - echo "installing Count.cgi->$CGIBIN_DIR" -! $INSTALL_PROG -c -o $UserId -g $GroupId -m 755 ./Count.cgi $CGIBIN_DIR/Count.cgi - echo "installing $CONFIG_FILE->$CONFIG_DIR" - $INSTALL_PROG -c -o $UserId -g $GroupId -m 664 $CONFIG_FILE $CONFIG_DIR/$CONFIG_FILE - echo "installing sample datafile $SAMPLE_DAT->$DATA_DIR" - $INSTALL_PROG -c -o $UserId -g $GroupId -m 664 $SAMPLE_DAT $DATA_DIR/sample.dat - chmod 775 $DATA_DIR +*** 323,336 **** + echo + fi ! echo "installing rgb.txt->$BASE_DIR" -! $INSTALL_PROG -c -o $UserId -g $GroupId -m 644 $Rgbfile $BASE_DIR/rgb.txt +! $INSTALL_PROG -c -m 644 $Rgbfile $BASE_DIR/rgb.txt ! echo "creating Log directory $LOG_DIR" ! ./mkdirhier $LOG_DIR @@ -106,20 +99,13 @@ ! chmod 775 $LOG_DIR echo "installing image strip for digit style A->$DIGIT_DIR/A" - $INSTALL_PROG -c -o $UserId -g $GroupId -m 644 $DigitA/strip.gif\ ---- 298,317 ---- - # enter groud id -ends - ## - echo "installing Count.cgi->$CGIBIN_DIR" -! $INSTALL_PROG -s -c -o $UserId -g $GroupId -m 755 ./Count.cgi $CGIBIN_DIR/Count.cgi - echo "installing $CONFIG_FILE->$CONFIG_DIR" - $INSTALL_PROG -c -o $UserId -g $GroupId -m 664 $CONFIG_FILE $CONFIG_DIR/$CONFIG_FILE - echo "installing sample datafile $SAMPLE_DAT->$DATA_DIR" - $INSTALL_PROG -c -o $UserId -g $GroupId -m 664 $SAMPLE_DAT $DATA_DIR/sample.dat - chmod 775 $DATA_DIR + $INSTALL_PROG -c -m 644 $DigitA/strip.gif\ +--- 323,335 ---- + echo + fi ! echo "installing rgb.txt->$RGB_DIR" -! $INSTALL_PROG -c -o $UserId -g $GroupId -m 644 $Rgbfile $RGB_DIR/rgb.txt +! $INSTALL_PROG -c -m 644 $Rgbfile $RGB_DIR/rgb.txt ! echo "installing $LOG_FILE->$LOG_DIR" ! touch $LOG_DIR/$LOG_FILE @@ -127,24 +113,34 @@ ! chown $UserId.$GroupId $LOG_DIR/$LOG_FILE echo "installing image strip for digit style A->$DIGIT_DIR/A" - $INSTALL_PROG -c -o $UserId -g $GroupId -m 644 $DigitA/strip.gif\ + $INSTALL_PROG -c -m 644 $DigitA/strip.gif\ *************** -*** 344,349 **** ---- 343,350 ---- +*** 360,367 **** + # -R is not portable, reported by Geoff Scully and suggested + # the alternative (01/15/96) #chown -R $UserId.$GroupId $BASE_DIR - find $BASE_DIR -exec chown $UserId {} \; - find $BASE_DIR -exec chgrp $GroupId {} \; -+ find $LIB_DIR -exec chown $UserId {} \; -+ find $LIB_DIR -exec chgrp $GroupId {} \; +! #find $BASE_DIR -exec chown $UserId {} \; +! #find $BASE_DIR -exec chgrp $GroupId {} \; + # echo "UserId=$UserId" + # echo "GroupId=$GroupId" + ;; +--- 359,368 ---- + # -R is not portable, reported by Geoff Scully and suggested + # the alternative (01/15/96) + #chown -R $UserId.$GroupId $BASE_DIR +! find $BASE_DIR -exec chown $UserId {} \; +! find $BASE_DIR -exec chgrp $GroupId {} \; +! find $LIB_DIR -exec chown $UserId {} \; +! find $LIB_DIR -exec chgrp $GroupId {} \; # echo "UserId=$UserId" # echo "GroupId=$GroupId" ;; *************** -*** 358,374 **** +*** 376,392 **** EOM echo "installing Count.cgi->$CGIBIN_DIR" -! $INSTALL_PROG -c -m 755 ./Count.cgi $CGIBIN_DIR/Count.cgi +! $INSTALL_PROG -c -m 755 $Binary $CGIBIN_DIR/Count.cgi echo "installing $CONFIG_FILE->$CONFIG_DIR" $INSTALL_PROG -c $CONFIG_FILE $CONFIG_DIR/$CONFIG_FILE echo "installing sample datafile $SAMPLE_DAT->$DATA_DIR" @@ -158,11 +154,11 @@ echo "installing image strip for digit style A->$DIGIT_DIR/A" $INSTALL_PROG -c $DigitA/strip.gif $DIGIT_DIR/A/strip.gif ---- 359,376 ---- +--- 377,394 ---- EOM echo "installing Count.cgi->$CGIBIN_DIR" -! $INSTALL_PROG -s -c -m 755 ./Count.cgi $CGIBIN_DIR/Count.cgi +! $INSTALL_PROG -s -c -m 755 $Binary $CGIBIN_DIR/Count.cgi echo "installing $CONFIG_FILE->$CONFIG_DIR" $INSTALL_PROG -c $CONFIG_FILE $CONFIG_DIR/$CONFIG_FILE echo "installing sample datafile $SAMPLE_DAT->$DATA_DIR" diff --git a/www/wwwcount/patches/patch-af b/www/wwwcount/patches/patch-af deleted file mode 100644 index 7b3092bd061..00000000000 --- a/www/wwwcount/patches/patch-af +++ /dev/null @@ -1,19 +0,0 @@ -*** main.c.bak Fri May 3 07:15:48 1996 ---- main.c Thu Dec 12 04:45:17 1996 -*************** -*** 1111,1117 **** - if (Gdebug == False) - { - (void) fprintf (stdout, -! "Content-type: image/gif%c%c",LF,LF); - (void) fflush (stdout); - } - return; ---- 1111,1117 ---- - if (Gdebug == False) - { - (void) fprintf (stdout, -! "Content-type: image/gif%cCache-control: no-store%c%c",LF,LF,LF); - (void) fflush (stdout); - } - return; diff --git a/www/wwwcount/pkg/PLIST b/www/wwwcount/pkg/PLIST index 3dd66dd6859..eb1c14988a6 100644 --- a/www/wwwcount/pkg/PLIST +++ b/www/wwwcount/pkg/PLIST @@ -1,7 +1,5 @@ -www/cgi-bin/Count.cgi -etc/Counter/conf/count.cfg -etc/Counter/data/sample.dat -lib/Counter/rgb.txt +bin/extdgts +bin/mkstrip lib/Counter/digits/A/strip.gif lib/Counter/digits/B/strip.gif lib/Counter/digits/C/strip.gif @@ -9,15 +7,8 @@ lib/Counter/digits/D/strip.gif lib/Counter/digits/D/lenna.gif lib/Counter/digits/E/strip.gif lib/Counter/digits/mkstrip.sh -bin/mkstrip +lib/Counter/rgb.txt man/man1/mkstrip.1 -@exec touch /var/log/Counter.log -@exec chown nobody.nogroup /var/log/Counter.log -@exec chmod 644 /var/log/Counter.log -@unexec rm /var/log/Counter.log -@dirrm etc/Counter/data -@dirrm etc/Counter/conf -@dirrm etc/Counter @dirrm lib/Counter/digits/A @dirrm lib/Counter/digits/B @dirrm lib/Counter/digits/C @@ -25,3 +16,8 @@ man/man1/mkstrip.1 @dirrm lib/Counter/digits/E @dirrm lib/Counter/digits @dirrm lib/Counter +@unexec rm -f /var/www/cgi-bin/Count.cgi /var/www/logs/Counter.log +@unexec echo "***" +@unexec echo "*** Please remove /var/www/Counter directory and its" +@unexec echo "*** contents manually to complete uninstall process." +@unexec echo "***"