pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc Fixed pkglint warnings.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c5ea1cda6be1
branches:  trunk
changeset: 514562:c5ea1cda6be1
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Wed Jun 14 10:30:34 2006 +0000

description:
Fixed pkglint warnings.

diffstat:

 graphics/mgl/Makefile         |  71 +++++++++++++++++++++---------------------
 graphics/vcg/Makefile         |  22 ++++++------
 graphics/vcg/distinfo         |   6 +-
 graphics/vcg/patches/patch-ap |  13 +-------
 print/ghostscript/Makefile    |  34 ++++++++++----------
 5 files changed, 67 insertions(+), 79 deletions(-)

diffs (truncated from 333 to 300 lines):

diff -r 6517285b2372 -r c5ea1cda6be1 graphics/mgl/Makefile
--- a/graphics/mgl/Makefile     Wed Jun 14 10:30:06 2006 +0000
+++ b/graphics/mgl/Makefile     Wed Jun 14 10:30:34 2006 +0000
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.23 2006/04/17 13:46:33 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2006/06/14 10:30:34 rillig Exp $
 #
 
-DISTNAME=       mgl2-alpha-020
-PKGNAME=        mgl-0.2.0a
+DISTNAME=      mgl2-alpha-020
+PKGNAME=       mgl-0.2.0a
 PKGREVISION=   4
-CATEGORIES=     graphics
-MASTER_SITES=   http://at.sakura.ne.jp/~suz/arc/
+CATEGORIES=    graphics
+MASTER_SITES=  http://at.sakura.ne.jp/~suz/arc/
 
-MAINTAINER=     fk200329%fsinet.or.jp@localhost
+MAINTAINER=    fk200329%fsinet.or.jp@localhost
 HOMEPAGE=      http://www.NetBSD.org/Ports/hpcmips/mgl2.html
 COMMENT=       Graphics library for NEC Mobilegear/PocketBSD, NetBSD/hpcmips
 
@@ -41,67 +41,66 @@
 
 post-configure:
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "mipsel"
-       @${MV} -f ${WRKSRC}/conf/config.mk-hpcmips ${WRKSRC}/conf/config.mk.tmp
+       ${MV} -f ${WRKSRC}/conf/config.mk-hpcmips ${WRKSRC}/conf/config.mk.tmp
 .else
-       @${MV} -f ${WRKSRC}/conf/config.mk-netbsd-i386-x ${WRKSRC}/conf/config.mk.tmp
+       ${MV} -f ${WRKSRC}/conf/config.mk-netbsd-i386-x ${WRKSRC}/conf/config.mk.tmp
 .endif
 .if ${OBJECT_FMT} == "a.out"
-       @${SED} -e "s/ELFENV=1/ELFENV=0/" ${WRKSRC}/conf/NetBSD.mk > ${WRKSRC}/conf/NetBSD.mk.tmp
-       @${MV} -f ${WRKSRC}/conf/NetBSD.mk.tmp ${WRKSRC}/conf/NetBSD.mk
-       @${SED} \
+       ${SED} -e "s/ELFENV=1/ELFENV=0/" ${WRKSRC}/conf/NetBSD.mk > ${WRKSRC}/conf/NetBSD.mk.tmp
+       ${MV} -f ${WRKSRC}/conf/NetBSD.mk.tmp ${WRKSRC}/conf/NetBSD.mk
+       ${SED} \
                -e "s@-Wl,-rpath,${PREFIX}/lib@@" \
                ${WRKSRC}/conf/config.mk.tmp > ${WRKSRC}/conf/config.mk
 .else
-       @${MV} -f ${WRKSRC}/conf/config.mk.tmp ${WRKSRC}/conf/config.mk
+       ${MV} -f ${WRKSRC}/conf/config.mk.tmp ${WRKSRC}/conf/config.mk
 .endif
 
 post-install:
 .for i in ${MGLUTILS}
-       @${INSTALL_SCRIPT} ${WRKSRC}/utils/${i} ${PREFIX}/bin/
+       ${INSTALL_SCRIPT} ${WRKSRC}/utils/${i} ${PREFIX}/bin/
        ${CHMOD} +x ${PREFIX}/bin/${i}
 .endfor
        ${LN} -s mglcons.sh ${PREFIX}/bin/start_mgl.sh
 
