diff options
Diffstat (limited to 'sysutils')
41 files changed, 141 insertions, 95 deletions
diff --git a/sysutils/asapm/Makefile b/sysutils/asapm/Makefile index 3f5b07adadd..478be3c9eeb 100644 --- a/sysutils/asapm/Makefile +++ b/sysutils/asapm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2005/04/11 21:47:22 tv Exp $ +# $NetBSD: Makefile,v 1.31 2005/06/01 18:03:21 jlam Exp $ # DISTNAME= asapm-2.11 @@ -16,7 +16,6 @@ COMMENT= Laptop battery status display for X11 PKG_SKIP_REASON= "APM is not available for ${MACHINE_PLATFORM}" .endif -USE_X11= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --disable-jpeg # there actually is no JPEG support CONFIGURE_ARGS+= --with-xpm diff --git a/sysutils/bbsload/Makefile b/sysutils/bbsload/Makefile index b494bb6c970..437e5605f86 100644 --- a/sysutils/bbsload/Makefile +++ b/sysutils/bbsload/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/04/11 21:47:22 tv Exp $ +# $NetBSD: Makefile,v 1.9 2005/06/01 18:03:21 jlam Exp $ # DISTNAME= bbsload-0.2.6 @@ -12,6 +12,8 @@ COMMENT= Small (in dimensions) tool to display the average load GNU_CONFIGURE= YES USE_X11BASE= YES +.include "../../mk/x11.buildlink3.mk" + post-install: ${INSTALL_MAN} ${WRKSRC}/bbsload.1 ${PREFIX}/man/man1/bbsload.1 diff --git a/sysutils/burn/Makefile b/sysutils/burn/Makefile index 988799ff533..8254eea31f6 100644 --- a/sysutils/burn/Makefile +++ b/sysutils/burn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/05/22 20:08:31 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2005/06/01 18:03:21 jlam Exp $ # DISTNAME= burn-0.4.0 @@ -15,7 +15,6 @@ DEPENDS+= cdrdao>=1.1.5:../../sysutils/cdrdao DEPENDS+= gworkspace-[0-9]*:../../sysutils/gworkspace NO_CONFIGURE= YES -USE_X11= YES MAKEFILE= GNUmakefile USE_TOOLS+= gmake WRKSRC= ${WRKDIR}/${PKGBASE} diff --git a/sysutils/fam/builtin.mk b/sysutils/fam/builtin.mk index 17258ef004b..d3c0f824bb4 100644 --- a/sysutils/fam/builtin.mk +++ b/sysutils/fam/builtin.mk @@ -1,10 +1,47 @@ -# $NetBSD: builtin.mk,v 1.1 2005/05/07 21:20:44 jschauma Exp $ +# $NetBSD: builtin.mk,v 1.2 2005/06/01 18:03:21 jlam Exp $ +BUILTIN_PKG:= fam + +BUILTIN_FIND_FILES_VAR:= H_FAM +BUILTIN_FIND_FILES.H_FAM= /usr/include/fam.h + +.include "../../mk/buildlink3/bsd.builtin.mk" + +### +### Determine if there is a built-in implementation of the package and +### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). +### .if !defined(IS_BUILTIN.fam) IS_BUILTIN.fam= no -. if exists(/usr/include/fam.h) +. if empty(H_FAM:M${LOCALBASE}/*) && exists(${H_FAM}) IS_BUILTIN.fam= yes . endif -.endif # IS_BUILTIN.fam +.endif +MAKEVARS+= IS_BUILTIN.fam -USE_BUILTIN.fam?= ${IS_BUILTIN.fam} +### +### Determine whether we should use the built-in implementation if it +### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no"). +### +.if !defined(USE_BUILTIN.fam) +. if ${PREFER.fam} == "pkgsrc" +USE_BUILTIN.fam= no +. else +USE_BUILTIN.fam= ${IS_BUILTIN.fam} +. if defined(BUILTIN_PKG.fam) && \ + !empty(IS_BUILTIN.fam:M[yY][eE][sS]) +USE_BUILTIN.fam= yes +. for _dep_ in ${BUILDLINK_DEPENDS.fam} +. if !empty(USE_BUILTIN.fam:M[yY][eE][sS]) +USE_BUILTIN.fam!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.fam:Q}; then \ + ${ECHO} yes; \ + else \ + ${ECHO} no; \ + fi +. endif +. endfor +. endif +. endif # PREFER.fam +.endif +MAKEVARS+= USE_BUILTIN.fam diff --git a/sysutils/file/builtin.mk b/sysutils/file/builtin.mk index 174f1474989..c603a25faec 100644 --- a/sysutils/file/builtin.mk +++ b/sysutils/file/builtin.mk @@ -1,22 +1,48 @@ -# $NetBSD: builtin.mk,v 1.1 2004/07/31 22:13:38 salo Exp $ -# +# $NetBSD: builtin.mk,v 1.2 2005/06/01 18:03:21 jlam Exp $ -_MAGIC_H= /usr/include/magic.h +BUILTIN_PKG:= file +BUILTIN_FIND_FILES_VAR:= H_FILE +BUILTIN_FIND_FILES.H_FILE= /usr/include/magic.h +BUILTIN_FIND_GREP.H_FILE= magic_file + +.include "../../mk/buildlink3/bsd.builtin.mk" + +### +### Determine if there is a built-in implementation of the package and +### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). +### .if !defined(IS_BUILTIN.file) IS_BUILTIN.file= no -. if exists(${_MAGIC_H}) -IS_BUILTIN.file!= \ - if ${GREP} -q "magic_file" ${_MAGIC_H}; then \ - ${ECHO} "yes"; \ - else \ - ${ECHO} "no"; \ - fi +. if empty(H_FILE:M${LOCALBASE}/*) && exists(${H_FILE}) +IS_BUILTIN.file= yes . endif -BUILDLINK_VARS+= IS_BUILTIN.file -.endif # IS_BUILTIN.file +.endif +MAKEVARS+= IS_BUILTIN.file +### +### Determine whether we should use the built-in implementation if it +### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no"). +### .if !defined(USE_BUILTIN.file) -USE_BUILTIN.file?= ${IS_BUILTIN.file} -PREFER.file?= pkgsrc -.endif # USE_BUILTIN.file +. if ${PREFER.file} == "pkgsrc" +USE_BUILTIN.file= no +. else +USE_BUILTIN.file= ${IS_BUILTIN.file} +. if defined(BUILTIN_PKG.file) && \ + !empty(IS_BUILTIN.file:M[yY][eE][sS]) +USE_BUILTIN.file= yes +. for _dep_ in ${BUILDLINK_DEPENDS.file} +. if !empty(USE_BUILTIN.file:M[yY][eE][sS]) +USE_BUILTIN.file!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.file:Q}; then \ + ${ECHO} yes; \ + else \ + ${ECHO} no; \ + fi +. endif +. endfor +. endif +. endif # PREFER.file +.endif +MAKEVARS+= USE_BUILTIN.file diff --git a/sysutils/fsv/Makefile b/sysutils/fsv/Makefile index f0ffc6edb36..31684461af1 100644 --- a/sysutils/fsv/Makefile +++ b/sysutils/fsv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:32 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2005/06/01 18:03:21 jlam Exp $ # DISTNAME= fsv-0.9 @@ -12,7 +12,6 @@ COMMENT= 3D filesystem visualizer GNU_CONFIGURE= yes USE_TOOLS+= gmake -USE_X11= yes .include "../../x11/gtkglarea/buildlink3.mk" .include "../../x11/gtk/buildlink3.mk" diff --git a/sysutils/fsviewer/Makefile b/sysutils/fsviewer/Makefile index 963a748c39c..6e8db6295a8 100644 --- a/sysutils/fsviewer/Makefile +++ b/sysutils/fsviewer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/05/22 20:08:32 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2005/06/01 18:03:21 jlam Exp $ DISTNAME= FSViewer.app-0.2.5 PKGNAME= FSViewer-0.2.5 @@ -15,7 +15,6 @@ COMMENT= NextStep-like Filemanager for WindowMaker USE_TOOLS+= gmake USE_PKGLOCALEDIR= yes -USE_X11= yes GNU_CONFIGURE= yes .include "../../wm/windowmaker/buildlink3.mk" diff --git a/sysutils/gentoo/Makefile b/sysutils/gentoo/Makefile index f0f0995c1a3..10f96c52cf2 100644 --- a/sysutils/gentoo/Makefile +++ b/sysutils/gentoo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/04/11 21:47:24 tv Exp $ +# $NetBSD: Makefile,v 1.22 2005/06/01 18:03:21 jlam Exp $ DISTNAME= gentoo-0.11.54 CATEGORIES= sysutils @@ -12,7 +12,6 @@ BUILD_USES_MSGFMT= YES USE_PKGINSTALL= YES USE_PKGLOCALEDIR= YES -USE_X11= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile index f3e85688c1c..a5768a0e2b8 100644 --- a/sysutils/gkrellm/Makefile +++ b/sysutils/gkrellm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2005/05/21 04:10:18 jlam Exp $ +# $NetBSD: Makefile,v 1.42 2005/06/01 18:03:22 jlam Exp $ .include "Makefile.common" PKGREVISION= # empty1 @@ -10,7 +10,6 @@ COMMENT= GTK2 based system monitor DEPENDS+= gkrellm-share-${GKRELLM_VERSION}:../../sysutils/gkrellm-share -USE_X11= YES USE_PKGINSTALL= YES .include "../../mk/bsd.prefs.mk" diff --git a/sysutils/gkrellm1/Makefile b/sysutils/gkrellm1/Makefile index f9d85ff50ff..9741efe5dd2 100644 --- a/sysutils/gkrellm1/Makefile +++ b/sysutils/gkrellm1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:32 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/06/01 18:03:22 jlam Exp $ # DISTNAME= gkrellm-1.2.13 @@ -14,7 +14,6 @@ COMMENT= GTK based system monitor BUILD_USES_MSGFMT= YES OSVERSION_SPECIFIC= YES -USE_X11= YES USE_TOOLS+= gmake USE_PKGLOCALEDIR= YES diff --git a/sysutils/gnome-vfs/Makefile b/sysutils/gnome-vfs/Makefile index 856dcc6a6bf..7ec3c0c30ce 100644 --- a/sysutils/gnome-vfs/Makefile +++ b/sysutils/gnome-vfs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2005/05/22 20:08:32 jlam Exp $ +# $NetBSD: Makefile,v 1.49 2005/06/01 18:03:22 jlam Exp $ DISTNAME= gnome-vfs-1.0.5 PKGREVISION= 8 @@ -29,4 +29,5 @@ CONFIGURE_ARGS.gnu-iconv= --with-libiconv=yes .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/pkgconfig/buildlink3.mk" .include "../../devel/GConf/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/gnome2-system-monitor/Makefile b/sysutils/gnome2-system-monitor/Makefile index 1d287771c1c..f157367f014 100644 --- a/sysutils/gnome2-system-monitor/Makefile +++ b/sysutils/gnome2-system-monitor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/05/22 20:08:32 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2005/06/01 18:03:22 jlam Exp $ # DISTNAME= gnome-system-monitor-2.10.1 @@ -17,7 +17,6 @@ USE_DIRS+= gnome2-1.5 USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes USE_TOOLS+= gmake -USE_X11= yes LIBS+= -lutil GCONF2_SCHEMAS+= gnome-system-monitor.schemas diff --git a/sysutils/gnometoaster/Makefile b/sysutils/gnometoaster/Makefile index a102af5a195..e177d6f9b6d 100644 --- a/sysutils/gnometoaster/Makefile +++ b/sysutils/gnometoaster/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/05/22 20:08:32 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2005/06/01 18:03:22 jlam Exp $ # DISTNAME= gtoaster1.0Beta5 @@ -13,7 +13,6 @@ HOMEPAGE= http://gnometoaster.rulez.org/ COMMENT= CD recording frontend for X/GTK+ WRKSRC= ${WRKDIR}/gtoaster -USE_X11= YES USE_TOOLS+= gmake GNU_CONFIGURE= YES diff --git a/sysutils/grun/Makefile b/sysutils/grun/Makefile index 6244355cefa..4b54f621d9c 100644 --- a/sysutils/grun/Makefile +++ b/sysutils/grun/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:32 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 18:03:22 jlam Exp $ DISTNAME= grun-0.9.2 PKGREVISION= 3 @@ -9,7 +9,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= ${MASTER_SITES}/grun.html COMMENT= GTK+ based Run dialog -USE_X11= YES GNU_CONFIGURE= YES USE_TOOLS+= gmake PTHREAD_OPTS+= require diff --git a/sysutils/gtk-send-pr/Makefile b/sysutils/gtk-send-pr/Makefile index 5553374ba2d..f8c97c534b4 100644 --- a/sysutils/gtk-send-pr/Makefile +++ b/sysutils/gtk-send-pr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/04/11 21:47:24 tv Exp $ +# $NetBSD: Makefile,v 1.16 2005/06/01 18:03:22 jlam Exp $ # DISTNAME= gtk-send-pr-0.4.5 @@ -10,7 +10,6 @@ MAINTAINER= flynn@energyhq.es.eu.org HOMEPAGE= http://www.energyhq.es.eu.org/gtk-send-pr.html COMMENT= GTK+ based problem report tool -USE_X11= yes .include "../../devel/pkgconfig/buildlink3.mk" .include "../../mail/libesmtp/buildlink3.mk" diff --git a/sysutils/gworkspace/Makefile b/sysutils/gworkspace/Makefile index d519ebbfb65..e8a37e0aa3a 100644 --- a/sysutils/gworkspace/Makefile +++ b/sysutils/gworkspace/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/05/02 06:35:55 rh Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/01 18:03:22 jlam Exp $ # DISTNAME= gworkspace-0.7.1 @@ -13,7 +13,6 @@ COMMENT= GNUstep Workspace manager CONFLICTS+= GWLib-[0-9]* WRKSRC= ${WRKDIR}/${DISTNAME:S/gw/GW/} -USE_X11= yes .include "../../x11/gnustep-back/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/sysutils/idesk/Makefile b/sysutils/idesk/Makefile index 9da3820aab1..899194d193c 100644 --- a/sysutils/idesk/Makefile +++ b/sysutils/idesk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:32 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 18:03:22 jlam Exp $ # DISTNAME= idesk-0.3.5 @@ -11,7 +11,6 @@ HOMEPAGE= http://sourceforge.net/projects/idesk/ COMMENT= Gives users of minimal WMs icons on their desktop USE_TOOLS+= gmake -USE_X11= yes do-install: ${INSTALL_PROGRAM} ${WRKSRC}/idesk ${PREFIX}/bin/idesk diff --git a/sysutils/lavaps/Makefile b/sysutils/lavaps/Makefile index be91c1d22c7..294e7745440 100644 --- a/sysutils/lavaps/Makefile +++ b/sysutils/lavaps/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/04/05 10:44:51 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2005/06/01 18:03:22 jlam Exp $ # DISTNAME= lavaps-1.20 @@ -11,7 +11,6 @@ COMMENT= Lava lamp of currently running processes USE_PERL5= build -USE_X11= YES GNU_CONFIGURE= YES CONFIGURE_ARGS= --with-additional-includes='-I${LOCALBASE}/include' \ --with-additional-libs='-L${LOCALBASE}/lib' \ diff --git a/sysutils/mc/options.mk b/sysutils/mc/options.mk index 1c4228a276e..aded318b212 100644 --- a/sysutils/mc/options.mk +++ b/sysutils/mc/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2005/02/12 23:38:04 rillig Exp $ +# $NetBSD: options.mk,v 1.3 2005/06/01 18:03:22 jlam Exp $ # ### The charset option enables input/display support for various 8-bit @@ -58,7 +58,7 @@ CONFIGURE_ARGS+= --without-vfs ### Shift modifiers) and mouse support. .if !empty(PKG_OPTIONS:Mx11) CONFIGURE_ARGS+= --with-x -USE_X11= yes +. include "../../mk/x11.buildlink3.mk" .else CONFIGURE_ARGS+= --without-x .endif diff --git a/sysutils/medusa/Makefile b/sysutils/medusa/Makefile index 785f259f410..6d1235f7f1d 100644 --- a/sysutils/medusa/Makefile +++ b/sysutils/medusa/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/04/11 21:47:25 tv Exp $ +# $NetBSD: Makefile,v 1.19 2005/06/01 18:03:22 jlam Exp $ # DISTNAME= medusa-0.5.1 @@ -13,11 +13,11 @@ COMMENT= File system indexing engine DEPENDS+= psmisc-[0-9]*:../../sysutils/psmisc -USE_X11= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig .include "../../sysutils/gnome-vfs/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/mtools/Makefile b/sysutils/mtools/Makefile index 49a7d2eb806..b24c22cc9be 100644 --- a/sysutils/mtools/Makefile +++ b/sysutils/mtools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2005/05/22 20:08:33 jlam Exp $ +# $NetBSD: Makefile,v 1.35 2005/06/01 18:03:22 jlam Exp $ DISTNAME= mtools-3.9.10 CATEGORIES= sysutils @@ -19,7 +19,7 @@ INFO_FILES= mtools.info .include "../../mk/bsd.prefs.mk" .if defined(MTOOLS_ENABLE_FLOPPYD) && !empty(MTOOLS_ENABLE_FLOPPYD:M[Yy][Ee][Ss]) -USE_X11= YES +.include "../../mk/x11.buildlink3.mk" CPPFLAGS= -I${X11BASE}/include CONFIGURE_ARGS= --enable-floppyd PLIST_SUBST= NOFLOPPYD= diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile index c255994b512..9276da0fc25 100644 --- a/sysutils/nautilus-cd-burner/Makefile +++ b/sysutils/nautilus-cd-burner/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/05/22 20:08:33 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2005/06/01 18:03:22 jlam Exp $ # DISTNAME= nautilus-cd-burner-2.10.1 @@ -19,7 +19,6 @@ USE_TOOLS+= gmake USE_PKGINSTALL= yes USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes -USE_X11= yes GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE= libnautilus-burn.pc.in diff --git a/sysutils/nautilus/Makefile b/sysutils/nautilus/Makefile index f7f8b9c3550..33587722b68 100644 --- a/sysutils/nautilus/Makefile +++ b/sysutils/nautilus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2005/05/22 20:08:33 jlam Exp $ +# $NetBSD: Makefile,v 1.48 2005/06/01 18:03:22 jlam Exp $ # DISTNAME= nautilus-2.10.1 @@ -12,7 +12,6 @@ COMMENT= Nautilus file manager for GNOME2 USE_PKGLOCALEDIR= yes USE_DIRS+= xdg-1.1 -USE_X11= yes USE_TOOLS+= gmake USE_LIBTOOL= yes USE_PKGINSTALL= yes diff --git a/sysutils/pftop/Makefile b/sysutils/pftop/Makefile index 4f54fb2d5d0..48fedf7916c 100644 --- a/sysutils/pftop/Makefile +++ b/sysutils/pftop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/04/11 21:47:28 tv Exp $ +# $NetBSD: Makefile,v 1.3 2005/06/01 18:03:22 jlam Exp $ DISTNAME= pftop-0.4 CATEGORIES= sysutils net @@ -10,7 +10,7 @@ COMMENT= Utility for real-time display of statistics for PF NO_CONFIGURE= yes -MAKE_ENV+= OSLEVEL=${_PF_VERSION:S/.//} +MAKE_ENV+= OSLEVEL=${PF_VERSION:S/.//} CFLAGS+= -I${PREFIX}/include do-install: diff --git a/sysutils/psmisc/Makefile b/sysutils/psmisc/Makefile index c7538f1f6f5..f5f58b260f4 100644 --- a/sysutils/psmisc/Makefile +++ b/sysutils/psmisc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/04/11 21:47:28 tv Exp $ +# $NetBSD: Makefile,v 1.21 2005/06/01 18:03:22 jlam Exp $ DISTNAME= psmisc-20.1 CATEGORIES= sysutils @@ -14,7 +14,7 @@ CONFLICTS+= pstree<=2.16 PKG_INSTALLATION_TYPES= overwrite pkgviews GNU_CONFIGURE= # defined -LIBS+= ${LIBGETOPT} +LIBS+= ${BUILDLINK_LDADD.getopt} # "make install" doesn't install the link from killall -> pidof. post-install: diff --git a/sysutils/rox-session/Makefile b/sysutils/rox-session/Makefile index d5d0b305549..a462c6842b1 100644 --- a/sysutils/rox-session/Makefile +++ b/sysutils/rox-session/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/04/11 21:47:29 tv Exp $ +# $NetBSD: Makefile,v 1.21 2005/06/01 18:03:22 jlam Exp $ # DISTNAME= ROX-Session-0.1.14 @@ -18,7 +18,6 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/ROX-Session/src DIST_SUBDIR= rox GNU_CONFIGURE= yes -USE_X11= yes .include "../../devel/pkgconfig/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" diff --git a/sysutils/rox/Makefile b/sysutils/rox/Makefile index 65edff7da3d..490aa02ee83 100644 --- a/sysutils/rox/Makefile +++ b/sysutils/rox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/04/11 21:47:28 tv Exp $ +# $NetBSD: Makefile,v 1.24 2005/06/01 18:03:22 jlam Exp $ # DISTNAME= rox-2.2.0 @@ -17,7 +17,6 @@ CONFLICTS= rox-base-[0-9]* WRKSRC= ${WRKDIR}/${DISTNAME}/ROX-Filer/src DIST_SUBDIR= rox -USE_X11= yes GNU_CONFIGURE= yes CONFIGURE_ENV+= APP_DIR=${WRKDIR}/${DISTNAME}/ROX-Filer CONFIGURE_ARGS+= --enable-rox --with-platform=${OPSYS}-${MACHINE_ARCH} diff --git a/sysutils/screentest/Makefile b/sysutils/screentest/Makefile index 69ca46f80c9..3f1f68ecbd1 100644 --- a/sysutils/screentest/Makefile +++ b/sysutils/screentest/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/04/11 21:47:29 tv Exp $ +# $NetBSD: Makefile,v 1.9 2005/06/01 18:03:22 jlam Exp $ # DISTNAME= screentest-1.0 @@ -11,7 +11,6 @@ HOMEPAGE= http://www.fi.muni.cz/~kas/screentest/ COMMENT= CRT screen testing utility using GTK+ GNU_CONFIGURE= yes -USE_X11= yes post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/screentest diff --git a/sysutils/tkcron/Makefile b/sysutils/tkcron/Makefile index 9c61a6bb845..bc3339e9559 100644 --- a/sysutils/tkcron/Makefile +++ b/sysutils/tkcron/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/01/12 21:05:46 minskim Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/01 18:03:22 jlam Exp $ # DISTNAME= tkcron-2.12 @@ -12,9 +12,10 @@ COMMENT= Graphical frontend to crontab DEPENDS+= tk>=8.3.2:../../x11/tk WRKSRC= ${WRKDIR} -USE_X11= yes EXTRACT_CMD= ${GZCAT} ${DOWNLOADED_DISTFILE} > tkcron.tcl +.include "../../mk/x11.buildlink3.mk" + do-build: ${SED} -e "\:/usr/local/bin/wish: s;;${LOCALBASE}/bin/wish;g" ${WRKSRC}/tkcron.tcl > ${WRKSRC}/tkcron diff --git a/sysutils/tpb/Makefile b/sysutils/tpb/Makefile index b8294c55a3e..85331f1d216 100644 --- a/sysutils/tpb/Makefile +++ b/sysutils/tpb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/04/11 21:47:29 tv Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:22 jlam Exp $ # DISTNAME= tpb-0.6.1 @@ -12,7 +12,6 @@ COMMENT= Utility to enable the IBM ThinkPad(tm) special keys ONLY_FOR_PLATFORM= *-*-i386 -USE_X11= YES USE_PKGINSTALL= YES GNU_CONFIGURE= YES @@ -31,4 +30,5 @@ post-install: .include "../../mk/ossaudio.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/ups-nut-cgi/Makefile b/sysutils/ups-nut-cgi/Makefile index cbca777519a..125808a01ca 100644 --- a/sysutils/ups-nut-cgi/Makefile +++ b/sysutils/ups-nut-cgi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2005/05/21 01:46:10 lukem Exp $ +# $NetBSD: Makefile,v 1.35 2005/06/01 18:03:23 jlam Exp $ DISTNAME= nut-2.0.1 PKGNAME= ups-nut-cgi-2.0.1 @@ -15,7 +15,6 @@ BUILD_TARGET= cgi INSTALL_TARGET= install-cgi USE_PKGINSTALL= yes -USE_X11= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --sysconfdir=${NUT_CONFDIR} \ --datadir=${NUT_DATADIR} \ @@ -41,4 +40,5 @@ CONF_FILES+= ${NUT_EGDIR}/upsstats.html.sample \ .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/gd/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/wmSMPmon/Makefile b/sysutils/wmSMPmon/Makefile index 7648e889f86..eb50e6b73fc 100644 --- a/sysutils/wmSMPmon/Makefile +++ b/sysutils/wmSMPmon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/04/11 21:47:30 tv Exp $ +# $NetBSD: Makefile,v 1.4 2005/06/01 18:03:23 jlam Exp $ DISTNAME= wmSMPmon-2.3 CATEGORIES= sysutils x11 @@ -10,7 +10,6 @@ COMMENT= Dockable CPU (SMP) monitor WRKSRC= ${WRKDIR}/wmSMPmon-2.x/wmSMPmon -USE_X11= yes post-install: ${INSTALL_MAN} ${WRKSRC}/wmsmpmon.1 ${PREFIX}/man/man1/wmSMPmon.1 diff --git a/sysutils/wmcpuload/Makefile b/sysutils/wmcpuload/Makefile index 59c9e3b6371..25a47e1d944 100644 --- a/sysutils/wmcpuload/Makefile +++ b/sysutils/wmcpuload/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/04/11 21:47:30 tv Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:23 jlam Exp $ # DISTNAME= wmcpuload-1.0.1 @@ -11,7 +11,6 @@ HOMEPAGE= http://www.sh.rim.or.jp/~ssato/dockapp/\#wmcpuload COMMENT= Dockable CPU monitor GNU_CONFIGURE= YES -USE_X11= YES .include "../../graphics/xpm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/wmmemmon/Makefile b/sysutils/wmmemmon/Makefile index 388a2d9faf9..5ade8f44f77 100644 --- a/sysutils/wmmemmon/Makefile +++ b/sysutils/wmmemmon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/04/11 21:47:30 tv Exp $ +# $NetBSD: Makefile,v 1.5 2005/06/01 18:03:23 jlam Exp $ # DISTNAME= wmmemmon-1.0.1 @@ -10,7 +10,6 @@ HOMEPAGE= http://www.sh.rim.or.jp/~ssato/dockapp/ COMMENT= Dockapp to monitor memory and swap usages GNU_CONFIGURE= YES -USE_X11= YES .include "../../graphics/xpm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/xcdroast/Makefile b/sysutils/xcdroast/Makefile index 4312fe4b3dd..69644626aa4 100644 --- a/sysutils/xcdroast/Makefile +++ b/sysutils/xcdroast/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2005/05/22 20:08:33 jlam Exp $ +# $NetBSD: Makefile,v 1.32 2005/06/01 18:03:23 jlam Exp $ DISTNAME= xcdroast-0.98alpha15 PKGNAME= xcdroast-0.98a15 @@ -17,7 +17,6 @@ DEPENDS+= cdrecord-xcdroast-0.98a15.*:../cdrecord-xcdroast USE_TOOLS+= gmake USE_PKGINSTALL= YES USE_PKGLOCALEDIR= YES -USE_X11= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --enable-gtk2 diff --git a/sysutils/xenvstat/Makefile b/sysutils/xenvstat/Makefile index f6f96c19392..ee28d468eb8 100644 --- a/sysutils/xenvstat/Makefile +++ b/sysutils/xenvstat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/04/11 21:47:31 tv Exp $ +# $NetBSD: Makefile,v 1.4 2005/06/01 18:03:23 jlam Exp $ DISTNAME= xenvstat-20041127 CATEGORIES= sysutils @@ -13,10 +13,11 @@ ONLY_FOR_PLATFORM= NetBSD-*-* NO_CONFIGURE= yes NO_CHECKSUM= yes -USE_X11= yes LIBS= -lXmu -lXext -lXt -lX11 -lm +.include "../../mk/x11.buildlink3.mk" + do-extract: @${CP} -R ${FILESDIR} ${WRKSRC} diff --git a/sysutils/xfe/Makefile b/sysutils/xfe/Makefile index 4c8bb7b84d6..431d8645f56 100644 --- a/sysutils/xfe/Makefile +++ b/sysutils/xfe/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/05/22 20:08:34 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/01 18:03:23 jlam Exp $ # DISTNAME= xfe-0.54.2 @@ -17,7 +17,6 @@ USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes USE_TOOLS+= gmake USE_PKGINSTALL= yes -USE_X11= yes PKG_SYSCONFSUBDIR= xfe EGDIR= ${PREFIX}/share/examples/xfe @@ -30,4 +29,5 @@ post-install: .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../x11/fox/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/xhfs/Makefile b/sysutils/xhfs/Makefile index 610f1ce5afc..b8b11226d08 100644 --- a/sysutils/xhfs/Makefile +++ b/sysutils/xhfs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/04/29 19:07:49 kristerw Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/01 18:03:23 jlam Exp $ # DISTNAME= hfsutils-3.2.6 @@ -11,7 +11,6 @@ MAINTAINER= wrstuden@NetBSD.org HOMEPAGE= http://www.mars.org/home/rob/proj/hfs/ COMMENT= Tk GUI + Tcl Shell for accessing HFS volumes -USE_X11= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-tcl=${BUILDLINK_PREFIX.tcl}/lib \ diff --git a/sysutils/xmbmon/Makefile b/sysutils/xmbmon/Makefile index 46f168ddb89..7e08cc1ab8c 100644 --- a/sysutils/xmbmon/Makefile +++ b/sysutils/xmbmon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2004/12/03 15:15:10 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2005/06/01 18:03:23 jlam Exp $ # .include "../../sysutils/mbmon/Makefile.common" @@ -7,12 +7,13 @@ PKGNAME= xmbmon-205 COMMENT= X11-based motherboard monitoring utility -USE_X11= yes BUILD_TARGET= xmbmon LDFLAGS+= -Wl,-R${X11BASE}/lib +.include "../../mk/x11.buildlink3.mk" + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xmbmon ${PREFIX}/bin diff --git a/sysutils/xnc/Makefile b/sysutils/xnc/Makefile index 5c18eda9fff..5c711946635 100644 --- a/sysutils/xnc/Makefile +++ b/sysutils/xnc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/04/11 21:47:31 tv Exp $ +# $NetBSD: Makefile,v 1.20 2005/06/01 18:03:23 jlam Exp $ DISTNAME= xnc-5.0.4.src PKGNAME= xnc-5.0.4 @@ -12,12 +12,12 @@ COMMENT= File manager for X Window WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} USE_DIRS+= xdg-1.1 -USE_X11= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes .include "../../graphics/tiff/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/xuvmstat/Makefile b/sysutils/xuvmstat/Makefile index 6d750306887..1ddd2f9ad20 100644 --- a/sysutils/xuvmstat/Makefile +++ b/sysutils/xuvmstat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/03/30 21:08:30 kristerw Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/01 18:03:23 jlam Exp $ # DISTNAME= ${PKGNAME:S/-//} @@ -10,7 +10,8 @@ MAINTAINER= wiz@NetBSD.org COMMENT= Graphical display for the current UVM status WRKSRC= ${WRKDIR}/xuvmstat -USE_X11= YES + +.include "../../mk/x11.buildlink3.mk" do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xuvmstat ${PREFIX}/bin |