[pkgsrc/trunk]: pkgsrc/www/wwwcount DESTDIR support. Don't install sample.dat...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/www/wwwcount DESTDIR support. Don't install sample.dat...
From: joerg <joerg%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 09:34:08 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/12b3bfd3c5d8
branches:  trunk
changeset: 577015:12b3bfd3c5d8
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun Jun 27 19:16:03 2010 +0000

description:
DESTDIR support. Don't install sample.dat as file writeable to nobdy.
Bump revision.

diffstat:

 www/wwwcount/Makefile         |   9 ++++++-
 www/wwwcount/PLIST            |   3 +-
 www/wwwcount/distinfo         |   4 +-
 www/wwwcount/patches/patch-ae |  52 +++++++++++++++++++++---------------------
 4 files changed, 37 insertions(+), 31 deletions(-)

diffs (219 lines):

diff -r 7f39211fbf42 -r 12b3bfd3c5d8 www/wwwcount/Makefile
--- a/www/wwwcount/Makefile     Sun Jun 27 18:00:24 2010 +0000
+++ b/www/wwwcount/Makefile     Sun Jun 27 19:16:03 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2009/12/17 19:32:28 abs Exp $
+# $NetBSD: Makefile,v 1.19 2010/06/27 19:16:03 joerg Exp $
 
 DISTNAME=      wwwcount2.5
 PKGNAME=       wwwcount-2.5
@@ -10,6 +10,8 @@
 HOMEPAGE=      http://www.muquit.com/muquit/software/Count/Count.html
 COMMENT=       Graphical access counter, clock and date indicator for WWW pages
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 GNU_CONFIGURE=         yes
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1                           \
                        share/doc/wwwcount/Count2.5/images              \
@@ -22,6 +24,11 @@
 
 MAKE_JOBS_SAFE=                NO
 
+SUBST_CLASSES+=                destdir
+SUBST_STAGE.destdir=   pre-install
+SUBST_FILES.destdir=   Config.tmpl
+SUBST_SED.destdir=     -e s,=\"${PREFIX},=\"${DESTDIR}${PREFIX},
+
 pre-configure:
        cd ${WRKSRC}; yes "" | PREFIX=${PREFIX} PKG_SYSCONFDIR=${PKG_SYSCONFDIR} VARBASE=${VARBASE} ./Count-config
 
diff -r 7f39211fbf42 -r 12b3bfd3c5d8 www/wwwcount/PLIST
--- a/www/wwwcount/PLIST        Sun Jun 27 18:00:24 2010 +0000
+++ b/www/wwwcount/PLIST        Sun Jun 27 19:16:03 2010 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 22:00:41 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2010/06/27 19:16:03 joerg Exp $
 bin/mkstrip
 bin/extdgts
 libdata/wwwcount/digits/A/peng.gif
@@ -16,7 +16,6 @@
 libdata/wwwcount/digits/cdr/strip.gif
 libdata/wwwcount/digits/mkstrip.sh
 libdata/wwwcount/rgb.txt
-libdata/wwwcount/sample.dat
 libexec/cgi-bin/Count.cgi
 share/doc/wwwcount/blues.gif
 share/doc/wwwcount/index.html
diff -r 7f39211fbf42 -r 12b3bfd3c5d8 www/wwwcount/distinfo
--- a/www/wwwcount/distinfo     Sun Jun 27 18:00:24 2010 +0000
+++ b/www/wwwcount/distinfo     Sun Jun 27 19:16:03 2010 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2006/07/19 19:48:21 jlam Exp $
+$NetBSD: distinfo,v 1.6 2010/06/27 19:16:03 joerg Exp $
 
 SHA1 (wwwcount2.5.tar.gz) = 374babfc93db3092eda13bda5fd65a372beca4bb
 RMD160 (wwwcount2.5.tar.gz) = 354c92ab5e0f8ec2acd484108fa968a5bfb6e62a
 Size (wwwcount2.5.tar.gz) = 441215 bytes
 SHA1 (patch-aa) = 2c1db53763365a08e32e9724efd3148994af9963
 SHA1 (patch-ab) = f6f71b1428506ab565f127c38096b65408f5bc53
