pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Fixed warnings found by pkglint -Wall.
details: https://anonhg.NetBSD.org/pkgsrc/rev/db94656b12f4
branches: trunk
changeset: 508268:db94656b12f4
user: martti <martti%pkgsrc.org@localhost>
date: Fri Feb 17 07:55:57 2006 +0000
description:
Fixed warnings found by pkglint -Wall.
diffstat:
print/LPRng-core/Makefile | 46 +++++++++++++++++++++---------------------
print/LPRng-doc/Makefile | 11 +++++----
sysutils/xenconsole/Makefile | 36 ++++++++++++++++----------------
sysutils/xenconsole/PLIST | 4 +-
wm/fvwm2/Makefile | 48 ++++++++++++++++++++++----------------------
www/jalbum/Makefile | 16 +++++++-------
x11/xfce3/Makefile | 8 +++---
x11/xpmroot/Makefile | 14 ++++++------
8 files changed, 92 insertions(+), 91 deletions(-)
diffs (truncated from 368 to 300 lines):
diff -r ba3e1fbec5de -r db94656b12f4 print/LPRng-core/Makefile
--- a/print/LPRng-core/Makefile Fri Feb 17 07:43:36 2006 +0000
+++ b/print/LPRng-core/Makefile Fri Feb 17 07:55:57 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/02/05 23:10:35 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2006/02/17 08:10:44 martti Exp $
DISTNAME= LPRng-3.8.28
PKGNAME= LPRng-core-3.8.28
@@ -17,7 +17,7 @@
USE_TOOLS+= chgrp chown gmake
USE_LIBTOOL= yes
-LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
+LTCONFIG_OVERRIDE+= ${WRKSRC:Q}/ltconfig
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
CONFIGURE_ARGS+= --with-lpd_perms_path=${LPD_PERMS_PATH:Q}
@@ -33,16 +33,16 @@
# Look for printer configuration files firstly in /etc, then ${PREFIX}/etc.
#
-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
+LPD_PERMS_PATH= ${PKG_SYSCONFDIR:Q}/lpd/lpd.perms
+LPD_PRINTCAP_PATH= ${PKG_SYSCONFDIR:Q}/printcap
+PRINTCAP_PATH= ${PKG_SYSCONFDIR:Q}/printcap
+FILTER_DIR= ${PREFIX:Q}/libexec/LPRng
+FILTER_LD_PATH= /usr/lib:${PREFIX:Q}/lib:/usr/local/lib
+FILTER_PATH= ${FILTER_DIR}:/sbin:/usr/sbin:/bin:/usr/bin:${PREFIX:Q}/sbin:${PREFIX:Q}/bin:/usr/local/sbin:/usr/local/bin
MAKE_ENV+= POSTINSTALL="NO"
-EXAMPLESDIR= ${PREFIX}/share/examples/LPRng
+EXAMPLESDIR= ${PREFIX:Q}/share/examples/LPRng
DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
RCD_SCRIPTS= LPRng
@@ -55,29 +55,29 @@
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!@/}
+FILES_SUBST_SED+= ${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/}
pre-patch:
- ${MV} ${WRKSRC}/man/lpd.conf.n ${WRKSRC}/man/lpd.conf.n.in
+ ${MV} ${WRKSRC:Q}/man/lpd.conf.n ${WRKSRC:Q}/man/lpd.conf.n.in
post-configure:
- ${SED} -e "s,@FILTER_LD_PATH@,${FILTER_LD_PATH},g" \
- -e "s,@FILTER_PATH@,${FILTER_PATH},g" \
- -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
+ ${SED} -e "s,@FILTER_LD_PATH@,${FILTER_LD_PATH:Q},g" \
+ -e "s,@FILTER_PATH@,${FILTER_PATH:Q},g" \
+ -e "s,@LPD_PRINTCAP_PATH@,${LPD_PRINTCAP_PATH:Q},g" \
+ -e "s,@LPD_PERMS_PATH@,${LPD_PERMS_PATH:Q},g" \
+ -e "s,@PRINTCAP_PATH@,${PRINTCAP_PATH:Q},g" \
+ -e "s,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR:Q},g" \
+ < ${WRKSRC:Q}/man/lpd.conf.n.in > ${WRKSRC:Q}/man/lpd.conf.n
pre-install:
- ${SED} -e "s,@PREFIX@,${PREFIX},g" \
- < ${FILESDIR}/LPRng.sh > ${WRKDIR}/LPRng.sh
+ ${SED} -e "s,@PREFIX@,${PREFIX:Q},g" \
+ < ${FILESDIR:Q}/LPRng.sh > ${WRKDIR:Q}/LPRng.sh
post-install:
- ${INSTALL_DATA_DIR} ${EXAMPLESDIR}
+ ${INSTALL_DATA_DIR} ${EXAMPLESDIR:Q}
for file in lpd.conf lpd.perms printcap; do \
- ${INSTALL_DATA} ${WRKSRC}/$${file} \
- ${EXAMPLESDIR}/$${file}.example; \
+ ${INSTALL_DATA} ${WRKSRC:Q}/$${file} \
+ ${EXAMPLESDIR:Q}/$${file}.example; \
done
.include "../../mk/bsd.pkg.mk"
diff -r ba3e1fbec5de -r db94656b12f4 print/LPRng-doc/Makefile
--- a/print/LPRng-doc/Makefile Fri Feb 17 07:43:36 2006 +0000
+++ b/print/LPRng-doc/Makefile Fri Feb 17 07:55:57 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/06/16 05:38:00 martti Exp $
+# $NetBSD: Makefile,v 1.14 2006/02/17 08:11:58 martti Exp $
DISTNAME= LPRng_DOC-3.6.13
PKGNAME= LPRng-doc-3.6.13
@@ -15,9 +15,10 @@
NO_BUILD= yes
do-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/LPRng
- cd ${WRKDIR} && ${PAX} -O -zrf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}
- cd ${WRKSRC} && \
- ${PAX} -rw *.dvi *.gif *.html *.ps *.txt ${PREFIX}/share/doc/LPRng
+ ${INSTALL_DATA_DIR} ${PREFIX:Q}/share/doc/LPRng
+ cd ${WRKDIR:Q} && \
+ ${PAX} -O -zrf ${DISTDIR:Q}/${DISTNAME:Q}${EXTRACT_SUFX:Q}
+ cd ${WRKSRC:Q} && \
+ ${PAX} -rw *.dvi *.gif *.html *.ps *.txt ${PREFIX:Q}/share/doc/LPRng
.include "../../mk/bsd.pkg.mk"
diff -r ba3e1fbec5de -r db94656b12f4 sysutils/xenconsole/Makefile
--- a/sysutils/xenconsole/Makefile Fri Feb 17 07:43:36 2006 +0000
+++ b/sysutils/xenconsole/Makefile Fri Feb 17 07:55:57 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/12/29 06:22:19 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2006/02/17 07:55:57 martti Exp $
DISTNAME= xenConsole-r0.15b1-1
PKGNAME= xenconsole-0.15b1.1
@@ -9,7 +9,7 @@
HOMEPAGE= http://ucck.sourceforge.net/xenConsole/
COMMENT= Console monitor for Xen
-WRKSRC= ${WRKDIR}/xenConsole
+WRKSRC= ${WRKDIR:Q}/xenConsole
DEPENDS+= p5-Config-IniFiles>=2.38:../../devel/p5-Config-IniFiles
DEPENDS+= p5-Curses-UI>=0.95:../../devel/p5-Curses-UI
@@ -24,34 +24,34 @@
SUBST_CLASSES+= xenconsole
SUBST_STAGE.xenconsole= pre-configure
-SUBST_MESSAGE.xenconsole= "Fixing paths."
+SUBST_MESSAGE.xenconsole= Fixing paths.
SUBST_FILES.xenconsole= xcon.pl xen_list.pm
-SUBST_SED.xenconsole= -e "s,@PREFIX@,${PREFIX},g"
-SUBST_SED.xenconsole+= -e "s,@LOCALBASE@,${LOCALBASE},g"
+SUBST_SED.xenconsole= -e s,@PREFIX@,${PREFIX:Q},g
+SUBST_SED.xenconsole+= -e s,@LOCALBASE@,${LOCALBASE:Q},g
-REPLACE_PERL= xcon.pl xsnmp.pm
+REPLACE_PERL+= xcon.pl xsnmp.pm
-EGDIR= ${PREFIX}/share/examples/xenconsole
-CONF_FILES= ${EGDIR}/xcon.ini ${PKG_SYSCONFDIR}/xcon.ini
+EGDIR= ${PREFIX:Q}/share/examples/xenconsole
+CONF_FILES= ${EGDIR:Q}/xcon.ini ${PKG_SYSCONFDIR:Q}/xcon.ini
do-build:
- ${SED} -e "s,@PREFIX@,${PREFIX},g" \
- < ${FILESDIR}/xcon.sh > ${WRKDIR}/xcon
+ ${SED} -e "s,@PREFIX@,${PREFIX:Q},g" \
+ < ${FILESDIR:Q}/xcon.sh > ${WRKDIR:Q}/xcon
do-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/xenconsole
- (cd ${WRKSRC} && ${PAX} -rw *.pm */*.pm ${PREFIX}/share/xenconsole)
- ${INSTALL_SCRIPT} ${WRKSRC}/xcon.pl ${PREFIX}/share/xenconsole/xcon
+ ${INSTALL_DATA_DIR} ${PREFIX:Q}/share/xenconsole
+ (cd ${WRKSRC:Q} && ${PAX} -rw *.pm */*.pm ${PREFIX:Q}/share/xenconsole)
+ ${INSTALL_SCRIPT} ${WRKSRC:Q}/xcon.pl ${PREFIX:Q}/share/xenconsole/xcon
# Configuration file
- ${INSTALL_DATA_DIR} ${EGDIR}
- ${INSTALL_DATA} ${WRKSRC}/sample-inifile ${EGDIR}/xcon.ini
+ ${INSTALL_DATA_DIR} ${EGDIR:Q}
+ ${INSTALL_DATA} ${WRKSRC:Q}/sample-inifile ${EGDIR:Q}/xcon.ini
# Documentation
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xenconsole
- (cd ${WRKSRC} && ${PAX} -rw *.txt ${PREFIX}/share/doc/xenconsole)
+ ${INSTALL_DATA_DIR} ${PREFIX:Q}/share/doc/xenconsole
+ (cd ${WRKSRC:Q} && ${PAX} -rw *.txt ${PREFIX:Q}/share/doc/xenconsole)
# Launcher script
- ${INSTALL_SCRIPT} ${WRKDIR}/xcon ${PREFIX}/bin/xcon
+ ${INSTALL_SCRIPT} ${WRKDIR:Q}/xcon ${PREFIX:Q}/bin/xcon
.include "../../mk/bsd.pkg.mk"
diff -r ba3e1fbec5de -r db94656b12f4 sysutils/xenconsole/PLIST
--- a/sysutils/xenconsole/PLIST Fri Feb 17 07:43:36 2006 +0000
+++ b/sysutils/xenconsole/PLIST Fri Feb 17 07:55:57 2006 +0000
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/11/13 18:36:00 martti Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/02/17 07:55:57 martti Exp $
bin/xcon
-share/examples/xenconsole/xcon.ini
share/doc/xenconsole/CHANGES.txt
share/doc/xenconsole/README.txt
share/doc/xenconsole/TODO.txt
+share/examples/xenconsole/xcon.ini
share/xenconsole/colours.pm
share/xenconsole/gothix/capstderr.pm
share/xenconsole/gothix/cpusage.pm
diff -r ba3e1fbec5de -r db94656b12f4 wm/fvwm2/Makefile
--- a/wm/fvwm2/Makefile Fri Feb 17 07:43:36 2006 +0000
+++ b/wm/fvwm2/Makefile Fri Feb 17 07:55:57 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2006/02/05 23:11:13 joerg Exp $
+# $NetBSD: Makefile,v 1.47 2006/02/17 08:00:00 martti Exp $
DISTNAME= fvwm-${FVWM_VER}
PKGNAME= fvwm2-${FVWM_VER}
@@ -27,48 +27,48 @@
EVAL_PREFIX+= XPMDIR=xpm
CONFIGURE_ARGS+= --without-gnome
-CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/lib/X11/fvwm2
-CONFIGURE_ARGS+= --libexecdir=${PREFIX}/lib/X11
-CONFIGURE_ARGS+= --with-xpm-includes=${XPMDIR}/include
-CONFIGURE_ARGS+= --with-imagepath=${PREFIX}/lib/X11/fvwm2/pixmaps:${X11BASE}/include/X11/bitmaps:${X11BASE}/include/X11/pixmaps
+CONFIGURE_ARGS+= --sysconfdir=${PREFIX:Q}/lib/X11/fvwm2
+CONFIGURE_ARGS+= --libexecdir=${PREFIX:Q}/lib/X11
+CONFIGURE_ARGS+= --with-xpm-includes=${{XPMDIR:Q}/include
+CONFIGURE_ARGS+= --with-imagepath=${PREFIX:Q}/lib/X11/fvwm2/pixmaps:${X11BASE:Q}/include/X11/bitmaps:${X11BASE:Q}/include/X11/pixmaps
# We don't want to have CPP from the buildlink directory
CONFIGURE_ENV+= ac_cv_path_FVWM_CPP=${CPP:Q}
post-extract:
- ${MKDIR} ${WRKDIR}/icons
- cd ${WRKDIR}/icons && ${TAR} -xzf ${DISTDIR}/fvwm_icons.tgz
+ ${MKDIR} ${WRKDIR:Q}/icons
+ cd ${WRKDIR:Q}/icons && ${TAR} -xzf ${DISTDIR:Q}/fvwm_icons.tgz
post-install:
- @${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/fvwm2/pixmaps
+ @${INSTALL_DATA_DIR} ${PREFIX:Q}/lib/X11/fvwm2/pixmaps
${INSTALL_DATA} \
- ${WRKDIR}/icons/fvwm_icons/*.xpm \
- ${PREFIX}/lib/X11/fvwm2/pixmaps
- ${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/fvwm2
+ ${WRKDIR:Q}/icons/fvwm_icons/*.xpm \
+ ${PREFIX:Q}/lib/X11/fvwm2/pixmaps
+ ${INSTALL_DATA_DIR} ${PREFIX:Q}/lib/X11/fvwm2
${INSTALL_DATA} \
- ${WRKSRC}/sample.fvwmrc/decor_examples \
- ${WRKSRC}/sample.fvwmrc/system.fvwm2rc-sample-* \
- ${PREFIX}/lib/X11/fvwm2
+ ${WRKSRC:Q}/sample.fvwmrc/decor_examples \
+ ${WRKSRC:Q}/sample.fvwmrc/system.fvwm2rc-sample-* \
+ ${PREFIX:Q}/lib/X11/fvwm2
${INSTALL_DATA} \
- ${WRKSRC}/sample.fvwmrc/system.fvwm2rc \
- ${PREFIX}/lib/X11/fvwm2/system.fvwm2rc.example
+ ${WRKSRC:Q}/sample.fvwmrc/system.fvwm2rc \
+ ${PREFIX:Q}/lib/X11/fvwm2/system.fvwm2rc.example
${INSTALL_SCRIPT} \
- ${WRKSRC}/utils/fvwmrc_convert \
- ${PREFIX}/bin/fvwmrc_convert
- if [ ! -f ${PREFIX}/lib/X11/fvwm2/system.fvwm2rc ]; then \
+ ${WRKSRC:Q}/utils/fvwmrc_convert \
+ ${PREFIX:Q}/bin/fvwmrc_convert
+ if [ ! -f ${PREFIX:Q}/lib/X11/fvwm2/system.fvwm2rc ]; then \
${INSTALL_DATA} \
- ${PREFIX}/lib/X11/fvwm2/system.fvwm2rc.example \
- ${PREFIX}/lib/X11/fvwm2/system.fvwm2rc ; \
+ ${PREFIX:Q}/lib/X11/fvwm2/system.fvwm2rc.example \
+ ${PREFIX:Q}/lib/X11/fvwm2/system.fvwm2rc ; \
fi
.include "../../mk/bsd.prefs.mk"
.if defined(FVWM2_USE_GTK) && ${FVWM2_USE_GTK} == "YES"
.include "../../x11/gtk/buildlink3.mk"
-PLIST_SUBST+= GTK=""
+PLIST_SUBST+= GTK=""
.else
-PLIST_SUBST+= GTK="@comment "
-CONFIGURE_ARGS+= --without-gtk-prefix
+PLIST_SUBST+= GTK="@comment "
+CONFIGURE_ARGS+= --without-gtk-prefix
.endif
.if defined(FVWM2_USE_RPLAY) && ${FVWM2_USE_RPLAY} == "YES"
diff -r ba3e1fbec5de -r db94656b12f4 www/jalbum/Makefile
--- a/www/jalbum/Makefile Fri Feb 17 07:43:36 2006 +0000
+++ b/www/jalbum/Makefile Fri Feb 17 07:55:57 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/02/05 23:11:24 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2006/02/17 08:01:31 martti Exp $
DISTNAME= JAlbum6.2
PKGNAME= jalbum-6.2
@@ -15,17 +15,17 @@
USE_JAVA= run
PKG_JVMS_ACCEPTED= blackdown-jdk13 kaffe sun-jdk13 sun-jdk14 sun-jdk15
-WRKSRC= ${WRKDIR}/JAlbum
+WRKSRC= ${WRKDIR:Q}/JAlbum
do-build:
- ${SED} -e "s#@PKG_JAVA_HOME@#${PKG_JAVA_HOME}#g" \
- -e "s#@PREFIX@#${PREFIX}#g" \
- < ${FILESDIR}/jalbum > ${WRKDIR}/jalbum
+ ${SED} -e "s#@PKG_JAVA_HOME@#${PKG_JAVA_HOME:Q}#g" \
+ -e "s#@PREFIX@#${PREFIX:Q}#g" \
+ < ${FILESDIR:Q}/jalbum > ${WRKDIR:Q}/jalbum
do-install:
Home |
Main Index |
Thread Index |
Old Index