-       @if ${TEST} -r ${PREFIX}/bin/mglsvrcons; \
-               then ${MV} -f ${PREFIX}/bin/mglsvrcons ${PREFIX}/sbin/; \
-       fi
+       ${TEST} ! -r ${PREFIX}/bin/mglsvrcons                           \
+       || ${MV} -f ${PREFIX}/bin/mglsvrcons ${PREFIX}/sbin/
        # The following three commands are only present on hpcmips:
-       @${TOUCH} ${PREFIX}/sbin/mglcalibrate
-       @${TOUCH} ${PREFIX}/sbin/calibconf
-       @${TOUCH} ${PREFIX}/sbin/calibdata-update
+       ${TOUCH} ${PREFIX}/sbin/mglcalibrate
+       ${TOUCH} ${PREFIX}/sbin/calibconf
+       ${TOUCH} ${PREFIX}/sbin/calibdata-update
        #
-       @${INSTALL_DATA_DIR} ${PREFIX}/share/mgl2
+       ${INSTALL_DATA_DIR} ${PREFIX}/share/mgl2
 .for i in ${MGLFONTUTILS}
-       @${INSTALL_DATA} ${WRKSRC}/bin/${i} ${PREFIX}/share/mgl2
+       ${INSTALL_DATA} ${WRKSRC}/bin/${i} ${PREFIX}/share/mgl2
 .endfor