-SHA1 (patch-ae) = e950e48c2f9a8f3da27c8b51267a52d7a7bd704e
+SHA1 (patch-ae) = ab0d799eaf0a49eebace0ad200d53bee3ac6cee9
diff -r 7f39211fbf42 -r 12b3bfd3c5d8 www/wwwcount/patches/patch-ae
--- a/www/wwwcount/patches/patch-ae     Sun Jun 27 18:00:24 2010 +0000
+++ b/www/wwwcount/patches/patch-ae     Sun Jun 27 19:16:03 2010 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.4 1999/12/12 08:46:01 rh Exp $
+$NetBSD: patch-ae,v 1.5 2010/06/27 19:16:03 joerg Exp $
 
---- Count-install.orig Mon May 17 03:01:50 1999
-+++ Count-install      Sun Dec 12 09:45:45 1999
+--- Count-install.orig 1999-05-17 01:01:50.000000000 +0000
++++ Count-install
 @@ -13,7 +13,6 @@
  # Nov 24, 1995
  ##
@@ -10,7 +10,7 @@
  INSTALL_PROG="./install-sh"
  Tmpl="./Config.tmpl"
  Binary="./bin/Count.cgi"
-@@ -28,8 +27,6 @@
+@@ -28,8 +27,6 @@ Digit_cdd="./data/digits/cdd"
  Digit_bang="./data/digits/bang"
  Rgbfile="./data/rgb.txt"
  SAMPLE_DAT="./data/data/sample.dat"
@@ -19,7 +19,7 @@
  
  UserId="nobody"
  userid_flag=0
-@@ -115,20 +112,6 @@
+@@ -115,20 +112,6 @@ fi
  
  . $Tmpl
  
@@ -40,7 +40,7 @@
  tdir="./tmp"
  
  if [ ! -d $tdir ]; then
-@@ -197,7 +180,6 @@
+@@ -197,7 +180,6 @@ anything else.
  
  cgi-bin directory   = $CGIBIN_DIR
  conf directory      = $CONFIG_DIR
@@ -48,7 +48,7 @@
  digit directory     = $DIGIT_DIR
  data directory      = $DATA_DIR
  log directory       = $LOG_DIR
-@@ -212,7 +194,7 @@
+@@ -212,7 +194,7 @@ read answer
  
  if [ .$answer = . ]
  then
@@ -57,7 +57,7 @@
  fi
      until [ $answer = "y" -o $answer = "Y" -o $answer = "n" -o $answer = "N" ]
      do
-@@ -253,7 +235,7 @@
+@@ -253,7 +235,7 @@ echo $n "*Do you know the user and group
     read answer
     if [ .$answer = . ]
     then
@@ -66,7 +66,7 @@
     fi   
     until [ $answer = "y" -o $answer = "Y" -o $answer = "n" -o $answer = "N" ]
     do
-@@ -272,11 +254,11 @@
+@@ -272,11 +254,11 @@ echo $n "*Do you know the user and group
  ###
  # enter user id -starts
  ###
@@ -80,7 +80,7 @@
     fi
     until [ $answer != "x" ]
     do
-@@ -296,11 +278,11 @@
+@@ -296,11 +278,11 @@ echo $n "*Do you know the user and group
  ##
  # enter groud id -starts
  ##
@@ -94,7 +94,7 @@
     fi
     until [ $answer != "x" ]
     do
-@@ -318,47 +300,18 @@
+@@ -318,47 +300,18 @@ echo $n "*Do you know the user and group
  # enter groud id -ends
  ##
  echo "installing Count.cgi->$CGIBIN_DIR"
@@ -105,10 +105,12 @@
 -#
 -# check if the file exist or not
 -#
--
++#echo "installing sample datafile $SAMPLE_DAT->$RGB_DIR"
++#$INSTALL_PROG -c -o $UserId -g $GroupId -m 664 $SAMPLE_DAT $RGB_DIR/sample.dat
+ 
 -if [ ! -f $CONFIG_DIR/$CONFIG_FILE ]; then
