pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/print - Set myself as MAINTAINER



details:   https://anonhg.NetBSD.org/pkgsrc/rev/11d059a52c9f
branches:  trunk
changeset: 480331:11d059a52c9f
user:      martti <martti%pkgsrc.org@localhost>
date:      Mon Sep 06 10:44:44 2004 +0000

description:
- Set myself as MAINTAINER
- PKG_SYSCONFDIR fixes
- Add lib/liblpr.so* to PLIST
- Run checkpc before starting the printer daemon

diffstat:

 print/LPRng-core/DEINSTALL      |  25 +++++++++++++++++++++----
 print/LPRng-core/INSTALL        |  28 ++++++++++++++++++++++++----
 print/LPRng-core/MESSAGE        |   9 ++++-----
 print/LPRng-core/Makefile       |  15 +++++++++------
 print/LPRng-core/PLIST          |   5 ++++-
 print/LPRng-core/files/LPRng.sh |   3 ++-
 print/LPRng-doc/Makefile        |   4 ++--
 print/LPRng/Makefile            |   4 ++--
 8 files changed, 68 insertions(+), 25 deletions(-)

diffs (271 lines):

diff -r 5d568b6c1c66 -r 11d059a52c9f print/LPRng-core/DEINSTALL
--- a/print/LPRng-core/DEINSTALL        Mon Sep 06 08:21:59 2004 +0000
+++ b/print/LPRng-core/DEINSTALL        Mon Sep 06 10:44:44 2004 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: DEINSTALL,v 1.2 2003/08/30 20:23:01 jlam Exp $
+# $NetBSD: DEINSTALL,v 1.3 2004/09/06 10:44:44 martti Exp $
 
 PKGNAME=$1
 STAGE=$2
@@ -10,7 +10,7 @@
 RM="@RM@"
 
 SAMPLECONFDIR=${PKG_PREFIX}/share/examples/LPRng
-CONFDIR=/etc
+CONFDIR="@PKG_SYSCONFDIR@"
 CONFFILES="lpd.conf lpd.perms"
 NONCONFFILES="printcap"
 
@@ -19,7 +19,16 @@
        # Remove configuration files if they don't differ from the default
        # config file.
        #
-       for file in ${CONFFILES} ${NONCONFFILES}
+       for file in ${CONFFILES}
+       do
+               FILE=${CONFDIR}/lpd/${file}
+               SAMPLEFILE=${SAMPLECONFDIR}/${file}.example
+               if ${CMP} -s ${FILE} ${SAMPLEFILE}
+               then
+                       ${RM} -f ${FILE}
+               fi
+       done
+       for file in ${NONCONFFILES}
        do
                FILE=${CONFDIR}/${file}
                SAMPLEFILE=${SAMPLECONFDIR}/${file}.example
@@ -32,7 +41,15 @@
 
 POST-DEINSTALL)
        modified_files=''
-       for file in ${CONFFILES} ${NONCONFFILES}
+       for file in ${CONFFILES}
+       do
+               FILE=${CONFDIR}/lpd/${file}
+               if [ -f ${FILE} ]
+               then
+                       modified_files="${modified_files} ${FILE}"
+               fi
+       done
+       for file in ${NONCONFFILES}
        do
                FILE=${CONFDIR}/${file}
                if [ -f ${FILE} ]
diff -r 5d568b6c1c66 -r 11d059a52c9f print/LPRng-core/INSTALL
--- a/print/LPRng-core/INSTALL  Mon Sep 06 08:21:59 2004 +0000
+++ b/print/LPRng-core/INSTALL  Mon Sep 06 10:44:44 2004 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $NetBSD: INSTALL,v 1.2 2003/08/30 20:23:01 jlam Exp $
+# $NetBSD: INSTALL,v 1.3 2004/09/06 10:44:44 martti Exp $
 
 PKGNAME=$1
 STAGE=$2
@@ -8,16 +8,31 @@
 CAT="@CAT@"
 CHMOD="@CHMOD@"
 CP="@CP@"
+MKDIR="@MKDIR@"
 
 SAMPLECONFDIR=${PKG_PREFIX}/share/examples/LPRng
-CONFDIR=/etc
+CONFDIR="@PKG_SYSCONFDIR@"
 CONFFILES="lpd.conf lpd.perms"
 NONCONFFILES="printcap"
 
 case ${STAGE} in
 POST-INSTALL)
        echo "Installing configuration files:"
