diff options
author | rillig <rillig@pkgsrc.org> | 2005-12-05 20:49:47 +0000 |
---|---|---|
committer | rillig <rillig@pkgsrc.org> | 2005-12-05 20:49:47 +0000 |
commit | 5ec134d67dbba7a354689af359fb4dd92bc8cbec (patch) | |
tree | dac5b1dd14794d86b061d26b9503adb2552ed3f8 /editors | |
parent | 9d13f62cc158ce4d29412c1798882c83849d448b (diff) | |
download | pkgsrc-5ec134d67dbba7a354689af359fb4dd92bc8cbec.tar.gz |
Fixed pkglint warnings. The warnings are mostly quoting issues, for
example MAKE_ENV+=FOO=${BAR} is changed to MAKE_ENV+=FOO=${BAR:Q}. Some
other changes are outlined in
http://mail-index.netbsd.org/tech-pkg/2005/12/02/0034.html
Diffstat (limited to 'editors')
32 files changed, 71 insertions, 73 deletions
diff --git a/editors/beav/Makefile b/editors/beav/Makefile index b248695de2a..7876e22ba6f 100644 --- a/editors/beav/Makefile +++ b/editors/beav/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/03/24 21:12:53 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:09 rillig Exp $ DISTNAME= beav_1.40-11 PKGNAME= beav-1.40.11 @@ -9,7 +9,7 @@ MAINTAINER= bad@NetBSD.org COMMENT= Binary Editor And Viewer, a full featured binary file editor WRKSRC= ${WRKDIR}/beav-1.40 -MAKE_ENV+= SED="${SED}" +MAKE_ENV+= SED=${SED:Q} pre-patch: ${MV} ${WRKSRC}/beav.1 ${WRKSRC}/beav.1.in diff --git a/editors/bvi/Makefile b/editors/bvi/Makefile index c66fb93ae55..2cbcc242874 100644 --- a/editors/bvi/Makefile +++ b/editors/bvi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/04/11 21:45:40 tv Exp $ +# $NetBSD: Makefile,v 1.21 2005/12/05 20:50:09 rillig Exp $ # DISTNAME= bvi-1.3.2.src @@ -13,7 +13,7 @@ COMMENT= Vi-like editor for binary files WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} GNU_CONFIGURE= YES -MAKE_ENV+= SHELL=${SH} +MAKE_ENV+= SHELL=${SH:Q} PKG_INSTALLATION_TYPES= overwrite pkgviews diff --git a/editors/ce-doc/Makefile b/editors/ce-doc/Makefile index ca546d8918b..5f9d4baee47 100644 --- a/editors/ce-doc/Makefile +++ b/editors/ce-doc/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2005/09/28 20:52:20 rillig Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:09 rillig Exp $ # -.include "../ce/Makefile.common" +.include "../../editors/ce/Makefile.common" PKGNAME= ce-doc-${VERSION} COMMENT+= , documentation diff --git a/editors/ce-x11/Makefile b/editors/ce-x11/Makefile index 5c88a9d389b..be36b9497b7 100644 --- a/editors/ce-x11/Makefile +++ b/editors/ce-x11/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.14 2005/06/01 18:02:45 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:09 rillig Exp $ # -.include "../ce/Makefile.common" +.include "../../editors/ce/Makefile.common" PKGNAME= ce-x11-${VERSION} COMMENT+= , X11 version diff --git a/editors/ed/Makefile b/editors/ed/Makefile index 2ed8204804d..252afdcd18c 100644 --- a/editors/ed/Makefile +++ b/editors/ed/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/10/16 05:07:58 reed Exp $ +# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:09 rillig Exp $ DISTNAME= ed-0.2 PKGREVISION= 1 @@ -12,7 +12,7 @@ COMMENT= GNU version of line-oriented text editor GNU_CONFIGURE= YES CONFIGURE_HAS_INFODIR= NO CONFIGURE_HAS_MANDIR= NO -MAKE_ENV+= INFO_DIR=${INFO_DIR} +MAKE_ENV+= INFO_DIR=${INFO_DIR:Q} .include "../../mk/bsd.prefs.mk" @@ -20,9 +20,9 @@ INFO_FILES= ${GNU_PROGRAM_PREFIX}ed.info .if defined(GNU_PROGRAM_PREFIX) # the ./configure accepts --program-prefix, but doesn't use -MAKE_ENV+= binprefix="${GNU_PROGRAM_PREFIX}" +MAKE_ENV+= binprefix=${GNU_PROGRAM_PREFIX:Q} .endif -PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX} +PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q} BUILD_DEFS+= GNU_PROGRAM_PREFIX .include "../../mk/bsd.pkg.mk" diff --git a/editors/elvis-x11/Makefile b/editors/elvis-x11/Makefile index e59015cd789..be424f1e1cf 100644 --- a/editors/elvis-x11/Makefile +++ b/editors/elvis-x11/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.6 2005/06/01 18:02:45 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:09 rillig Exp $ # -.include "../elvis/Makefile.common" +.include "../../editors/elvis/Makefile.common" PKGNAME= elvis-x11-2.2.0 PKGREVISION= 2 diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index 18e9d8d5711..4a75af91898 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.87 2005/10/05 13:29:49 wiz Exp $ +# $NetBSD: Makefile,v 1.88 2005/12/05 20:50:09 rillig Exp $ DISTNAME= emacs-${EMACSVERSION}a PKGREVISION= 1 @@ -20,7 +20,7 @@ CONFIGURE_ARGS+= --with-jpeg .include "../../graphics/tiff/buildlink3.mk" CONFIGURE_ARGS+= --with-tiff # need 4.1.0b1 or higher (a bug in 4.1.0 can crash Emacs) -BUILDLINK_DEPENDS.libungif= libungif>=4.1.0.1 +BUILDLINK_DEPENDS.libungif+= libungif>=4.1.0.1 .include "../../graphics/libungif/buildlink3.mk" CONFIGURE_ARGS+= --with-gif .include "../../graphics/png/buildlink3.mk" diff --git a/editors/emacs/Makefile.common b/editors/emacs/Makefile.common index 05880a9d53f..5ca6064e7aa 100644 --- a/editors/emacs/Makefile.common +++ b/editors/emacs/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.3 2005/10/14 08:59:50 hiramatsu Exp $ +# $NetBSD: Makefile.common,v 1.4 2005/12/05 20:50:09 rillig Exp $ MASTER_SITES= ${MASTER_SITE_GNU:=emacs/} MAINTAINER= markd@NetBSD.org @@ -17,7 +17,7 @@ PLIST_SRC= ${.CURDIR}/../../editors/emacs/PLIST # needed for 21.4a, can probably go away on next update EMACSVERSION= 21.4 WRKSRC= ${WRKDIR}/emacs-${EMACSVERSION} -PLIST_SUBST+= EMACSVERSION=${EMACSVERSION} +PLIST_SUBST+= EMACSVERSION=${EMACSVERSION:Q} MAKEFLAGS+= EMACSLOADPATH=${WRKSRC}/lisp diff --git a/editors/emacs20/Makefile b/editors/emacs20/Makefile index c3bb072bd74..7b57a418f34 100644 --- a/editors/emacs20/Makefile +++ b/editors/emacs20/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/06/30 10:16:38 markd Exp $ +# $NetBSD: Makefile,v 1.22 2005/12/05 20:50:09 rillig Exp $ DISTNAME= emacs-20.7 PKGREVISION= 5 @@ -76,7 +76,7 @@ CONFIGURE_ARGS+=--with-ipv6 .else CONFIGURE_ARGS+=--without-ipv6 .endif -MAKE_ENV+= INSTALL_STRIP=${_STRIPFLAG_INSTALL} +MAKE_ENV+= INSTALL_STRIP=${_STRIPFLAG_INSTALL:Q} .include "../../mk/compiler.mk" .if !empty(CC_VERSION:Mgcc-3.*) diff --git a/editors/hnb/Makefile b/editors/hnb/Makefile index 2649e5e1b18..0427e8c7612 100644 --- a/editors/hnb/Makefile +++ b/editors/hnb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/10/01 18:52:03 kristerw Exp $ +# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:09 rillig Exp $ # DISTNAME= hnb-1.9.17 @@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://hnb.sourceforge.net/ COMMENT= Hierarchical data organizer -INCOMPAT_CURSES= NetBSD-1.5* NetBSD-1.6[-_.]* NetBSD-1.6[A-U]-* +INCOMPAT_CURSES= NetBSD-1.5*-* NetBSD-1.6[-_.]*-* NetBSD-1.6[A-U]-* USE_TOOLS+= gmake diff --git a/editors/jde/Makefile b/editors/jde/Makefile index e9931bd89ec..1a4d2f99d54 100644 --- a/editors/jde/Makefile +++ b/editors/jde/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/10/24 19:32:00 rillig Exp $ +# $NetBSD: Makefile,v 1.17 2005/12/05 20:50:09 rillig Exp $ # DISTNAME= jde-2.3.2 @@ -27,7 +27,7 @@ EMACS_VERSIONS_ACCEPTED=emacs21 # XXX Won't compile with emacs20... PKG_DEFAULT_JVM= sun-jdk14 BUILD_ENV+= EMACS=${EMACS} -MAKE_ENV+= EMACS_LISPPREFIX=${EMACS_LISPPREFIX} +MAKE_ENV+= EMACS_LISPPREFIX=${EMACS_LISPPREFIX:Q} NO_CONFIGURE= yes diff --git a/editors/jed/Makefile b/editors/jed/Makefile index 0f7d77837c0..05b27dfff88 100644 --- a/editors/jed/Makefile +++ b/editors/jed/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.24 2003/07/13 13:51:33 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2005/12/05 20:50:09 rillig Exp $ # PKGNAME= jed-0.99.16 PKGREVISION= 1 -.include "../jed/Makefile.common" +.include "../../editors/jed/Makefile.common" COMMENT= Extensible folding editor with Emacs/WordStar/EDT emulations CONFLICTS= xjed-[0-9]* diff --git a/editors/joe/Makefile b/editors/joe/Makefile index 926b4cd285f..b7ce3e50e64 100644 --- a/editors/joe/Makefile +++ b/editors/joe/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/07/19 08:29:52 adam Exp $ +# $NetBSD: Makefile,v 1.26 2005/12/05 20:50:09 rillig Exp $ DISTNAME= joe-3.3 CATEGORIES= editors @@ -11,7 +11,7 @@ COMMENT= Joe's own editor USE_PKGINSTALL= yes USE_TOOLS+= gmake GNU_CONFIGURE= yes -CONFIGURE_ARGS= --sysconfdir="${PREFIX}/share/examples" +CONFIGURE_ARGS+= --sysconfdir=${PREFIX:Q}/share/examples .include "../../devel/ncurses/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/lpe/Makefile b/editors/lpe/Makefile index 052d2fd42b3..f3c66bdc2d0 100644 --- a/editors/lpe/Makefile +++ b/editors/lpe/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/05/22 20:07:56 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:09 rillig Exp $ # DISTNAME= lpe-1.2.6 @@ -21,9 +21,9 @@ GNU_CONFIGURE= YES SHLIBTOOL_OVERRIDE= libtool -CONFIGURE_ENV= EXPORT_SYMBOLS_LDFLAGS="${EXPORT_SYMBOLS_LDFLAGS}" -MAKE_ENV= EXPORT_SYMBOLS_LDFLAGS="${EXPORT_SYMBOLS_LDFLAGS}" -CFLAGS= -DPREFIX="\"{PREFIX}\"" +CONFIGURE_ENV+= EXPORT_SYMBOLS_LDFLAGS=${EXPORT_SYMBOLS_LDFLAGS:Q} +MAKE_ENV+= EXPORT_SYMBOLS_LDFLAGS=${EXPORT_SYMBOLS_LDFLAGS:Q} +CFLAGS+= -DPREFIX=\"{PREFIX:Q}\" post-patch: @cd ${WRKSRC}/man && \ diff --git a/editors/lyx-qt/Makefile.common b/editors/lyx-qt/Makefile.common index ac6f2d7eb4e..cfef8450504 100644 --- a/editors/lyx-qt/Makefile.common +++ b/editors/lyx-qt/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.31 2005/11/18 16:47:35 reed Exp $ +# $NetBSD: Makefile.common,v 1.32 2005/12/05 20:50:09 rillig Exp $ # DISTNAME= lyx-1.3.6 @@ -61,8 +61,8 @@ CXXFLAGS+= -fno-exceptions || ${MACHINE_ARCH} == "m68k") CXXFLAGS:= ${CXXFLAGS:C/-O[0-9]*/-O/g} CFLAGS:= ${CFLAGS:C/-O[0-9]*/-O/g} -CONFIGURE_ENV+= CXXFLAGS="${CXXFLAGS}" -CONFIGURE_ENV+= CFLAGS="${CFLAGS}" +CONFIGURE_ENV+= CXXFLAGS=${CXXFLAGS:M*:Q} +CONFIGURE_ENV+= CFLAGS=${CFLAGS:M*:Q} . endif .endif diff --git a/editors/lyx-xforms/Makefile b/editors/lyx-xforms/Makefile index 86c0a7c0e30..ea7b668363f 100644 --- a/editors/lyx-xforms/Makefile +++ b/editors/lyx-xforms/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.16 2005/11/18 16:47:35 reed Exp $ +# $NetBSD: Makefile,v 1.17 2005/12/05 20:50:10 rillig Exp $ # -.include "../lyx-qt/Makefile.common" +.include "../../editors/lyx-qt/Makefile.common" PKGNAME= ${DISTNAME:S/lyx-/lyx-xforms-/} PKGREVISION= 1 diff --git a/editors/manedit/Makefile b/editors/manedit/Makefile index 2a33e9b8e47..9c517981de5 100644 --- a/editors/manedit/Makefile +++ b/editors/manedit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/06/16 06:57:49 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2005/12/05 20:50:10 rillig Exp $ # DISTNAME= manedit-0.5.6 @@ -13,7 +13,7 @@ COMMENT= UNIX Manual (man, manpage) page editor, viewer, and browser for X11 WRKSRC= ${WRKDIR}/${DISTNAME}/manedit -MAKE_ENV+= CPP="${CXX}" +MAKE_ENV+= CPP=${CXX:Q} # The FreeBSD makefile may be used as "generic UNIX". MAKEFILE= Makefile.FreeBSD diff --git a/editors/mule-ucs/Makefile b/editors/mule-ucs/Makefile index 7c2425db42a..36f5d3120f7 100644 --- a/editors/mule-ucs/Makefile +++ b/editors/mule-ucs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/09/28 14:31:06 rillig Exp $ +# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:10 rillig Exp $ DISTNAME= Mule-UCS-0.84 PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} @@ -12,7 +12,7 @@ COMMENT= Another encoding conversion mechanism for Emacs # Mule 4.1 feature required by Mule-UCS was added to 20.7nb1. EMACS_VERSIONS_ACCEPTED= emacs21 emacs21nox emacs20 -BUILDLINK_DEPENDS.emacs20= emacs>=20.7nb1 +BUILDLINK_DEPENDS.emacs20+= emacs>=20.7nb1 do-build: @cd ${WRKSRC}; \ diff --git a/editors/ne/Makefile b/editors/ne/Makefile index 8946056914d..4e15d384f2a 100644 --- a/editors/ne/Makefile +++ b/editors/ne/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/06/16 06:57:49 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:10 rillig Exp $ DISTNAME= ne-1.31 CATEGORIES= editors @@ -8,7 +8,7 @@ DISTFILES= ${DISTNAME}.tar.gz ne.manpage.1 NE.spec.ascii NE.changes.spec MAINTAINER= bjh@mail.dotcom.fr COMMENT= Re-write of Phoenix E. A sensible light-weight editor -DIST_SUBDIR= ${PKGNAME} +DIST_SUBDIR= ${PKGNAME_NOREV} WRKSRC= ${WRKDIR}/src EXTRACT_ONLY= ${DISTNAME}.tar.gz diff --git a/editors/nvi/Makefile b/editors/nvi/Makefile index 5bdfe51eb9b..ccfd35c8bf8 100644 --- a/editors/nvi/Makefile +++ b/editors/nvi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/09/11 18:08:02 schmonz Exp $ +# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:10 rillig Exp $ # DISTNAME= nvi-1.81.5 @@ -29,7 +29,7 @@ GNU_CONFIGURE= YES CONFIGURE_SCRIPT= ../dist/configure CONFIGURE_ARGS+= --with-db3=${BUILDLINK_PREFIX.db3} CONFIGURE_ARGS+= --program-transform-name='s,^,n,' -CONFIGURE_ENV+= vi_cv_path_shell=${TOOLS_SH} +CONFIGURE_ENV+= vi_cv_path_shell=${TOOLS_SH:Q} USE_TOOLS+= sh USE_LIBTOOL= YES diff --git a/editors/sam/Makefile b/editors/sam/Makefile index b5c3372ee0f..643628354dc 100644 --- a/editors/sam/Makefile +++ b/editors/sam/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2005/06/01 18:02:46 jlam Exp $ +# $NetBSD: Makefile,v 1.30 2005/12/05 20:50:10 rillig Exp $ DISTNAME= sam PKGNAME= sam-4.3 @@ -17,7 +17,7 @@ EXTRACT_CMD= ${GZCAT} ${DOWNLOADED_DISTFILE} | ${SH} MANCOMPRESSED= yes USE_X11BASE= yes -MAKE_ENV+= X11PREFIX=${X11PREFIX} +MAKE_ENV+= X11PREFIX=${X11PREFIX:Q} .include "../../mk/bsd.prefs.mk" diff --git a/editors/speedbar/Makefile b/editors/speedbar/Makefile index 853f40bf897..865e32eb4fc 100644 --- a/editors/speedbar/Makefile +++ b/editors/speedbar/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/08/28 04:25:29 uebayasi Exp $ +# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:10 rillig Exp $ # DISTNAME= speedbar-0.14beta4 @@ -14,7 +14,7 @@ COMMENT= Directory and code browser for emacs BUILD_ENV+= EMACS=${EMACS} -NO_CONFIGURE= # set +NO_CONFIGURE= yes USE_TOOLS+= gmake INFO_FILES= speedbar.info diff --git a/editors/vim-gtk/Makefile b/editors/vim-gtk/Makefile index f934ccd13a6..96ec56c012a 100644 --- a/editors/vim-gtk/Makefile +++ b/editors/vim-gtk/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.50 2005/07/19 10:18:59 grant Exp $ +# $NetBSD: Makefile,v 1.51 2005/12/05 20:50:10 rillig Exp $ PKGNAME= vim-gtk-${VIM_VERSION}.${VIM_PATCHLEVEL} #PKGREVISION= 1 COMMENT= Vim editor (vi clone) with X11 GTK+ GUI -.include "../vim-share/Makefile.common" +.include "../../editors/vim-share/Makefile.common" DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../../editors/vim-share CONFLICTS+= vim-[0-9]* vim-gtk2-[0-9]* vim-motif-[0-9]* diff --git a/editors/vim-gtk2/Makefile b/editors/vim-gtk2/Makefile index f24a28b2ca9..19f6e6450fa 100644 --- a/editors/vim-gtk2/Makefile +++ b/editors/vim-gtk2/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.17 2005/07/19 10:18:59 grant Exp $ +# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:10 rillig Exp $ PKGNAME= vim-gtk2-${VIM_VERSION}.${VIM_PATCHLEVEL} #PKGREVISION= 1 COMMENT= Vim editor (vi clone) with X11 GTK2 GUI -.include "../vim-share/Makefile.common" +.include "../../editors/vim-share/Makefile.common" DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../../editors/vim-share CONFLICTS+= vim-[0-9]* vim-gtk-[0-9]* vim-motif-[0-9]* diff --git a/editors/vim-lang/Makefile b/editors/vim-lang/Makefile index f1ae532b967..f04c8e66fd0 100644 --- a/editors/vim-lang/Makefile +++ b/editors/vim-lang/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2005/07/19 10:18:59 grant Exp $ +# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:10 rillig Exp $ PKGNAME= vim-lang-${VIM_VERSION}.${VIM_PATCHLEVEL} -.include "../vim-share/Makefile.common" +.include "../../editors/vim-share/Makefile.common" COMMENT= Language files for the vim editor (vi clone) @@ -11,6 +11,6 @@ DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../../editors/vim-sha BUILD_TARGET= languages INSTALL_TARGET= install-languages -PLIST_SUBST+= VIM_SUBDIR="${VIM_SUBDIR}" +PLIST_SUBST+= VIM_SUBDIR=${VIM_SUBDIR:Q} .include "../../mk/bsd.pkg.mk" diff --git a/editors/vim-motif/Makefile b/editors/vim-motif/Makefile index f1c381f532d..540b841413a 100644 --- a/editors/vim-motif/Makefile +++ b/editors/vim-motif/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.16 2005/07/19 10:18:59 grant Exp $ +# $NetBSD: Makefile,v 1.17 2005/12/05 20:50:10 rillig Exp $ PKGNAME= vim-motif-${VIM_VERSION}.${VIM_PATCHLEVEL} #PKGREVISION= 1 COMMENT= Vim editor (vi clone) with X11 Motif GUI -.include "../vim-share/Makefile.common" +.include "../../editors/vim-share/Makefile.common" DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../../editors/vim-share CONFLICTS+= vim-[0-9]* vim-gtk-[0-9]* vim-gtk2-[0-9]* @@ -14,8 +14,8 @@ CONFLICTS+= vim-xaw-[0-9]* vim-kde-[0-9]* CONFIGURE_ARGS+= --enable-gui=motif CONFIGURE_ARGS+= --with-tlib=ncurses -CONFIGURE_ENV+= BUILDLINK_DIR="${BUILDLINK_DIR}" -MAKE_ENV+= BUILDLINK_DIR="${BUILDLINK_DIR}" +CONFIGURE_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR:Q} +MAKE_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR:Q} BUILD_TARGET= vim INSTALL_TARGET= installvimbin diff --git a/editors/vim-share/Makefile b/editors/vim-share/Makefile index 79f1f417d5c..3bf4e66166e 100644 --- a/editors/vim-share/Makefile +++ b/editors/vim-share/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/07/07 08:21:36 martti Exp $ +# $NetBSD: Makefile,v 1.17 2005/12/05 20:50:10 rillig Exp $ PKGNAME= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL} #PKGREVISION= 1 @@ -13,7 +13,7 @@ INSTALL_TARGET= installruntime installmacros installtutor installtools USE_TOOLS+= awk INSTALL_MAKE_FLAGS+= TOOLS_AWK="${TOOLS_AWK}" -PLIST_SUBST+= VIM_SUBDIR="${VIM_SUBDIR}" +PLIST_SUBST+= VIM_SUBDIR=${VIM_SUBDIR:Q} do-build: @cd ${WRKSRC}/xxd && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} diff --git a/editors/vim-xaw/Makefile b/editors/vim-xaw/Makefile index 6403aa4cd95..d59f42f0d51 100644 --- a/editors/vim-xaw/Makefile +++ b/editors/vim-xaw/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.39 2005/07/19 10:18:59 grant Exp $ +# $NetBSD: Makefile,v 1.40 2005/12/05 20:50:10 rillig Exp $ PKGNAME= vim-xaw-${VIM_VERSION}.${VIM_PATCHLEVEL} -#PKGREVISION= 1 -.include "../vim-share/Makefile.common" +.include "../../editors/vim-share/Makefile.common" COMMENT= Vim editor (vi clone) with X11 Athena GUI diff --git a/editors/xemacs-current/options.mk b/editors/xemacs-current/options.mk index fb50cf48028..3fc7c0fe7ad 100644 --- a/editors/xemacs-current/options.mk +++ b/editors/xemacs-current/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2005/01/22 13:03:06 magick Exp $ +# $NetBSD: options.mk,v 1.5 2005/12/05 20:50:10 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.xemacs PKG_SUPPORTED_OPTIONS= esound ldap xface canna @@ -31,4 +31,3 @@ CONFIGURE_ARGS+= --without-canna #.else CONFIGURE_ARGS+= --with-sound=none #.endif - diff --git a/editors/xemacs/Makefile.common b/editors/xemacs/Makefile.common index 6b1df16cfb9..934c08337cb 100644 --- a/editors/xemacs/Makefile.common +++ b/editors/xemacs/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.11 2005/07/15 18:27:49 jlam Exp $ +# $NetBSD: Makefile.common,v 1.12 2005/12/05 20:50:10 rillig Exp $ DISTNAME= xemacs-21.4.17 CATEGORIES= editors @@ -17,7 +17,7 @@ USE_TOOLS+= gtar DIST_SUBDIR= xemacs EXTRA_FILES= ${DISTNAME}-elc.tar.gz ${DISTNAME}-info.tar.gz EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} -PLIST_SUBST+= DISTNAME="${DISTNAME}" +PLIST_SUBST+= DISTNAME=${DISTNAME:Q} MESSAGE_SUBST+= DISTNAME="${DISTNAME}" .include "options.mk" diff --git a/editors/xemacs/Makefile.pkg b/editors/xemacs/Makefile.pkg index 606be3e3210..f4d9be214c8 100644 --- a/editors/xemacs/Makefile.pkg +++ b/editors/xemacs/Makefile.pkg @@ -1,11 +1,11 @@ -# $NetBSD: Makefile.pkg,v 1.2 2005/06/01 18:02:46 jlam Exp $ +# $NetBSD: Makefile.pkg,v 1.3 2005/12/05 20:50:10 rillig Exp $ .include "../../mk/bsd.prefs.mk" .if !defined(XEMACS_PREFIX) XEMACS_PREFIX!= ${MAKE} XEMACS_PREFIX= EVAL_PREFIX=_XEMACS_PREFIX=xemacs \ VARNAME=_XEMACS_PREFIX show-var -MAKEFLAGS+= XEMACS_PREFIX=${XEMACS_PREFIX} +MAKEFLAGS+= XEMACS_PREFIX=${XEMACS_PREFIX:Q} .endif .if (${XEMACS_PREFIX} == ${X11BASE}) diff --git a/editors/xjed/Makefile b/editors/xjed/Makefile index bed76696aac..64a490e2e91 100644 --- a/editors/xjed/Makefile +++ b/editors/xjed/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2005/06/01 18:02:46 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:10 rillig Exp $ # PKGNAME= xjed-0.99.16 -.include "../jed/Makefile.common" +.include "../../editors/jed/Makefile.common" COMMENT= Extensible folding editor with Emacs/WordStar/EDT emulations, X11 version CONFLICTS= jed-[0-9]* |