-+echo "installing sample datafile $SAMPLE_DAT->$RGB_DIR"
-+$INSTALL_PROG -c -o $UserId -g $GroupId -m 664 $SAMPLE_DAT $RGB_DIR/sample.dat
++echo "installing rgb.txt->$RGB_DIR"
++$INSTALL_PROG -c -m 644 $Rgbfile $RGB_DIR/rgb.txt
  
 -    $INSTALL_PROG -c -m 664 $CONFIG_FILE $CONFIG_DIR/$CONFIG_FILE
 -else
@@ -119,9 +121,7 @@
 -    echo " $INSTALL_PROG -c -m 664 $CONFIG_FILE $CONFIG_DIR/$CONFIG_FILE"
 -      echo ""
 -fi
-+echo "installing rgb.txt->$RGB_DIR"
-+$INSTALL_PROG -c -m 644 $Rgbfile $RGB_DIR/rgb.txt
- 
+-
 -echo "installing sample datafile $SAMPLE_DAT->$DATA_DIR"
 -
 -if [ ! -f $DATA_DIR/sample.dat ]; then
@@ -145,13 +145,13 @@
 -chgrp $GroupId $LOG_DIR
 -chmod 775 $LOG_DIR
 +echo "installing $LOG_FILE->$LOG_DIR"
-+touch $LOG_DIR/$LOG_FILE
-+chmod 644 $LOG_DIR/$LOG_FILE
-+chown $UserId.$GroupId $LOG_DIR/$LOG_FILE
++#touch $LOG_DIR/$LOG_FILE
++#chmod 644 $LOG_DIR/$LOG_FILE
++#chown $UserId.$GroupId $LOG_DIR/$LOG_FILE
  
  echo "installing image strip for digit style A->$DIGIT_DIR/A"
  $INSTALL_PROG -c -m 644 $DigitA/strip.gif $DIGIT_DIR/A/strip.gif
-@@ -400,18 +353,6 @@
+@@ -400,18 +353,6 @@ $INSTALL_PROG -c -m 644 $Digit_cdd/strip
  echo "installing strip image for digit style bang->$DIGIT_DIR/bang"
  $INSTALL_PROG -c -m 644 $Digit_bang/strip.gif $DIGIT_DIR/bang/strip.gif
  
@@ -170,7 +170,7 @@
          ;;
          n|N)
  cat <<EOM
-@@ -424,17 +365,16 @@
+@@ -424,17 +365,16 @@ cat <<EOM
  
  EOM
  echo "installing Count.cgi->$CGIBIN_DIR"
@@ -194,13 +194,13 @@
  
  echo "installing image strip for digit style A->$DIGIT_DIR/A"
  $INSTALL_PROG -c $DigitA/strip.gif $DIGIT_DIR/A/strip.gif
-@@ -474,9 +414,6 @@
- 
+@@ -475,9 +415,6 @@ $INSTALL_PROG -c $Digit_cdd/strip.gif $D
  echo "installing strip image for digit style bang->$DIGIT_DIR/bang"
  $INSTALL_PROG -c $Digit_bang/strip.gif $DIGIT_DIR/bang/strip.gif
--
+ 
 -echo "installing the mirroring script"
 -$INSTALL_PROG -c $mirror_script $BASE_DIR/$mirror_file
- 
+-
      ;;
          *)
+    esac
Prev by Date: [pkgsrc/trunk]: pkgsrc/net add and enable p5-Net-SMTP-TLS
Next by Date: [pkgsrc/trunk]: pkgsrc/devel/p5-Moose Update p5-Moose from version 0.95 to ve...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/net add and enable p5-Net-SMTP-TLS
Next by Thread: [pkgsrc/trunk]: pkgsrc/devel/p5-Moose Update p5-Moose from version 0.95 to ve...
Indexes:
Home | Main Index | Thread Index | Old Index