-       for file in ${CONFFILES} ${NONCONFFILES}
+       ${MKDIR} ${CONFDIR}/lpd
+       for file in ${CONFFILES}
+       do
+               FILE=${CONFDIR}/lpd/${file}
+               SAMPLEFILE=${SAMPLECONFDIR}/${file}.example
+               if [ -f ${FILE} ]
+               then
+                       echo "    ${FILE} already exists"
+               else
+                       echo "    ${FILE}"
+                       ${CP} ${SAMPLEFILE} ${FILE}
+                       ${CHMOD} 644 ${FILE}
+               fi
+       done
+       for file in ${NONCONFFILES}
        do
                FILE=${CONFDIR}/${file}
                SAMPLEFILE=${SAMPLECONFDIR}/${file}.example
@@ -36,7 +51,12 @@
 Some files you might need to customize include the following:
 
 EOF
-       for file in ${CONFFILES} ${NONCONFFILES}
+       for file in ${CONFFILES}
+       do
+               FILE=${CONFDIR}/lpd/${file}
+               echo "  ${FILE}"
+       done
+       for file in ${NONCONFFILES}
        do
                FILE=${CONFDIR}/${file}
                echo "  ${FILE}"
diff -r 5d568b6c1c66 -r 11d059a52c9f print/LPRng-core/MESSAGE
--- a/print/LPRng-core/MESSAGE  Mon Sep 06 08:21:59 2004 +0000
+++ b/print/LPRng-core/MESSAGE  Mon Sep 06 10:44:44 2004 +0000
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2001/10/31 23:27:26 zuntum Exp $
+$NetBSD: MESSAGE,v 1.2 2004/09/06 10:44:44 martti Exp $
 
 To activate the LPRng printing system do the following:
 
@@ -10,10 +10,9 @@
 
 Note that LPRng uses:
 
-       /etc/printcap
-       /etc/lpd_printcap
-       /etc/lpd.conf
-       /etc/lpd.perms
+       ${PKG_SYSCONFDIR}/etc/printcap
+       ${PKG_SYSCONFDIR}/etc/lpd/lpd.conf
+       ${PKG_SYSCONFDIR}/etc/lpd/lpd.perms
 
 Simple example configuration files are found at:
 
diff -r 5d568b6c1c66 -r 11d059a52c9f print/LPRng-core/Makefile
--- a/print/LPRng-core/Makefile Mon Sep 06 08:21:59 2004 +0000
+++ b/print/LPRng-core/Makefile Mon Sep 06 10:44:44 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/05/21 13:44:29 adam Exp $
+# $NetBSD: Makefile,v 1.11 2004/09/06 10:44:44 martti Exp $
 # FreeBSD Id: Makefile,v 1.5 1998/10/21 00:57:27 steve Exp
 
 DISTNAME=      LPRng-3.8.27
@@ -9,7 +9,7 @@
                http://lprng.sourceforge.net/DISTRIB/LPRng/
 EXTRACT_SUFX=  .tgz
 
-MAINTAINER=    tech-pkg%NetBSD.org@localhost
+MAINTAINER=    martti%NetBSD.org@localhost
 HOMEPAGE=      http://www.lprng.com/
 COMMENT=       Enhanced Printer Spooler
 
@@ -19,7 +19,7 @@
 USE_LIBTOOL=           yes
 LTCONFIG_OVERRIDE=     ${WRKSRC}/ltconfig
 GNU_CONFIGURE=         yes
-CONFIGURE_ARGS+=       --sysconfdir="/etc"
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=       --with-lpd_perms_path="${LPD_PERMS_PATH}"
 CONFIGURE_ARGS+=       --with-lpd_printcap_path="${LPD_PRINTCAP_PATH}"
 CONFIGURE_ARGS+=       --with-printcap_path="${PRINTCAP_PATH}"
@@ -42,9 +42,9 @@
 
 # Look for printer configuration files firstly in /etc, then ${PREFIX}/etc.
 #
-LPD_PERMS_PATH=                /etc/lpd.perms:${PREFIX}/etc/lpd.perms
-LPD_PRINTCAP_PATH=     /etc/lpd_printcap:${PREFIX}/etc/lpd_printcap
-PRINTCAP_PATH=         /etc/printcap:${PREFIX}/etc/printcap
+LPD_PERMS_PATH=                ${PKG_SYSCONFDIR}/lpd/lpd.perms
+LPD_PRINTCAP_PATH=     ${PKG_SYSCONFDIR}/printcap
+PRINTCAP_PATH=         ${PKG_SYSCONFDIR}/printcap
 FILTER_DIR=            ${PREFIX}/libexec/LPRng
 FILTER_LD_PATH=                /usr/lib:${PREFIX}/lib:/usr/local/lib
 FILTER_PATH=           ${FILTER_DIR}:/sbin:/usr/sbin:/bin:/usr/bin:${PREFIX}/sbin:${PREFIX}/bin:/usr/local/sbin:/usr/local/bin
