diff options
Diffstat (limited to 'devel')
-rw-r--r-- | devel/ddd/Makefile | 26 | ||||
-rw-r--r-- | devel/distcc/Makefile | 10 | ||||
-rw-r--r-- | devel/distcc/Makefile.common | 4 | ||||
-rw-r--r-- | devel/distccmon-gnome/Makefile | 14 | ||||
-rw-r--r-- | devel/distccmon-gtk/Makefile | 18 |
5 files changed, 37 insertions, 35 deletions
diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile index 8fde485684e..78d843d3908 100644 --- a/devel/ddd/Makefile +++ b/devel/ddd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.69 2006/02/05 23:08:41 joerg Exp $ +# $NetBSD: Makefile,v 1.70 2006/02/17 07:30:13 martti Exp $ # DISTNAME= ddd-3.3.11 @@ -25,28 +25,28 @@ CONFIGURE_ENV+= COMPFACE=${FALSE:Q} .include "../../mk/bsd.prefs.mk" post-patch: - @case "${PAPERSIZE}" in \ + @case ${PAPERSIZE:Q} in \ A4) ${ECHO} "Using A4 paper size" ;; \ Letter*) ${ECHO} "Using US Letter paper size"; \ - ${MV} ${WRKSRC}/ddd/Ddd.in ${WRKSRC}/ddd/Ddd.in.orig; \ + ${MV} ${WRKSRC:Q}/ddd/Ddd.in ${WRKSRC:Q}/ddd/Ddd.in.orig; \ ${SED} -e 's|@Ddd@\*paperSize: 210mm x 297mm|@Ddd@*paperSize: 8.5" x 11"|' \ - < ${WRKSRC}/ddd/Ddd.in.orig \ - > ${WRKSRC}/ddd/Ddd.in ;; \ + < ${WRKSRC:Q}/ddd/Ddd.in.orig \ + > ${WRKSRC:Q}/ddd/Ddd.in ;; \ "") ${ECHO} "PAPERSIZE not set - defaulting to A4" ;; \ *) ${ECHO} "Bad PAPERSIZE - $$PAPERSIZE - defaulting to A4" ;; \ esac; post-configure: - ${ECHO} "LIBXM = ${MOTIFLIB}" >> ${WRKSRC}/ddd/Makefile + ${ECHO} LIBXM = ${MOTIFLIB:Q} >> ${WRKSRC:Q}/ddd/Makefile post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ddd - ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/ddd - ${INSTALL_DATA} ${WRKSRC}/doc/ddd-paper.ps ${PREFIX}/share/doc/ddd - ${INSTALL_DATA} ${WRKSRC}/doc/ddd.ps ${PREFIX}/share/doc/ddd - ${INSTALL_DATA} ${WRKSRC}/doc/ddd.pdf ${PREFIX}/share/doc/ddd - ${GZIP_CMD} ${PREFIX}/share/doc/ddd/ddd-paper.ps - ${GZIP_CMD} ${PREFIX}/share/doc/ddd/ddd.ps + ${INSTALL_DATA_DIR} ${PREFIX:Q}/share/doc/ddd + ${INSTALL_DATA} ${WRKSRC:Q}/README ${PREFIX:Q}/share/doc/ddd + ${INSTALL_DATA} ${WRKSRC:Q}/doc/ddd-paper.ps ${PREFIX:Q}/share/doc/ddd + ${INSTALL_DATA} ${WRKSRC:Q}/doc/ddd.ps ${PREFIX:Q}/share/doc/ddd + ${INSTALL_DATA} ${WRKSRC:Q}/doc/ddd.pdf ${PREFIX:Q}/share/doc/ddd + ${GZIP_CMD} ${PREFIX:Q}/share/doc/ddd/ddd-paper.ps + ${GZIP_CMD} ${PREFIX:Q}/share/doc/ddd/ddd.ps .include "../../graphics/xpm/buildlink3.mk" .include "../../mk/motif.buildlink3.mk" diff --git a/devel/distcc/Makefile b/devel/distcc/Makefile index 4ab61c4c35b..1d02816b0ce 100644 --- a/devel/distcc/Makefile +++ b/devel/distcc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2006/02/05 23:08:41 joerg Exp $ +# $NetBSD: Makefile,v 1.28 2006/02/17 07:38:45 martti Exp $ PKGNAME= ${DISTNAME} PKGREVISION= 2 @@ -9,19 +9,21 @@ COMMENT= Tool for distributed C/C++ compiling PKG_SYSCONFSUBDIR= distcc RCD_SCRIPTS= distccd +.include "../../mk/bsd.prefs.mk" + DISTCC_USER?= distcc DISTCC_GROUP?= distcc PKG_GROUPS= ${DISTCC_GROUP} -PKG_USERS= ${DISTCC_USER}:${DISTCC_GROUP}::Distccd\ user +PKG_USERS= ${DISTCC_USER:Q}:${DISTCC_GROUP:Q}::Distccd\ user DISTCC_PIDDIR?= ${VARBASE}/run/distccd -OWN_DIRS_PERMS= ${DISTCC_PIDDIR} ${DISTCC_USER} ${DISTCC_GROUP} 0750 +OWN_DIRS_PERMS= ${DISTCC_PIDDIR} ${DISTCC_USER:Q} ${DISTCC_GROUP:Q} 0750 FILES_SUBST+= DISTCC_PIDDIR=${DISTCC_PIDDIR:Q} FILES_SUBST+= DISTCC_USER=${DISTCC_USER:Q} FILES_SUBST+= DISTCC_GROUP=${DISTCC_GROUP:Q} post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/distcc + ${INSTALL_DATA_DIR} ${PREFIX:Q}/share/distcc .include "../../mk/bsd.pkg.mk" diff --git a/devel/distcc/Makefile.common b/devel/distcc/Makefile.common index 3c55ff9486c..60db30eb1df 100644 --- a/devel/distcc/Makefile.common +++ b/devel/distcc/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.3 2005/12/29 06:21:37 jlam Exp $ +# $NetBSD: Makefile.common,v 1.4 2006/02/17 07:38:45 martti Exp $ # ### XXX: See the other 'XXX' comment below when updating this package. @@ -25,7 +25,7 @@ SUBST_CLASSES+= doc SUBST_STAGE.doc= post-patch SUBST_FILES.doc= src/distcc.c src/hosts.c SUBST_SED.doc= -e "s|%s/distcc/hosts|%s/hosts|g" -SUBST_MESSAGE.doc= "Fixing paths." +SUBST_MESSAGE.doc= Fixing paths. .if empty(PKGNAME:Mdistcc-[0-9]*) ### XXX: Remove 'nb1' from the line below during the next update. diff --git a/devel/distccmon-gnome/Makefile b/devel/distccmon-gnome/Makefile index 5b8285af912..a49dbf5dbc9 100644 --- a/devel/distccmon-gnome/Makefile +++ b/devel/distccmon-gnome/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2006/02/05 23:08:41 joerg Exp $ +# $NetBSD: Makefile,v 1.6 2006/02/17 07:38:45 martti Exp $ PKGNAME= ${DISTNAME:S/-/-gnome-/} COMMENT= Graphical monitor for distcc, the distributed C/C++ compiler @@ -13,12 +13,12 @@ CONFIGURE_ARGS+= --with-gnome BUILD_TARGET= distccmon-gnome do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/distccmon-gnome ${PREFIX}/bin - ${INSTALL_DATA_DIR} ${PREFIX}/share/distcc - ${INSTALL_DATA} ${WRKSRC}/gnome/distccmon-gnome-icon.png \ - ${PREFIX}/share/distcc - ${INSTALL_DATA} ${WRKSRC}/gnome/distccmon-gnome.desktop \ - ${PREFIX}/share/distcc + ${INSTALL_PROGRAM} ${WRKSRC:Q}/distccmon-gnome ${PREFIX:Q}/bin + ${INSTALL_DATA_DIR} ${PREFIX:Q}/share/distcc + ${INSTALL_DATA} ${WRKSRC:Q}/gnome/distccmon-gnome-icon.png \ + ${PREFIX:Q}/share/distcc + ${INSTALL_DATA} ${WRKSRC:Q}/gnome/distccmon-gnome.desktop \ + ${PREFIX:Q}/share/distcc .include "../../devel/libgnome/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" diff --git a/devel/distccmon-gtk/Makefile b/devel/distccmon-gtk/Makefile index 3244ebed1ea..8dcc6192fde 100644 --- a/devel/distccmon-gtk/Makefile +++ b/devel/distccmon-gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2006/02/05 23:08:41 joerg Exp $ +# $NetBSD: Makefile,v 1.4 2006/02/17 07:38:45 martti Exp $ PKGNAME= ${DISTNAME:S/-/-gtk-/} PKGREVISION= 2 @@ -12,18 +12,18 @@ SUBST_CLASSES+= gtk SUBST_STAGE.gtk= post-patch SUBST_FILES.gtk= gnome/distccmon-gnome.desktop src/mon-gnome.c SUBST_SED.gtk= -e "s/distccmon-gnome/distccmon-gtk/g" -SUBST_MESSAGE.gtk= "Renaming -gnome to -gtk." +SUBST_MESSAGE.gtk= Renaming -gnome to -gtk. BUILD_TARGET= distccmon-gnome do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/distccmon-gnome \ - ${PREFIX}/bin/distccmon-gtk - ${INSTALL_DATA_DIR} ${PREFIX}/share/distcc - ${INSTALL_DATA} ${WRKSRC}/gnome/distccmon-gnome-icon.png \ - ${PREFIX}/share/distcc/distccmon-gtk-icon.png - ${INSTALL_DATA} ${WRKSRC}/gnome/distccmon-gnome.desktop \ - ${PREFIX}/share/distcc/distccmon-gtk.desktop + ${INSTALL_PROGRAM} ${WRKSRC:Q}/distccmon-gnome \ + ${PREFIX:Q}/bin/distccmon-gtk + ${INSTALL_DATA_DIR} ${PREFIX:Q}/share/distcc + ${INSTALL_DATA} ${WRKSRC:Q}/gnome/distccmon-gnome-icon.png \ + ${PREFIX:Q}/share/distcc/distccmon-gtk-icon.png + ${INSTALL_DATA} ${WRKSRC:Q}/gnome/distccmon-gnome.desktop \ + ${PREFIX:Q}/share/distcc/distccmon-gtk.desktop .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" |