-       @${RM} -f -r ${PREFIX}/share/doc/mgl2
-       @${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mgl2
-       @${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mgl2/memo
-       @${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mgl2/mgterm
-       @${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mgl2/mil
-       @${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mgl2/nine
-       @${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mgl2/bin
-       @${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mgl2/doc
+       ${RM} -f -r ${PREFIX}/share/doc/mgl2
+       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mgl2
+       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mgl2/memo
+       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mgl2/mgterm
+       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mgl2/mil
+       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mgl2/nine
+       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mgl2/bin
+       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mgl2/doc
 .for i in ${MGLDOCS}
-       @${INSTALL_DATA} ${WRKSRC}/doc/${i} ${PREFIX}/share/doc/mgl2/doc/
+       ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${PREFIX}/share/doc/mgl2/doc/
 .endfor
 .for i in ${MGL2DOCS}
-       @${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/mgl2/
+       ${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/mgl2/
 .endfor
 .for i in ${MGL2MEMOS}
-       @${INSTALL_DATA} ${WRKSRC}/memo/${i} ${PREFIX}/share/doc/mgl2/memo/
+       ${INSTALL_DATA} ${WRKSRC}/memo/${i} ${PREFIX}/share/doc/mgl2/memo/
 .endfor
 .for i in ${BINDOCS}
-       @${INSTALL_DATA} ${WRKSRC}/bin/${i} ${PREFIX}/share/doc/mgl2/bin/
+       ${INSTALL_DATA} ${WRKSRC}/bin/${i} ${PREFIX}/share/doc/mgl2/bin/
 .endfor
 .for i in ${MGTERMDOCS}
-       @${INSTALL_DATA} ${WRKSRC}/mgterm/${i} ${PREFIX}/share/doc/mgl2/mgterm/
+       ${INSTALL_DATA} ${WRKSRC}/mgterm/${i} ${PREFIX}/share/doc/mgl2/mgterm/
 .endfor
 .for i in ${MILDOCS}
-       @${INSTALL_DATA} ${WRKSRC}/mil/${i} ${PREFIX}/share/doc/mgl2/mil/
+       ${INSTALL_DATA} ${WRKSRC}/mil/${i} ${PREFIX}/share/doc/mgl2/mil/
 .endfor
 .for i in ${NINEDOCS}
-       @${INSTALL_DATA} ${WRKSRC}/nine/${i} ${PREFIX}/share/doc/mgl2/nine/
+       ${INSTALL_DATA} ${WRKSRC}/nine/${i} ${PREFIX}/share/doc/mgl2/nine/
 .endfor
 
 .include "../../graphics/jpeg/buildlink3.mk"
diff -r 6517285b2372 -r c5ea1cda6be1 graphics/vcg/Makefile
--- a/graphics/vcg/Makefile     Wed Jun 14 10:30:06 2006 +0000
+++ b/graphics/vcg/Makefile     Wed Jun 14 10:30:34 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/02/23 21:05:02 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2006/06/14 10:32:35 rillig Exp $
 
 DISTNAME=      vcg.1.30.r3.17
 PKGNAME=       vcg-1.30
@@ -16,16 +16,16 @@
 .include "../../mk/x11.buildlink3.mk"
 
 pre-patch:
-       @${MKDIR} ${WRKSRC}/preconf/X11ccNetBSD
-       @${CP} ${FILESDIR}/conf ${WRKSRC}/preconf/X11ccNetBSD
-       @${CP} ${FILESDIR}/demo.csh ${WRKSRC}/preconf/X11ccNetBSD
-       @${CP} ${FILESDIR}/globals.h ${WRKSRC}/preconf/X11ccNetBSD
-       @${CP} ${FILESDIR}/tMakefile ${WRKSRC}/preconf/X11ccNetBSD
-       @${MKDIR} ${WRKSRC}/preconf/X11ccDragonFly
-       @${CP} ${FILESDIR}/conf ${WRKSRC}/preconf/X11ccDragonFly
-       @${CP} ${FILESDIR}/demo.csh ${WRKSRC}/preconf/X11ccDragonFly
-       @${CP} ${FILESDIR}/globals.h ${WRKSRC}/preconf/X11ccDragonFly
-       @${CP} ${FILESDIR}/tMakefile ${WRKSRC}/preconf/X11ccDragonFly
+       ${MKDIR} ${WRKSRC}/preconf/X11ccNetBSD
+       ${CP} ${FILESDIR}/conf ${WRKSRC}/preconf/X11ccNetBSD
+       ${CP} ${FILESDIR}/demo.csh ${WRKSRC}/preconf/X11ccNetBSD
+       ${CP} ${FILESDIR}/globals.h ${WRKSRC}/preconf/X11ccNetBSD
+       ${CP} ${FILESDIR}/tMakefile ${WRKSRC}/preconf/X11ccNetBSD
+       ${MKDIR} ${WRKSRC}/preconf/X11ccDragonFly
+       ${CP} ${FILESDIR}/conf ${WRKSRC}/preconf/X11ccDragonFly
+       ${CP} ${FILESDIR}/demo.csh ${WRKSRC}/preconf/X11ccDragonFly
+       ${CP} ${FILESDIR}/globals.h ${WRKSRC}/preconf/X11ccDragonFly
+       ${CP} ${FILESDIR}/tMakefile ${WRKSRC}/preconf/X11ccDragonFly
 
 post-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/vcg
diff -r 6517285b2372 -r c5ea1cda6be1 graphics/vcg/distinfo
--- a/graphics/vcg/distinfo     Wed Jun 14 10:30:06 2006 +0000
+++ b/graphics/vcg/distinfo     Wed Jun 14 10:30:34 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 08:45:14 agc Exp $
+$NetBSD: distinfo,v 1.4 2006/06/14 10:32:35 rillig Exp $
 
 SHA1 (vcg.1.30.r3.17.tgz) = 03a821b4a0bd9c5584d34882b167672868fe723d
 RMD160 (vcg.1.30.r3.17.tgz) = 4df7ce2ff7d5de253f9e851194a703d64ed4cdc3
@@ -18,5 +18,5 @@
 SHA1 (patch-am) = 7a684e2520448f4cc56b7a3e3b3ec8627370ce78
 SHA1 (patch-an) = 593e624ddbc15869c146dfc6824126b8016527e9
 SHA1 (patch-ao) = ef65b3ce1121b6dbe478c98cec7a26e11e1e8539
-SHA1 (patch-ap) = 5718fe68b37312ff1800c6816fe3c5ef225f952f
-SHA1 (patch-aq) = 93e349fdf915a00ab848a198de21a9f34ae27bb9
+SHA1 (patch-ap) = f439d09a321768ecf9988b77aa1ac28b4c3a0ad7
+SHA1 (patch-aq) = e95f2b1173e2e197fc71860d60f45c223415d946
diff -r 6517285b2372 -r c5ea1cda6be1 graphics/vcg/patches/patch-ap
--- a/graphics/vcg/patches/patch-ap     Wed Jun 14 10:30:06 2006 +0000
+++ b/graphics/vcg/patches/patch-ap     Wed Jun 14 10:30:34 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ap,v 1.2 1999/06/13 12:54:19 sakamoto Exp $
+$NetBSD: patch-ap,v 1.3 2006/06/14 10:32:35 rillig Exp $
 
 --- 1.1        1995/02/18 16:48:19
 +++ Makefile   1995/02/18 17:12:05
@@ -20,14 +20,3 @@
  compare: preconf xcompare xvcg install
        /bin/rm $(PROJECTHOME)/../bin/vcg
        ln -s $(PROJECTHOME)/../bin/xvcg $(PROJECTHOME)/../bin/vcg
---- ./preconf/X11/Imakefile.org        Wed Feb  8 11:48:30 1995
-+++ ./preconf/X11/Imakefile    Thu Jun 12 10:35:35 1997
-@@ -2,7 +2,7 @@
-         DEPLIBS = $(DEPXLIB)
- LOCAL_LIBRARIES = $(XLIB)
- 
--all:
-+all::
-       @ echo "#"
-       @ echo LIBPATH = -L$(USRLIBDIR)
-       @ echo INCLUDES = $(ALLINCLUDES)
diff -r 6517285b2372 -r c5ea1cda6be1 print/ghostscript/Makefile
--- a/print/ghostscript/Makefile        Wed Jun 14 10:30:06 2006 +0000
+++ b/print/ghostscript/Makefile        Wed Jun 14 10:30:34 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/04/23 14:39:33 schwarz Exp $
+# $NetBSD: Makefile,v 1.22 2006/06/14 10:39:01 rillig Exp $
 
 DISTNAME=              ghostscript-${GS_VERS}
 PKGREVISION=           8
@@ -35,7 +35,7 @@
 #
 JPEG_SRCS=             jpegsrc.v6b.tar.gz
 JPEG_WRKSRC=           ${WRKDIR}/jpeg-6b
-SITES_${JPEG_SRCS}=    ftp://ftp.uu.net/graphics/jpeg/ \
+SITES.${JPEG_SRCS}=    ftp://ftp.uu.net/graphics/jpeg/ \
                        ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/3rdparty/
 DISTFILES+=            ${JPEG_SRCS}
 EXTRACT_ONLY+=         ${JPEG_SRCS}
@@ -47,14 +47,14 @@
 
 # PostScript source to decode encrypted PDF files
 PDF_SEC=               pdf_sec.ps
-SITES_${PDF_SEC}=      http://www.ozemail.com.au/~geoffk/pdfencrypt/
+SITES.${PDF_SEC}=      http://www.ozemail.com.au/~geoffk/pdfencrypt/
 DISTFILES+=            ${PDF_SEC}
 
 # Gimp-print/STP drivers for photo-quality inkjet output
 GIMPPRINT=             gimp-print-4.2.0
 GIMPPRINT_SRCS=                ${GIMPPRINT}.tar.gz
 GIMPPRINT_WRKSRC=      ${WRKDIR}/${GIMPPRINT}
-SITES_${GIMPPRINT_SRCS}=       ${MASTER_SITE_SOURCEFORGE:=gimp-print/}
+SITES.${GIMPPRINT_SRCS}=       ${MASTER_SITE_SOURCEFORGE:=gimp-print/}
 DISTFILES+=                    ${GIMPPRINT_SRCS}
 EXTRACT_ONLY+=                 ${GIMPPRINT_SRCS}
 GIMPPRINT_CONFIGURE_ARGS=      ${CONFIGURE_ARGS} --without-gimp --with-ghost
@@ -66,20 +66,20 @@
 HPIJS_GSFILES=         gdevijs.c gdevijs.h
 HPIJS_GSFILES+=                ijs.c ijs.h ijs_client.c ijs_client.h ijs_exec_unix.c
 HPIJS_GSFILES+=                unistd_.h
-SITES_${HPIJS_SRCS}=   ${MASTER_SITE_SOURCEFORGE:=hpinkjet/}
+SITES.${HPIJS_SRCS}=   ${MASTER_SITE_SOURCEFORGE:=hpinkjet/}
 DISTFILES+=            ${HPIJS_SRCS}
 EXTRACT_ONLY+=         ${HPIJS_SRCS}
 HPIJS_CONFIGURE_ARGS=  ${CONFIGURE_ARGS}
 
 # Additional driver for several HP deskjets
 HPDJ_DRV=              hpdj-2.6
-SITES_${HPDJ_DRV}.tar.gz=      ftp://ftp.sbs.de/pub/graphics/ghostscript/pcl3/
+SITES.${HPDJ_DRV}.tar.gz=      ftp://ftp.sbs.de/pub/graphics/ghostscript/pcl3/
 DISTFILES+=            ${HPDJ_DRV}.tar.gz
 EXTRACT_ONLY+=         ${HPDJ_DRV}.tar.gz
 
 # I don't know the primary destribution sites of these drivers....
 DMPRT_DRV=             dmprt-2.01
-SITES_${DMPRT_DRV}.tar.gz=     ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/
+SITES.${DMPRT_DRV}.tar.gz=     ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/
 DISTFILES+=            ${DMPRT_DRV}.tar.gz
 EXTRACT_ONLY+=         ${DMPRT_DRV}.tar.gz
 
@@ -99,31 +99,31 @@
 
 # Alps MD-2000/2010/4000/1300/1500/5000
 MD2000_DRV=            gdevmd2k-0.2a
-SITES_${MD2000_DRV}.tar.gz=    http://plaza26.mbn.or.jp/~higamasa/gdevmd2k/
+SITES.${MD2000_DRV}.tar.gz=    http://plaza26.mbn.or.jp/~higamasa/gdevmd2k/
 DISTFILES+=            ${MD2000_DRV}.tar.gz
 EXTRACT_ONLY+=         ${MD2000_DRV}.tar.gz
 
 # Canon LIPS II+, III, IV; EPSON ESC/Page; NEC NPDL drivers
 LIPS_DRV=              gdevlips-2.3.6
-SITES_${LIPS_DRV}.tar.gz=      http://www.bukka.p.chiba-u.ac.jp/~ohmori/gs/
+SITES.${LIPS_DRV}.tar.gz=      http://www.bukka.p.chiba-u.ac.jp/~ohmori/gs/
 DISTFILES+=            ${LIPS_DRV}.tar.gz
 EXTRACT_ONLY+=         ${LIPS_DRV}.tar.gz
 
 # Ricoh RPDL
 RPDL_DRV=              gdevrpdl
-SITES_${RPDL_DRV}.tar.gz=      http://home.jp.FreeBSD.org/~mita/LOCAL_PORTS/
+SITES.${RPDL_DRV}.tar.gz=      http://home.jp.FreeBSD.org/~mita/LOCAL_PORTS/
 DISTFILES+=            ${RPDL_DRV}.tar.gz
 EXTRACT_ONLY+=         ${RPDL_DRV}.tar.gz
 
 # Kyocera Prescribe
 PRESCR_DRV=            gdevprsc-0.4
-SITES_${PRESCR_DRV}.tar.gz=    ${MASTER_SITE_LOCAL}
+SITES.${PRESCR_DRV}.tar.gz=    ${MASTER_SITE_LOCAL}
 DISTFILES+=            ${PRESCR_DRV}.tar.gz
 EXTRACT_ONLY+=         ${PRESCR_DRV}.tar.gz
 
 # Samsung SmartGDI laser printers
 GDI_DRV=               samsung-gdi-driver
-SITES_${GDI_DRV}.tar.gz=       http://www.linuxprinting.org/download/printing/
+SITES.${GDI_DRV}.tar.gz=       http://www.linuxprinting.org/download/printing/
 DISTFILES+=            ${GDI_DRV}.tar.gz
 EXTRACT_ONLY+=         ${GDI_DRV}.tar.gz
 
@@ -210,14 +210,14 @@
        if [ ! -f ${WRKDIR}/dmp_site.ps.bak ]; then                     \
                ${MV} ${WRKDIR}/dmp_site.ps ${WRKDIR}/dmp_site.ps.bak;  \
        fi
-       ${SED}  -e "s|epsimage\.src|${GSDATADIR}/lib/escp_24.src|g"     \
+       ${SED}  -e "s|epsimage\\.src|${GSDATADIR}/lib/escp_24.src|g"    \
                ${WRKDIR}/dmp_site.ps.bak > ${WRKDIR}/dmp_site.ps



Home | Main Index | Thread Index | Old Index