@@ -60,8 +60,10 @@
 FILES_SUBST+=          CHMOD=${CHMOD:Q}
 FILES_SUBST+=          CMP=${CMP:Q}
 FILES_SUBST+=          CP=${CP:Q}
+FILES_SUBST+=          MKDIR=${MKDIR:Q}
 FILES_SUBST+=          RM=${RM:Q}
 FILES_SUBST+=          TRUE=${TRUE:Q}
+FILES_SUBST+=          PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
 FILES_SUBST_SED=       ${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/}
 
 pre-patch:
@@ -73,6 +75,7 @@
                -e "s,@LPD_PRINTCAP_PATH@,${LPD_PRINTCAP_PATH},g" \
                -e "s,@LPD_PERMS_PATH@,${LPD_PERMS_PATH},g" \
                -e "s,@PRINTCAP_PATH@,${PRINTCAP_PATH},g" \
+               -e "s,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g" \
                < ${WRKSRC}/man/lpd.conf.n.in > ${WRKSRC}/man/lpd.conf.n
 
 pre-install:
diff -r 5d568b6c1c66 -r 11d059a52c9f print/LPRng-core/PLIST
--- a/print/LPRng-core/PLIST    Mon Sep 06 08:21:59 2004 +0000
+++ b/print/LPRng-core/PLIST    Mon Sep 06 10:44:44 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2004/05/21 13:44:29 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/09/06 10:44:44 martti Exp $
 bin/cancel
 bin/lp
 bin/lpq
@@ -8,6 +8,9 @@
 etc/rc.d/LPRng
 lib/liblpr.a
 lib/liblpr.la
+lib/liblpr.so
+lib/liblpr.so.0
+lib/liblpr.so.0.0
 libexec/LPRng/lpbanner
 libexec/LPRng/lpf
 libexec/LPRng/pclbanner
diff -r 5d568b6c1c66 -r 11d059a52c9f print/LPRng-core/files/LPRng.sh
--- a/print/LPRng-core/files/LPRng.sh   Mon Sep 06 08:21:59 2004 +0000
+++ b/print/LPRng-core/files/LPRng.sh   Mon Sep 06 10:44:44 2004 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: LPRng.sh,v 1.2 2001/01/11 00:31:50 jlam Exp $
+# $NetBSD: LPRng.sh,v 1.3 2004/09/06 10:44:44 martti Exp $
 #
 # PROVIDE: lpd
 # REQUIRE: DAEMON
@@ -23,6 +23,7 @@
        if [ "$pid" = "" -a -x ${command} ]
        then
                echo "Starting LPRng."
+               @PREFIX@/sbin/checkpc -f
                ${command}
        fi
        ;;
diff -r 5d568b6c1c66 -r 11d059a52c9f print/LPRng-doc/Makefile
--- a/print/LPRng-doc/Makefile  Mon Sep 06 08:21:59 2004 +0000
+++ b/print/LPRng-doc/Makefile  Mon Sep 06 10:44:44 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/04/24 22:46:11 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2004/09/06 10:44:44 martti Exp $
 # FreeBSD Id: Makefile,v 1.5 1998/10/21 00:57:27 steve Exp
 #
 
@@ -8,7 +8,7 @@
 MASTER_SITES=  ftp://ftp.astart.com/pub/LPRng/LPRng/
 EXTRACT_SUFX=  .tgz
 
-MAINTAINER=    tech-pkg%NetBSD.org@localhost
+MAINTAINER=    martti%NetBSD.org@localhost
 HOMEPAGE=      http://www.lprng.com/
 COMMENT=       LPRng documentation in dvi, text, html and ps formats
 
diff -r 5d568b6c1c66 -r 11d059a52c9f print/LPRng/Makefile
--- a/print/LPRng/Makefile      Mon Sep 06 08:21:59 2004 +0000
+++ b/print/LPRng/Makefile      Mon Sep 06 10:44:44 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/05/21 13:46:50 adam Exp $
+# $NetBSD: Makefile,v 1.12 2004/09/06 10:44:44 martti Exp $
 # FreeBSD Id: Makefile,v 1.5 1998/10/21 00:57:27 steve Exp
 
 DISTNAME=      LPRng-3.6.26
@@ -6,7 +6,7 @@
 MASTER_SITES=  # empty
 DISTFILES=     # empty
 
-MAINTAINER=    tech-pkg%NetBSD.org@localhost
+MAINTAINER=    martti%NetBSD.org@localhost
 HOMEPAGE=      http://www.lprng.com/
 COMMENT=       "meta-package" for LPRng, Enhanced Printer Spooler
 



Home | Main Index | Thread Index | Old Index