diff options
| author | jlam <jlam@pkgsrc.org> | 2005-06-01 18:02:37 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2005-06-01 18:02:37 +0000 |
| commit | 95fd1f6ec9ce583a46e4351179d93b744a17d1ad (patch) | |
| tree | 614ebca62dbe176d9c75cab1cfeef7c554a336c9 | |
| parent | 6469e231c2dabc4fdb3edae536776b2c90cf5616 (diff) | |
| download | pkgsrc-95fd1f6ec9ce583a46e4351179d93b744a17d1ad.tar.gz | |
Massive cleanup of buildlink3.mk and builtin.mk files in pkgsrc.
Several changes are involved since they are all interrelated. These
changes affect about 1000 files.
The first major change is rewriting bsd.builtin.mk as well as all of
the builtin.mk files to follow the new example in bsd.builtin.mk.
The loop to include all of the builtin.mk files needed by the package
is moved from bsd.builtin.mk and into bsd.buildlink3.mk. bsd.builtin.mk
is now included by each of the individual builtin.mk files and provides
some common logic for all of the builtin.mk files. Currently, this
includes the computation for whether the native or pkgsrc version of
the package is preferred. This causes USE_BUILTIN.* to be correctly
set when one builtin.mk file includes another.
The second major change is teach the builtin.mk files to consider
files under ${LOCALBASE} to be from pkgsrc-controlled packages. Most
of the builtin.mk files test for the presence of built-in software by
checking for the existence of certain files, e.g. <pthread.h>, and we
now assume that if that file is under ${LOCALBASE}, then it must be
from pkgsrc. This modification is a nod toward LOCALBASE=/usr. The
exceptions to this new check are the X11 distribution packages, which
are handled specially as noted below.
The third major change is providing builtin.mk and version.mk files
for each of the X11 distribution packages in pkgsrc. The builtin.mk
file can detect whether the native X11 distribution is the same as
the one provided by pkgsrc, and the version.mk file computes the
version of the X11 distribution package, whether it's built-in or not.
The fourth major change is that the buildlink3.mk files for X11 packages
that install parts which are part of X11 distribution packages, e.g.
Xpm, Xcursor, etc., now use imake to query the X11 distribution for
whether the software is already provided by the X11 distribution.
This is more accurate than grepping for a symbol name in the imake
config files. Using imake required sprinkling various builtin-imake.mk
helper files into pkgsrc directories. These files are used as input
to imake since imake can't use stdin for that purpose.
The fifth major change is in how packages note that they use X11.
Instead of setting USE_X11, package Makefiles should now include
x11.buildlink3.mk instead. This causes the X11 package buildlink3
and builtin logic to be executed at the correct place for buildlink3.mk
and builtin.mk files that previously set USE_X11, and fixes packages
that relied on buildlink3.mk files to implicitly note that X11 is
needed. Package buildlink3.mk should also include x11.buildlink3.mk
when linking against the package libraries requires also linking
against the X11 libraries. Where it was obvious, redundant inclusions
of x11.buildlink3.mk have been removed.
947 files changed, 5002 insertions, 3819 deletions
diff --git a/archivers/bzip2/builtin.mk b/archivers/bzip2/builtin.mk index 1fbed83b04c..ca573e468a0 100644 --- a/archivers/bzip2/builtin.mk +++ b/archivers/bzip2/builtin.mk @@ -1,36 +1,67 @@ -# $NetBSD: builtin.mk,v 1.2 2004/03/29 05:43:28 jlam Exp $ +# $NetBSD: builtin.mk,v 1.3 2005/06/01 18:02:37 jlam Exp $ +BUILTIN_PKG:= bzip2 + +BUILTIN_FIND_FILES_VAR:= H_BZIP2 +BUILTIN_FIND_FILES.H_BZIP2= /usr/include/bzlib.h +BUILTIN_FIND_GREP.H_BZIP2= BZ2_ + +.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.bzip2) IS_BUILTIN.bzip2= no -. if exists(/usr/include/bzlib.h) -IS_BUILTIN.bzip2!= \ - if ${GREP} -q "BZ2_" /usr/include/bzlib.h; then \ - ${ECHO} "yes"; \ - else \ - ${ECHO} "no"; \ - fi +. if empty(H_BZIP2:M${LOCALBASE}/*) && exists(${H_BZIP2}) +IS_BUILTIN.bzip2= yes . endif -BUILDLINK_VARS+= IS_BUILTIN.bzip2 -.endif # IS_BUILTIN.bzip2 +.endif +MAKEVARS+= IS_BUILTIN.bzip2 +### +### 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.bzip2) -USE_BUILTIN.bzip2?= ${IS_BUILTIN.bzip2} -PREFER.bzip2?= pkgsrc - -. if defined(USE_BZIP2) -. if !empty(IS_BUILTIN.bzip2:M[nN][oO]) || \ - (${PREFER.bzip2} == "pkgsrc") +. if ${PREFER.bzip2} == "pkgsrc" USE_BUILTIN.bzip2= no +. else +USE_BUILTIN.bzip2= ${IS_BUILTIN.bzip2} +. if defined(BUILTIN_PKG.bzip2) && \ + !empty(IS_BUILTIN.bzip2:M[yY][eE][sS]) +USE_BUILTIN.bzip2= yes +. for _dep_ in ${BUILDLINK_DEPENDS.bzip2} +. if !empty(USE_BUILTIN.bzip2:M[yY][eE][sS]) +USE_BUILTIN.bzip2!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.bzip2:Q}; then \ + ${ECHO} yes; \ + else \ + ${ECHO} no; \ + fi +. endif +. endfor . endif -. endif +# +# Some platforms don't have a bzip2 implementation that can replace +# pkgsrc bzip2. +# +_INCOMPAT_BZIP2?= SunOS-5.[678]-* Darwin-*-* +. for _pattern_ in ${_INCOMPAT_BZIP2} ${INCOMPAT_BZIP2} +. if !empty(MACHINE_PLATFORM:M${_pattern_}) +USE_BUILTIN.bzip2= no +. endif +. endfor +. endif # PREFER.bzip2 +.endif +MAKEVARS+= USE_BUILTIN.bzip2 -# Solaris 9 has bzip2 1.0.1, build it on older versions. -# Darwin only has a static libbz2.a. +# if USE_BZIP2 is defined, then force the use of a true bzip2 +# implementation. # -_INCOMPAT_BZIP2?= SunOS-5.[678]-* Darwin-* -. for _pattern_ in ${_INCOMPAT_BZIP2} ${INCOMPAT_BZIP2} -. if !empty(MACHINE_PLATFORM:M${_pattern_}) +.if defined(USE_BZIP2) +. if !empty(IS_BUILTIN.bzip2:M[nN][oO]) USE_BUILTIN.bzip2= no -. endif -. endfor -.endif # USE_BUILTIN.bzip2 +. endif +.endif diff --git a/archivers/cxunzip/Makefile b/archivers/cxunzip/Makefile index b9e4178a1cc..746e8d4c3c6 100644 --- a/archivers/cxunzip/Makefile +++ b/archivers/cxunzip/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/05/22 20:07:36 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2005/06/01 18:02:37 jlam Exp $ DISTNAME= cxunzip-0.98 PKGREVISION= 2 @@ -11,7 +11,6 @@ COMMENT= Cloned Xunzip is a GNOME zip-archive uncompressing program PKG_INSTALLATION_TYPES= overwrite pkgviews -USE_X11= yes GNU_CONFIGURE= yes USE_TOOLS+= gmake USE_LANGUAGES= c c++ diff --git a/audio/SDL_mixer/Makefile b/audio/SDL_mixer/Makefile index 80d5fdd6c20..7eaebb7ac73 100644 --- a/audio/SDL_mixer/Makefile +++ b/audio/SDL_mixer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/06/01 14:11:26 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2005/06/01 18:02:37 jlam Exp $ DISTNAME= SDL_mixer-1.2.6 PKGREVISION= 2 @@ -14,7 +14,6 @@ CONFLICTS= SDL-mixer-[0-9]* PKG_INSTALLATION_TYPES= overwrite pkgviews USE_LIBTOOL= YES -USE_X11= YES GNU_CONFIGURE= YES CPPFLAGS= -Dunix=1 diff --git a/audio/SDL_sound/Makefile b/audio/SDL_sound/Makefile index d19898513b8..25b8db95122 100644 --- a/audio/SDL_sound/Makefile +++ b/audio/SDL_sound/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/04/11 21:44:51 tv Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 18:02:37 jlam Exp $ # DISTNAME= SDL_sound-1.0.1 @@ -12,7 +12,6 @@ COMMENT= SDL library to handle the decoding of different file formats GNU_CONFIGURE= YES USE_LIBTOOL= YES -USE_X11= YES .include "../../audio/libmikmod/buildlink3.mk" .include "../../audio/libvorbis/buildlink3.mk" diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile index 89c8e791f06..0b4b2c92c38 100644 --- a/audio/audacity/Makefile +++ b/audio/audacity/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2005/05/22 20:07:37 jlam Exp $ +# $NetBSD: Makefile,v 1.35 2005/06/01 18:02:37 jlam Exp $ DISTNAME= audacity-src-1.2.3 PKGNAME= audacity-1.2.3 @@ -16,7 +16,6 @@ WRKSRC= ${WRKDIR}/audacity-src-1.2.3 USE_TOOLS+= gmake USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes -USE_X11= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --without-xaudio CONFIGURE_ARGS+= --with-id3=system diff --git a/audio/bmp/Makefile.common b/audio/bmp/Makefile.common index 7931c4671dc..3893192b26c 100644 --- a/audio/bmp/Makefile.common +++ b/audio/bmp/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.10 2005/04/28 22:16:31 jlam Exp $ +# $NetBSD: Makefile.common,v 1.11 2005/06/01 18:02:37 jlam Exp $ # DISTNAME= bmp-0.9.7 @@ -17,7 +17,6 @@ GNU_CONFIGURE= yes USE_DIRS+= xdg-1.1 USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes -USE_X11= yes CONFIGURE_ARGS+= --disable-alsa CONFIGURE_ARGS+= --disable-esd diff --git a/audio/cdplayer/Makefile b/audio/cdplayer/Makefile index c5c4e902dac..bfbd669a47b 100644 --- a/audio/cdplayer/Makefile +++ b/audio/cdplayer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/05/22 20:07:37 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2005/06/01 18:02:37 jlam Exp $ # DISTNAME= cdplayer-0.4.2 @@ -10,7 +10,6 @@ HOMEPAGE= http://gsburn.sourceforge.net/ COMMENT= GNUstep CD player with CDDB support WRKSRC= ${WRKDIR}/${PKGBASE} -USE_X11= YES USE_TOOLS+= gmake MAKEFILE= GNUmakefile MAKE_ENV+= ADDITIONAL_CPPFLAGS="-Wno-import" diff --git a/audio/csound4/Makefile b/audio/csound4/Makefile index 5fa398c6a60..67a92464677 100644 --- a/audio/csound4/Makefile +++ b/audio/csound4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/05/23 20:40:47 ben Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:02:37 jlam Exp $ # DISTNAME= csound-4.23f13gbs.0 @@ -16,7 +16,6 @@ CONFLICTS+= csound-dev-4* USE_TOOLS+= gmake GNU_CONFIGURE= yes USE_MAKEINFO= yes -USE_X11= yes TEXINFO_REQD= 4.2 CONFIGURE_ARGS+= --enable-debug CFLAGS+= -g diff --git a/audio/dap/Makefile b/audio/dap/Makefile index f011d69e770..5a9683f902d 100644 --- a/audio/dap/Makefile +++ b/audio/dap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/04/11 21:44:51 tv Exp $ +# $NetBSD: Makefile,v 1.24 2005/06/01 18:02:37 jlam Exp $ DISTNAME= dap-2.1.2 PKGREVISION= 5 @@ -14,7 +14,6 @@ MAKEFILE= Makefile.netbsd MAKE_ENV+= X11PREFIX=${X11PREFIX} -USE_X11= yes USE_LANGUAGES= c c++ do-install: diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile index f2a69608abd..a951925a500 100644 --- a/audio/easytag/Makefile +++ b/audio/easytag/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2005/05/22 20:07:37 jlam Exp $ +# $NetBSD: Makefile,v 1.47 2005/06/01 18:02:37 jlam Exp $ # DISTNAME= easytag-1.1 @@ -15,7 +15,6 @@ BUILD_USES_MSGFMT= yes # xgettext, really GNU_CONFIGURE= yes USE_DIRS+= xdg-1.1 USE_TOOLS+= gmake -USE_X11= yes USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes diff --git a/audio/festival/Makefile b/audio/festival/Makefile index 16e88280773..44479698a7a 100644 --- a/audio/festival/Makefile +++ b/audio/festival/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2005/05/22 20:07:37 jlam Exp $ +# $NetBSD: Makefile,v 1.40 2005/06/01 18:02:37 jlam Exp $ DISTNAME= festival-1.95-beta PKGNAME= festival-1.95beta @@ -14,7 +14,6 @@ COMMENT= Advanced multi-lingual speech synthesis system WRKSRC= ${WRKDIR} USE_TOOLS+= gmake -USE_X11= yes SPEECHTOOLS= ${WRKSRC}/speech_tools FESTIVAL= ${WRKSRC}/festival @@ -94,4 +93,5 @@ do-install: ${INSTALL_MAN} ${FESTIVAL}/doc/festival_client.1 ${PREFIX}/man/man1/festival_client.1 .include "../../audio/nas/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/freezetag/Makefile b/audio/freezetag/Makefile index 27d136ff282..6c96a2d94f4 100644 --- a/audio/freezetag/Makefile +++ b/audio/freezetag/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/04/11 21:44:52 tv Exp $ +# $NetBSD: Makefile,v 1.16 2005/06/01 18:02:37 jlam Exp $ # DISTNAME= freezetag-0.9.2 @@ -10,7 +10,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://katz.linuxpower.org/freezetag/ COMMENT= Id3 tag editor for GTK+-1.2.0 and higher -USE_X11= YES GNU_CONFIGURE= YES .include "../../x11/gtk/buildlink3.mk" diff --git a/audio/gdcd/Makefile b/audio/gdcd/Makefile index 03f0100810e..0152361ecc7 100644 --- a/audio/gdcd/Makefile +++ b/audio/gdcd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2005/04/11 21:44:52 tv Exp $ +# $NetBSD: Makefile,v 1.29 2005/06/01 18:02:38 jlam Exp $ # DISTNAME= gdcd-0.2.1 @@ -11,7 +11,6 @@ HOMEPAGE= http://gdcd.undergrid.net/ COMMENT= CD player for the X Window System using the GIMP Tool Kit (GTK) USE_DIRS+= xdg-1.1 -USE_X11= YES GNU_CONFIGURE= YES .include "../../audio/libcdaudio/buildlink3.mk" diff --git a/audio/gmp3info/Makefile b/audio/gmp3info/Makefile index 17e7ee5aa31..db22add7afa 100644 --- a/audio/gmp3info/Makefile +++ b/audio/gmp3info/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/04/11 21:44:52 tv Exp $ +# $NetBSD: Makefile,v 1.22 2005/06/01 18:02:38 jlam Exp $ DISTNAME= mp3info-0.8.4 PKGNAME= g${DISTNAME} @@ -14,8 +14,6 @@ COMMENT= Utility to read and modify the ID3 tags of MP3 files CONFLICTS= mp3info-[0-9]* -USE_X11= YES - # wgetnstr() INCOMPAT_CURSES= NetBSD-1.5-* NetBSD-1.5.*-* NetBSD-1.5[A-U]-* diff --git a/audio/gnome-audio/Makefile b/audio/gnome-audio/Makefile index 5ee9aaabfa8..87f61bd7bba 100644 --- a/audio/gnome-audio/Makefile +++ b/audio/gnome-audio/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/05/24 13:53:13 rillig Exp $ +# $NetBSD: Makefile,v 1.15 2005/06/01 18:02:38 jlam Exp $ # DISTNAME= gnome-audio-2.0.0 @@ -14,7 +14,8 @@ COMMENT= Set of audio files for GNOME NO_CONFIGURE= YES NO_BUILD= YES USE_DIRS+= xdg-1.1 -USE_X11= YES + +.include "../../mk/x11.buildlink3.mk" do-install: cd ${WRKSRC}/sounds && for f in *.wav */*.wav; do \ diff --git a/audio/gnome-speech/Makefile b/audio/gnome-speech/Makefile index c859c3c04bb..b13685cb291 100644 --- a/audio/gnome-speech/Makefile +++ b/audio/gnome-speech/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/05/22 20:07:38 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2005/06/01 18:02:38 jlam Exp $ # DISTNAME= gnome-speech-0.3.6 @@ -17,7 +17,6 @@ BUILD_USES_MSGFMT= yes USE_TOOLS+= gmake USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes -USE_X11= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-gtk-doc @@ -31,4 +30,5 @@ PKGCONFIG_OVERRIDE+= gnome-speech-1.0.pc.in .include "../../devel/libbonobo/buildlink3.mk" .include "../../devel/pkgconfig/buildlink3.mk" .include "../../net/ORBit2/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/gqmpeg-devel/Makefile b/audio/gqmpeg-devel/Makefile index 208f817c51c..a5fe1bf804e 100644 --- a/audio/gqmpeg-devel/Makefile +++ b/audio/gqmpeg-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/05/31 15:13:57 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2005/06/01 18:02:38 jlam Exp $ DISTNAME= gqmpeg-0.91.1 PKGREVISION= 2 @@ -18,7 +18,6 @@ USE_DIRS+= gnome2-1.5 USE_DIRS+= xdg-1.2 USE_PKGINSTALL= YES USE_PKGLOCALEDIR= YES -USE_X11= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --without-included-gettext diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile index aa861188cef..c4012296d8d 100644 --- a/audio/gqmpeg/Makefile +++ b/audio/gqmpeg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.85 2005/05/31 12:20:11 wiz Exp $ +# $NetBSD: Makefile,v 1.86 2005/06/01 18:02:38 jlam Exp $ DISTNAME= gqmpeg-0.20.0 PKGREVISION= 8 @@ -18,7 +18,6 @@ USE_DIRS+= gnome1-1.5 USE_DIRS+= xdg-1.2 USE_PKGINSTALL= YES USE_PKGLOCALEDIR= YES -USE_X11= YES GNU_CONFIGURE= YES DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL diff --git a/audio/kmp/Makefile b/audio/kmp/Makefile index a8750b694d9..6fb89d8c922 100644 --- a/audio/kmp/Makefile +++ b/audio/kmp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/04/11 21:44:53 tv Exp $ +# $NetBSD: Makefile,v 1.5 2005/06/01 18:02:38 jlam Exp $ DISTNAME= kmp-0.01 PKGREVISION= 1 @@ -12,7 +12,6 @@ COMMENT= Qt client for the Music Player Daemon USE_LANGUAGES= c++ USE_LIBTOOL= yes -USE_X11= yes HAS_CONFIGURE= yes CONFIGURE_ARGS+= ${PREFIX} diff --git a/audio/libao-arts/Makefile b/audio/libao-arts/Makefile index 0b488dbe6c5..3468d296cfb 100644 --- a/audio/libao-arts/Makefile +++ b/audio/libao-arts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2004/11/16 14:49:41 adam Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/01 18:02:38 jlam Exp $ .include "../libao/Makefile.common" @@ -9,9 +9,9 @@ COMMENT+= (arts plugin) CONFIGURE_ARGS:= ${CONFIGURE_ARGS:S/disable-arts/enable-arts/g} BUILD_DIRS= ${WRKSRC}/src/plugins/arts INSTALL_DIRS= ${WRKSRC}/src/plugins/arts -USE_X11= YES .include "../../audio/arts/buildlink3.mk" .include "../../audio/libao/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/libvisual-plugins/Makefile b/audio/libvisual-plugins/Makefile index e7fdc315823..7160ab4ac8d 100644 --- a/audio/libvisual-plugins/Makefile +++ b/audio/libvisual-plugins/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/04/11 21:44:54 tv Exp $ +# $NetBSD: Makefile,v 1.4 2005/06/01 18:02:38 jlam Exp $ # DISTNAME= libvisual-plugins-0.2.0 @@ -13,7 +13,6 @@ CONFLICTS= libvisual-nebulus-[0-9]* libvisual-gforce-[0-9]* USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes -USE_X11= yes GNU_CONFIGURE= yes # sigsegfaults in 0.2.0 because of: @@ -27,4 +26,5 @@ CONFIGURE_ARGS+= --disable-dancingparticles .include "../../graphics/MesaLib/buildlink3.mk" # currently not useful, since libgdkpixbuf plugin is not configurable #.include "../../x11/gtk2/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/libvisual/Makefile b/audio/libvisual/Makefile index f0718bd82cf..ed00390441a 100644 --- a/audio/libvisual/Makefile +++ b/audio/libvisual/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/04/19 15:38:21 rillig Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:02:38 jlam Exp $ # DISTNAME= libvisual-0.2.0 @@ -10,9 +10,9 @@ HOMEPAGE= http://libvisual.sourceforge.net/ COMMENT= Abstraction library between applications and audio visualisation plugins USE_LIBTOOL= yes -USE_X11= yes PKGCONFIG_OVERRIDE+= ${WRKSRC}/libvisual.pc.in GNU_CONFIGURE= yes .include "../../devel/pkgconfig/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/madman/Makefile b/audio/madman/Makefile index 0c5acaf0aa4..caea8ac9adb 100644 --- a/audio/madman/Makefile +++ b/audio/madman/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/05/31 22:00:06 rillig Exp $ +# $NetBSD: Makefile,v 1.8 2005/06/01 18:02:38 jlam Exp $ DISTNAME= madman-0.93 PKGREVISION= 2 @@ -11,8 +11,6 @@ COMMENT= Powerful audio manager for large collections BUILD_DEPENDS+= scons>=0.96:../../devel/scons -USE_X11= yes - GCC_REQD= 3.0 post-extract: diff --git a/audio/mixer.app/Makefile b/audio/mixer.app/Makefile index b3fa1e35d37..0f7ca731db2 100644 --- a/audio/mixer.app/Makefile +++ b/audio/mixer.app/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/04/11 21:44:55 tv Exp $ +# $NetBSD: Makefile,v 1.9 2005/06/01 18:02:38 jlam Exp $ # DISTNAME= Mixer.app-1.8.0 @@ -14,7 +14,6 @@ COMMENT= Another mixer intended for the windowmaker dockapp PKG_INSTALLATION_TYPES= overwrite pkgviews USE_LANGUAGES= c++ -USE_X11= YES INSTALLATION_DIRS= bin diff --git a/audio/mpg123-nas/Makefile b/audio/mpg123-nas/Makefile index 3a7d726aa5a..7f907689955 100644 --- a/audio/mpg123-nas/Makefile +++ b/audio/mpg123-nas/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/01/12 14:17:44 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/01 18:02:38 jlam Exp $ PKGNAME= mpg123${TARGET_SUFFIX}-${MPG123_VERSION} PKGREVISION= 6 @@ -8,9 +8,8 @@ TARGET_SUFFIX= -nas CONFLICTS+= mpg123-[0-9]* -USE_X11= yes - .include "../../audio/mpg123/Makefile.common" .include "../../audio/nas/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/muse/Makefile b/audio/muse/Makefile index 0acf3c4171c..26b20544521 100644 --- a/audio/muse/Makefile +++ b/audio/muse/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/05/31 22:23:50 rillig Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:38 jlam Exp $ # DISTNAME= MuSE-0.9 @@ -15,7 +15,6 @@ COMMENT= Multiple Streaming Engine GNU_CONFIGURE= yes USE_TOOLS+= gmake -USE_X11= yes USE_PKGLOCALEDIR= yes CONFIGURE_ARGS+= --disable-ncurses diff --git a/audio/musicbox/Makefile b/audio/musicbox/Makefile index 0eba07084ca..2ceef7dc92d 100644 --- a/audio/musicbox/Makefile +++ b/audio/musicbox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/04/11 21:44:55 tv Exp $ +# $NetBSD: Makefile,v 1.18 2005/06/01 18:02:38 jlam Exp $ DISTNAME= musicbox-1.01p2 CATEGORIES= audio @@ -11,7 +11,6 @@ COMMENT= X11 front-interface for mpg123 DEPENDS+= mpg123>=0.59.18:../../audio/mpg123 WRKSRC= ${WRKDIR}/musicbox-1.01 -USE_X11= yes CFLAGS+= -D${OPSYS} MAKE_ENV+= QT1DIR="${QT1DIR}" diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile index 783fbf2b83b..7def4d71527 100644 --- a/audio/rhythmbox/Makefile +++ b/audio/rhythmbox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/05/22 20:07:39 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2005/06/01 18:02:38 jlam Exp $ # DISTNAME= rhythmbox-0.8.8 @@ -24,7 +24,6 @@ USE_DIRS+= gnome2-1.5 USE_TOOLS+= gmake USE_LIBTOOL= YES USE_PKGLOCALEDIR= YES -USE_X11= YES PKGCONFIG_OVERRIDE= data/rhythmbox.pc.in diff --git a/audio/rosegarden/Makefile b/audio/rosegarden/Makefile index 2c6c152eee3..e539c2818e6 100644 --- a/audio/rosegarden/Makefile +++ b/audio/rosegarden/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/05/22 20:07:39 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2005/06/01 18:02:38 jlam Exp $ DISTNAME= rosegarden-2.1pl4 PKGNAME= rosegarden-2.1.4 @@ -17,7 +17,8 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews GNU_CONFIGURE= YES USE_TOOLS+= gmake MAKE_ENV+= GCC=yes -USE_X11= YES + +.include "../../mk/x11.buildlink3.mk" post-extract: cd ${WRKSRC} && ${MV} Rosegarden Rosegarden.in diff --git a/audio/rsynth/Makefile b/audio/rsynth/Makefile index ff60d697e7e..95667af3564 100644 --- a/audio/rsynth/Makefile +++ b/audio/rsynth/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/03/30 19:51:35 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2005/06/01 18:02:38 jlam Exp $ DISTNAME= rsynth-2.0 PKGREVISION= 1 @@ -16,7 +16,6 @@ EXTRACT_ONLY= rsynth-2.0.tar.gz DIST_SUBDIR= rsynth GNU_CONFIGURE= YES -USE_X11= YES CONFIGURE_ARGS+=--with-aDict="${WRKDIR}/cmudict.0.4" CONFIGURE_ARGS+=--without-bDict @@ -32,4 +31,5 @@ post-install: .include "../../audio/nas/buildlink3.mk" .include "../../databases/gdbm/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/snd/Makefile b/audio/snd/Makefile index 515b4aed976..ad9f95c67a1 100644 --- a/audio/snd/Makefile +++ b/audio/snd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2005/04/11 21:44:56 tv Exp $ +# $NetBSD: Makefile,v 1.39 2005/06/01 18:02:38 jlam Exp $ # DISTNAME= snd @@ -16,7 +16,6 @@ NO_SRC_ON_FTP= Already on MASTER_SITE_LOCAL PKG_INSTALLATION_TYPES= overwrite pkgviews WRKSRC= ${WRKDIR} -USE_X11= YES MAKEFILE= makefile.netbsd BUILD_TARGET= snd diff --git a/audio/spiralloops/Makefile b/audio/spiralloops/Makefile index 302488d0e87..4cb3aa42c6c 100644 --- a/audio/spiralloops/Makefile +++ b/audio/spiralloops/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/05/22 20:07:39 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2005/06/01 18:02:38 jlam Exp $ # DISTNAME= SpiralLoops-2.0.0 @@ -17,7 +17,6 @@ ONLY_FOR_PLATFORM= *-*-alpha *-*-arc *-*-cobalt *-*-dreamcast \ *-*-vax USE_LANGUAGES= c++ -USE_X11= yes USE_TOOLS+= gmake GNU_CONFIGURE= yes MAKE_ENV+= CXXFLAGS="${CXXFLAGS}" diff --git a/audio/spiralsynth/Makefile b/audio/spiralsynth/Makefile index 96e56c36c87..dee64f72b49 100644 --- a/audio/spiralsynth/Makefile +++ b/audio/spiralsynth/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/05/22 20:07:39 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2005/06/01 18:02:38 jlam Exp $ # DISTNAME= SpiralSynth-2.0.0 @@ -16,7 +16,6 @@ ONLY_FOR_PLATFORM= *-*-alpha *-*-arc *-*-cobalt *-*-dreamcast \ *-*-vax USE_LANGUAGES= c++ -USE_X11= yes USE_TOOLS+= gmake GNU_CONFIGURE= yes MAKE_ENV+= CXXFLAGS="${CXXFLAGS}" diff --git a/audio/streamtuner/Makefile b/audio/streamtuner/Makefile index 8d5ea0601fc..f2b4d5c4fbb 100644 --- a/audio/streamtuner/Makefile +++ b/audio/streamtuner/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/05/22 20:07:39 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2005/06/01 18:02:38 jlam Exp $ # DISTNAME= streamtuner-0.99 @@ -18,7 +18,6 @@ USE_DIRS+= gnome2-1.5 USE_TOOLS+= gmake USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes -USE_X11= yes GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE= extras/streamtuner.pc.in diff --git a/audio/sweep/Makefile b/audio/sweep/Makefile index 9c4cf4475b5..76a9630153a 100644 --- a/audio/sweep/Makefile +++ b/audio/sweep/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/05/22 20:07:39 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2005/06/01 18:02:39 jlam Exp $ # DISTNAME= sweep-0.8.3 @@ -16,7 +16,6 @@ USE_DIRS+= gnome1-1.5 USE_LIBTOOL= YES USE_TOOLS+= gmake USE_PKGLOCALEDIR= YES -USE_X11= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --disable-oggtest diff --git a/audio/tcl-snack/Makefile b/audio/tcl-snack/Makefile index dff01830967..235563f7808 100644 --- a/audio/tcl-snack/Makefile +++ b/audio/tcl-snack/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/04/17 01:10:25 kristerw Exp $ +# $NetBSD: Makefile,v 1.15 2005/06/01 18:02:39 jlam Exp $ DISTNAME= snack2.2.8 PKGNAME= tcl-snack-2.2.8 @@ -13,7 +13,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews WRKSRC= ${WRKDIR}/${DISTNAME}/unix GNU_CONFIGURE= YES -USE_X11= YES CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl}/lib CONFIGURE_ARGS+= --with-tk=${BUILDLINK_PREFIX.tk}/lib diff --git a/audio/terminatorx/Makefile b/audio/terminatorx/Makefile index b2d1d65e577..9fe771b52ac 100644 --- a/audio/terminatorx/Makefile +++ b/audio/terminatorx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/04/11 21:44:57 tv Exp $ +# $NetBSD: Makefile,v 1.3 2005/06/01 18:02:39 jlam Exp $ # DISTNAME= terminatorX-3.82 @@ -15,7 +15,6 @@ DEPENDS+= mpg123-[0-9]*:../../audio/mpg123 DEPENDS+= sox-[0-9]*:../../audio/sox DEPENDS+= vorbis-tools-[0-9]*:../../audio/vorbis-tools -USE_X11= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes diff --git a/audio/wmmp3/Makefile b/audio/wmmp3/Makefile index 2786e8ec30a..dc85d485363 100644 --- a/audio/wmmp3/Makefile +++ b/audio/wmmp3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/04/11 21:44:58 tv Exp $ +# $NetBSD: Makefile,v 1.8 2005/06/01 18:02:39 jlam Exp $ DISTNAME= wmmp3-0.12 PKGREVISION= 1 @@ -12,7 +12,6 @@ COMMENT= Front-end for mpg123 in a Window Maker dockapp DEPENDS+= mpg123>=0.59.18:../../audio/mpg123 GNU_CONFIGURE= yes -USE_X11= yes post-patch: ${MV} ${WRKSRC}/sample.wmmp3 ${WRKSRC}/sample.wmmp3.orig diff --git a/audio/wmusic/Makefile b/audio/wmusic/Makefile index b44799ec9ce..27b942cf187 100644 --- a/audio/wmusic/Makefile +++ b/audio/wmusic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/05/22 20:07:39 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 18:02:39 jlam Exp $ DISTNAME= wmusic-1.5.0 PKGREVISION= 1 @@ -11,7 +11,6 @@ COMMENT= WindowMaker dockable remote for XMMS GNU_CONFIGURE= yes USE_TOOLS+= gmake -USE_X11= yes do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/wmusic ${PREFIX}/bin diff --git a/audio/xamp/Makefile b/audio/xamp/Makefile index 53b6b5e71de..ed0e46b23db 100644 --- a/audio/xamp/Makefile +++ b/audio/xamp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/05/22 20:07:39 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2005/06/01 18:02:39 jlam Exp $ DISTNAME= xamp-0.8-10 PKGNAME= xamp-0.8.10 @@ -19,7 +19,6 @@ GNU_CONFIGURE= yes CONFIGURE_ENV+= CXXFLAGS="${CFLAGS}" USE_TOOLS+= gmake USE_LANGUAGES= c c++ -USE_X11= yes CONFIGURE_ARGS+= --with-qt-dir=${BUILDLINK_PREFIX.qt1:Q}/qt1 diff --git a/audio/xanalyser/Makefile b/audio/xanalyser/Makefile index 54d6c8e23ba..5e32c0add5b 100644 --- a/audio/xanalyser/Makefile +++ b/audio/xanalyser/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/04/11 21:44:58 tv Exp $ +# $NetBSD: Makefile,v 1.9 2005/06/01 18:02:39 jlam Exp $ # DISTNAME= xanalyser-1.24 @@ -11,7 +11,6 @@ HOMEPAGE= http://www.suse.de/~arvin/xanalyser/ COMMENT= Frequency spectrum analyser for X USE_LANGUAGES= c++ -USE_X11= # defined GNU_CONFIGURE= # defined .include "../../graphics/xpm/buildlink3.mk" diff --git a/audio/xhippo/Makefile b/audio/xhippo/Makefile index 0230fc2a7b5..d9fe2cdd395 100644 --- a/audio/xhippo/Makefile +++ b/audio/xhippo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/04/11 21:44:58 tv Exp $ +# $NetBSD: Makefile,v 1.23 2005/06/01 18:02:39 jlam Exp $ # DISTNAME= xhippo-3.3 @@ -10,7 +10,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.gnu.org/software/xhippo/xhippo.html COMMENT= Generic playlist manager for UNIX -USE_X11= yes GNU_CONFIGURE= yes CONFIGURE_ENV+= --with-gnome=no diff --git a/audio/xmms-alarm/Makefile b/audio/xmms-alarm/Makefile index 6241b813ca6..5b50925d05e 100644 --- a/audio/xmms-alarm/Makefile +++ b/audio/xmms-alarm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/04/11 21:44:58 tv Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:02:39 jlam Exp $ # DISTNAME= xmms-alarm-0.3.6 @@ -9,7 +9,6 @@ MAINTAINER= dotz@irc.pl HOMEPAGE= http://www.snika.uklinux.net/index.php?show=xmms-alarm COMMENT= Plugin which allows XMMS to be used as an alarm clock -USE_X11= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES SHLIBTOOL_OVERRIDE= libtool diff --git a/audio/xmms-bezier/Makefile b/audio/xmms-bezier/Makefile index dcd69da1727..c112c3df10e 100644 --- a/audio/xmms-bezier/Makefile +++ b/audio/xmms-bezier/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/04/11 21:44:58 tv Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 18:02:39 jlam Exp $ # DISTNAME= bezier-0.0.3 @@ -11,7 +11,6 @@ MAINTAINER= tech-pkg@NetBSD.org COMMENT= OpenGL XMMS plugin GNU_CONFIGURE= yes -USE_X11= yes USE_LIBTOOL= yes CPPFLAGS+= -D_POSIX_THREAD_SYSCALL_SOFT=1 LIBS+= -lX11 -lm diff --git a/audio/xmms-blursk/Makefile b/audio/xmms-blursk/Makefile index d12f7d475b6..ac0b5741e2d 100644 --- a/audio/xmms-blursk/Makefile +++ b/audio/xmms-blursk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/04/11 21:44:58 tv Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:39 jlam Exp $ DISTNAME= Blursk-1.3 PKGNAME= xmms-blursk-1.3 @@ -15,7 +15,6 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} GNU_CONFIGURE= YES USE_LIBTOOL= YES -USE_X11= YES .include "../../mk/bsd.prefs.mk" diff --git a/audio/xmms-crossfade/Makefile b/audio/xmms-crossfade/Makefile index d7d018e0d8f..4085db71596 100644 --- a/audio/xmms-crossfade/Makefile +++ b/audio/xmms-crossfade/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/04/11 21:44:58 tv Exp $ +# $NetBSD: Makefile,v 1.24 2005/06/01 18:02:39 jlam Exp $ # DISTNAME= xmms-crossfade-0.2.9 @@ -11,7 +11,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.netcologne.de/~nc-eisenlpe2/xmms-crossfade/ COMMENT= Crossfading/Gapless Plugin for XMMS -USE_X11= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES diff --git a/audio/xmms-dflowers/Makefile b/audio/xmms-dflowers/Makefile index 989ad70049c..d7c832cd34b 100644 --- a/audio/xmms-dflowers/Makefile +++ b/audio/xmms-dflowers/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/04/11 21:44:58 tv Exp $ +# $NetBSD: Makefile,v 1.21 2005/06/01 18:02:39 jlam Exp $ # DISTNAME= dflowers-1.2 @@ -11,7 +11,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://hem.passagen.se/joakime/linuxapp.html COMMENT= XMMS plugin for dual flower scope -USE_X11= YES USE_LIBTOOL= YES .include "../../audio/xmms/buildlink3.mk" diff --git a/audio/xmms-dscope/Makefile b/audio/xmms-dscope/Makefile index b13d506e3ed..5bda7683dcc 100644 --- a/audio/xmms-dscope/Makefile +++ b/audio/xmms-dscope/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/04/11 21:44:58 tv Exp $ +# $NetBSD: Makefile,v 1.19 2005/06/01 18:02:39 jlam Exp $ # DISTNAME= dscope-1.2 @@ -11,7 +11,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://hem.passagen.se/joakime/linuxapp.html COMMENT= XMMS plugin for dual scope -USE_X11= YES USE_LIBTOOL= YES pre-build: diff --git a/audio/xmms-dspectogram/Makefile b/audio/xmms-dspectogram/Makefile index 7f2ba3a4aa5..45e9eab8da0 100644 --- a/audio/xmms-dspectogram/Makefile +++ b/audio/xmms-dspectogram/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/04/11 21:44:58 tv Exp $ +# $NetBSD: Makefile,v 1.20 2005/06/01 18:02:39 jlam Exp $ # DISTNAME= dspectogram-1.2 @@ -11,7 +11,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.shell.linux.se/bm/index.php?page=xmmsplugin COMMENT= XMMS plugin for dual spectogram -USE_X11= YES USE_LIBTOOL= YES pre-build: diff --git a/audio/xmms-dspectral/Makefile b/audio/xmms-dspectral/Makefile index 29dd2b53853..0917c7b8b10 100644 --- a/audio/xmms-dspectral/Makefile +++ b/audio/xmms-dspectral/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/04/11 21:44:58 tv Exp $ +# $NetBSD: Makefile,v 1.10 2005/06/01 18:02:39 jlam Exp $ # DISTNAME= dspectral-1.2 @@ -11,7 +11,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://hem.passagen.se/joakime/linuxapp.html COMMENT= XMMS plugin for dual spectral analyzer -USE_X11= YES USE_LIBTOOL= YES pre-build: diff --git a/audio/xmms-fmradio/Makefile b/audio/xmms-fmradio/Makefile index 151abae19cb..5aaad7a4f4d 100644 --- a/audio/xmms-fmradio/Makefile +++ b/audio/xmms-fmradio/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/04/11 21:44:58 tv Exp $ +# $NetBSD: Makefile,v 1.14 2005/06/01 18:02:39 jlam Exp $ # DISTNAME= xmms-FMRadio-1.4 @@ -14,7 +14,6 @@ COMMENT= Use a Radio Tuner card in XMMS ONLY_FOR_PLATFORM= NetBSD-1.5Z[A-Z]-*-* NetBSD-1.6*-* NetBSD-[2-9]*-* -USE_X11= YES BINOWN?= ${ROOT_USER} BINGRP?= ${ROOT_GROUP} diff --git a/audio/xmms-funtimedancer/Makefile b/audio/xmms-funtimedancer/Makefile index 9787453ac9a..6a0733530dd 100644 --- a/audio/xmms-funtimedancer/Makefile +++ b/audio/xmms-funtimedancer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/04/11 21:44:59 tv Exp $ +# $NetBSD: Makefile,v 1.14 2005/06/01 18:02:39 jlam Exp $ # DISTNAME= FunTimeDancer-0.1 @@ -12,8 +12,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://sourceforge.net/projects/ftd/ COMMENT= XMMS plugin displaying an animation -USE_X11= yes - post-install: cd ${WRKDIR} && \ ${PAX} -rw -pe FunTimeDancer ${PREFIX}/lib/xmms/Visualization diff --git a/audio/xmms-gdancer/Makefile b/audio/xmms-gdancer/Makefile index 73bc32a27f5..8b092498f53 100644 --- a/audio/xmms-gdancer/Makefile +++ b/audio/xmms-gdancer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/04/11 21:44:59 tv Exp $ +# $NetBSD: Makefile,v 1.15 2005/06/01 18:02:39 jlam Exp $ # DISTNAME= gdancer-0.4.3 @@ -11,7 +11,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://figz.com/gdancer/ COMMENT= XMMS plugin to animate characters to the beat of the music -USE_X11= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES diff --git a/audio/xmms-modplug/Makefile b/audio/xmms-modplug/Makefile index 0b3134f6752..426ed3bfa56 100644 --- a/audio/xmms-modplug/Makefile +++ b/audio/xmms-modplug/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/04/11 21:44:59 tv Exp $ +# $NetBSD: Makefile,v 1.8 2005/06/01 18:02:39 jlam Exp $ # DISTNAME= modplugxmms-2.05 @@ -14,7 +14,6 @@ COMMENT= XMMS plugin based on modplug DEPENDS+= unzip-[0-9]*:../../archivers/unzip LDFLAGS+= -lm ${LIBOSSAUDIO} -USE_X11= yes GNU_CONFIGURE= yes USE_LIBTOOL= yes SHLIBTOOL_OVERRIDE= libtool-disable-static diff --git a/audio/xmms-neato/Makefile b/audio/xmms-neato/Makefile index 3d7177f5984..c9fe077b9a8 100644 --- a/audio/xmms-neato/Makefile +++ b/audio/xmms-neato/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/05/22 20:07:40 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2005/06/01 18:02:39 jlam Exp $ # DISTNAME= neato @@ -14,7 +14,6 @@ COMMENT= Circle effect XMMS plugin GNU_CONFIGURE= yes USE_TOOLS+= gmake USE_LIBTOOL= yes -USE_X11= yes GNU_CONFIGURE= YES diff --git a/audio/xmms-paranormal/Makefile b/audio/xmms-paranormal/Makefile index c3e5686d00b..f745fe4bcc2 100644 --- a/audio/xmms-paranormal/Makefile +++ b/audio/xmms-paranormal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/05/24 13:58:04 rillig Exp $ +# $NetBSD: Makefile,v 1.15 2005/06/01 18:02:39 jlam Exp $ # DISTNAME= paranormal-0.2.0 @@ -14,7 +14,6 @@ COMMENT= Extremely customizable (pseudo-programmable) XMMS plugin GNU_CONFIGURE= yes USE_BUILDLINK_ONLY= YES USE_LIBTOOL= yes -USE_X11= yes CPPFLAGS+= -D_POSIX_THREAD_SYSCALL_SOFT=1 # Might be better in textproc/libxml2/buildlink.mk: diff --git a/audio/xmms-synaesthesia/Makefile b/audio/xmms-synaesthesia/Makefile index 27351a591d6..2194c7b2043 100644 --- a/audio/xmms-synaesthesia/Makefile +++ b/audio/xmms-synaesthesia/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/04/11 21:45:00 tv Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:40 jlam Exp $ # DISTNAME= synaesthesia-xmms-0.0.3-rc3 @@ -13,7 +13,6 @@ COMMENT= Port of Synaesthesia to an XMMS plugin GNU_CONFIGURE= yes USE_LIBTOOL= yes -USE_X11= yes CPPFLAGS+= -D_POSIX_THREAD_SYSCALL_SOFT=1 diff --git a/audio/xmms-vismsa/Makefile b/audio/xmms-vismsa/Makefile index ba77666646f..60ee0bfef49 100644 --- a/audio/xmms-vismsa/Makefile +++ b/audio/xmms-vismsa/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/04/11 21:45:00 tv Exp $ +# $NetBSD: Makefile,v 1.15 2005/06/01 18:02:40 jlam Exp $ # DISTNAME= vismsa-xmms-plugin-0.2 @@ -11,7 +11,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://a.godau.org/ COMMENT= Vis plugin similar to the Spectrum Analyser from Open Cubic Player -USE_X11= YES USE_LIBTOOL= YES pre-build: diff --git a/audio/xmms/Makefile.common b/audio/xmms/Makefile.common index ae2f15d17e1..1e3b2bdc69e 100644 --- a/audio/xmms/Makefile.common +++ b/audio/xmms/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.18 2005/05/31 16:28:54 wiz Exp $ +# $NetBSD: Makefile.common,v 1.19 2005/06/01 18:02:39 jlam Exp $ # DISTNAME= xmms-1.2.10 @@ -14,7 +14,6 @@ COMMENT= X Multimedia System - an audio player with a Winamp GUI USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes USE_TOOLS+= gmake -USE_X11= yes GNU_CONFIGURE= yes DISTINFO_FILE= ${.CURDIR}/../../audio/xmms/distinfo diff --git a/audio/xmp/Makefile b/audio/xmp/Makefile index b8ce2104c3b..b1c3052f3ee 100644 --- a/audio/xmp/Makefile +++ b/audio/xmp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/05/22 20:07:40 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2005/06/01 18:02:40 jlam Exp $ DISTNAME= xmp-2.0.4 PKGREVISION= 2 @@ -17,7 +17,6 @@ CONFIGURE_ARGS+=--disable-alsa \ --disable-xmms \ --sysconfdir=${PKG_SYSCONFDIR} -USE_X11= yes USE_TOOLS+= gmake EGDIR= ${PREFIX}/share/examples/xmp @@ -31,6 +30,8 @@ CONF_FILES+= ${EGDIR}/xmp.conf ${PKG_SYSCONFDIR}/xmp.conf .include "../../audio/esound/buildlink3.mk" .endif +.include "../../mk/x11.buildlink3.mk" + pre-install: ${INSTALL_DATA_DIR} ${EGDIR} diff --git a/audio/yamt/Makefile b/audio/yamt/Makefile index cb901b6a98e..62a4830b91c 100644 --- a/audio/yamt/Makefile +++ b/audio/yamt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/05/22 20:07:40 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2005/06/01 18:02:40 jlam Exp $ DISTNAME= yamt-0.5 PKGREVISION= 7 @@ -13,7 +13,6 @@ BUILD_USES_MSGFMT= yes USE_DIRS+= xdg-1.1 USE_PKGLOCALEDIR= yes -USE_X11= yes USE_TOOLS+= gmake GNU_CONFIGURE= yes diff --git a/biology/chemtool/Makefile b/biology/chemtool/Makefile index 8e5706684f3..f137aac29b5 100644 --- a/biology/chemtool/Makefile +++ b/biology/chemtool/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/05/22 20:07:40 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2005/06/01 18:02:40 jlam Exp $ DISTNAME= chemtool-1.6 PKGREVISION= 1 @@ -12,7 +12,6 @@ COMMENT= Program for drawing organic molecules PKG_INSTALLATION_TYPES= overwrite pkgviews USE_PKGLOCALEDIR= yes -USE_X11= yes GNU_CONFIGURE= yes USE_TOOLS+= gmake diff --git a/biology/phylip/Makefile b/biology/phylip/Makefile index 2e596e2bc8c..eb9edb42999 100644 --- a/biology/phylip/Makefile +++ b/biology/phylip/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/05/07 20:43:39 kristerw Exp $ +# $NetBSD: Makefile,v 1.10 2005/06/01 18:02:40 jlam Exp $ DISTNAME= phylip-3.61 CATEGORIES= biology @@ -14,7 +14,7 @@ NO_BIN_ON_CDROM= ${RESTRICTED} WRKSRC= ${WRKDIR}/${DISTNAME}/src -USE_X11= yes +.include "../../mk/x11.buildlink3.mk" do-install: .for PROGRAM in clique consense contml contrast dnacomp dnadist \ diff --git a/cad/dinotrace/Makefile b/cad/dinotrace/Makefile index f59460fafe6..0f4b5dd33d6 100644 --- a/cad/dinotrace/Makefile +++ b/cad/dinotrace/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2005/05/22 20:07:40 jlam Exp $ +# $NetBSD: Makefile,v 1.33 2005/06/01 18:02:40 jlam Exp $ # DISTNAME= dinotrace-9.2a @@ -12,7 +12,6 @@ COMMENT= Tool for viewing the output of digital simulators GNU_CONFIGURE= YES INFO_FILES= dinotrace.info USE_PERL5= build -USE_X11= YES USE_TOOLS+= gmake .include "../../mk/motif.buildlink3.mk" diff --git a/cad/electric/Makefile b/cad/electric/Makefile index fd68d1a519f..df681bcb47c 100644 --- a/cad/electric/Makefile +++ b/cad/electric/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/04/11 21:45:01 tv Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:40 jlam Exp $ # DISTNAME= electric-7.00 @@ -9,7 +9,6 @@ MAINTAINER= dmcmahill@NetBSD.org HOMEPAGE= http://www.gnu.org/software/electric/electric.html COMMENT= Electrical CAD system -USE_X11= YES GNU_CONFIGURE= YES post-patch: diff --git a/cad/gtkwave/Makefile b/cad/gtkwave/Makefile index 7171796564d..9569a9bfa66 100644 --- a/cad/gtkwave/Makefile +++ b/cad/gtkwave/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/04/11 21:45:02 tv Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:40 jlam Exp $ # #DISTNAME= gtkwave-2.0.0pre3 @@ -13,7 +13,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.cs.man.ac.uk/apt/tools/gtkwave/index.html COMMENT= Electronic waveform viewer -USE_X11= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes diff --git a/cad/magic/Makefile b/cad/magic/Makefile index 7813ab03aef..b0472449fcf 100644 --- a/cad/magic/Makefile +++ b/cad/magic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/05/22 20:07:41 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2005/06/01 18:02:40 jlam Exp $ # DISTNAME= magic-7.1 @@ -11,9 +11,10 @@ HOMEPAGE= http://vlsi.cornell.edu/magic/ COMMENT= Integrated circuit layout system USE_TOOLS+= gmake -USE_X11= YES MAKE_ENV+= MAGIC_HOME=${PREFIX} +.include "../../mk/x11.buildlink3.mk" + post-patch: cd ${WRKSRC} && for f in `${FIND} . -type f -exec ${GREP} -l CAD_HOME {} /dev/null \;` ; do \ ${ECHO} "Replacing CAD_HOME in $$f" ; \ diff --git a/cad/ng-spice/Makefile b/cad/ng-spice/Makefile index 498e7f0e44f..d12deed0572 100644 --- a/cad/ng-spice/Makefile +++ b/cad/ng-spice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2005/05/22 20:07:41 jlam Exp $ +# $NetBSD: Makefile,v 1.28 2005/06/01 18:02:40 jlam Exp $ # DISTNAME= ng-spice-rework-15c @@ -11,7 +11,6 @@ HOMEPAGE= http://ngspice.sourceforge.net/ COMMENT= Next generation circuit simulation program WRKSRC= ${WRKDIR}/ng-spice-rework-15 -USE_X11= YES USE_LIBTOOL= YES USE_MAKEINFO= YES USE_TOOLS+= gmake @@ -20,11 +19,12 @@ USE_GNU_READLINE= uses rl_* interface GNU_CONFIGURE= YES CONFIGURE_ARGS+= --disable-debug CONFIGURE_ARGS+= --with-readline -LIBS+= ${LIBGETOPT} +LIBS+= ${BUILDLINK_LDADD.getopt} INFO_FILES= ngspice.info .include "../../devel/libgetopt/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/cad/pcb-current/Makefile b/cad/pcb-current/Makefile index 376e668a320..beb8bc8ab4d 100644 --- a/cad/pcb-current/Makefile +++ b/cad/pcb-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/05/22 20:28:47 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2005/06/01 18:02:40 jlam Exp $ # DISTNAME= pcb-${SNAPDATE} @@ -20,7 +20,6 @@ SNAPDATE= 20050315 GNU_CONFIGURE= yes USE_TOOLS+= bison gm4 gmake lex TOOLS_DEPMETHOD.gm4= DEPENDS -USE_X11= yes INFO_FILES= pcb.info diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile index 89eb4b57d9b..6a604435d8e 100644 --- a/cad/qcad/Makefile +++ b/cad/qcad/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/04/11 21:45:02 tv Exp $ +# $NetBSD: Makefile,v 1.24 2005/06/01 18:02:40 jlam Exp $ DISTNAME= qcad-1.5.4-src PKGNAME= qcad-1.5.4 @@ -11,7 +11,6 @@ HOMEPAGE= http://www.qcad.org/ COMMENT= 2D CAD System WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} -USE_X11= # defined MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH} MAKE_ENV+= QTDIR=${BUILDLINK_PREFIX.qt3} diff --git a/cad/spice/Makefile b/cad/spice/Makefile index 5d95e934c8a..a72df8adb3d 100644 --- a/cad/spice/Makefile +++ b/cad/spice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2005/04/11 21:45:02 tv Exp $ +# $NetBSD: Makefile,v 1.31 2005/06/01 18:02:40 jlam Exp $ DISTNAME= sp3f4.kit PKGNAME= spice-3f5.1 @@ -13,7 +13,6 @@ COMMENT= General-purpose circuit simulation program WRKSRC= ${WRKDIR} -USE_X11= # defined # GPL license used by GNU readline is not compatible # with 4 clause BSD license used by spice. #BUILDLINK_DEPENDS.readline= readline>=4.0 @@ -64,4 +63,5 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/examples/*.cir ${PREFIX}/share/examples/spice3 #.include "../../devel/readline/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/cad/vipec/Makefile b/cad/vipec/Makefile index 9c3f9b69975..ab04bb7858b 100644 --- a/cad/vipec/Makefile +++ b/cad/vipec/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2005/05/22 20:07:41 jlam Exp $ +# $NetBSD: Makefile,v 1.42 2005/06/01 18:02:41 jlam Exp $ # DISTNAME= ViPEC-3.2.0 @@ -9,7 +9,6 @@ MAINTAINER= dmcmahill@NetBSD.org HOMEPAGE= http://vipec.sourceforge.net/ COMMENT= Network analyser for electrical networks -USE_X11= yes USE_TOOLS+= gmake UNLIMIT_RESOURCES+= datasize diff --git a/cad/xchiplogo/Makefile b/cad/xchiplogo/Makefile index 02ba695a1a7..c5913404dc0 100644 --- a/cad/xchiplogo/Makefile +++ b/cad/xchiplogo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/04/11 21:45:03 tv Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 18:02:41 jlam Exp $ # DISTNAME= xchiplogo @@ -11,8 +11,6 @@ MAINTAINER= dmcmahill@NetBSD.org HOMEPAGE= http://www.eleceng.adelaide.edu.au/Personal/moini/chiplogo.html COMMENT= Program for generating pretty logos on VLSI chips -USE_X11= YES - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xchiplogo ${LOCALBASE}/bin/xchiplogo diff --git a/chat/gaim-encryption/Makefile b/chat/gaim-encryption/Makefile index 98f00b559fe..4f179f57052 100644 --- a/chat/gaim-encryption/Makefile +++ b/chat/gaim-encryption/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/05/22 20:07:42 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2005/06/01 18:02:41 jlam Exp $ DISTNAME= gaim-encryption-2.34 CATEGORIES= chat security @@ -13,7 +13,6 @@ BUILD_USES_MSGFMT= YES USE_TOOLS+= gmake USE_LIBTOOL= YES USE_PKGLOCALEDIR= YES -USE_X11= YES GNU_CONFIGURE= YES SHLIBTOOL_OVERRIDE= libtool diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile index a3776d0e51a..491eb36ecdb 100644 --- a/chat/gaim/Makefile +++ b/chat/gaim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.86 2005/05/22 20:07:42 jlam Exp $ +# $NetBSD: Makefile,v 1.87 2005/06/01 18:02:41 jlam Exp $ DISTNAME= gaim-1.3.0 CATEGORIES= chat x11 @@ -17,7 +17,6 @@ USE_DIRS+= xdg-1.1 USE_TOOLS+= gmake USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes -USE_X11= yes GNU_CONFIGURE= yes SHLIBTOOL_OVERRIDE= libtool diff --git a/chat/gnomeicu/Makefile b/chat/gnomeicu/Makefile index 038d02f30e6..9c8cbfdee49 100644 --- a/chat/gnomeicu/Makefile +++ b/chat/gnomeicu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2005/05/22 20:07:42 jlam Exp $ +# $NetBSD: Makefile,v 1.30 2005/06/01 18:02:41 jlam Exp $ DISTNAME= gnomeicu-0.99.5 CATEGORIES= chat gnome @@ -14,7 +14,6 @@ USE_DIRS+= gnome2-1.5 USE_TOOLS+= gmake USE_PKGINSTALL= YES USE_PKGLOCALEDIR= YES -USE_X11= YES CONFIGURE_ARGS+= --sysconfdir=${EGDIR} diff --git a/chat/gtkyahoo/Makefile b/chat/gtkyahoo/Makefile index fa92738c30f..ca091dfa5ef 100644 --- a/chat/gtkyahoo/Makefile +++ b/chat/gtkyahoo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/05/22 20:07:42 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2005/06/01 18:02:41 jlam Exp $ DISTNAME= gtkyahoo-0.18.2 PKGREVISION= 3 @@ -13,7 +13,6 @@ COMMENT= GTK+ client for Yahoo! Messenger BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison USE_TOOLS+= lex -USE_X11= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --with-libyahoo="${BUILDLINK_PREFIX.libyahoo}" diff --git a/chat/psi/Makefile b/chat/psi/Makefile index a43cea5c880..46df39c61e7 100644 --- a/chat/psi/Makefile +++ b/chat/psi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/05/22 20:07:43 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2005/06/01 18:02:41 jlam Exp $ PSI_VERSION= 0.9.3 DISTNAME= psi-${PSI_VERSION} @@ -22,7 +22,6 @@ DEPENDS+= qca-tls>=1.0:../../security/qca-tls USE_TOOLS+= gmake USE_LIBTOOL= yes -USE_X11= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix="${PREFIX}" --qtdir="${QTDIR}" diff --git a/chat/quirc/Makefile b/chat/quirc/Makefile index b7dfa5e9c89..8863aa59ab9 100644 --- a/chat/quirc/Makefile +++ b/chat/quirc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/05/22 20:07:43 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:41 jlam Exp $ # DISTNAME= quirc-0.9.84 @@ -12,7 +12,6 @@ COMMENT= Stable and powerful graphical IRC client GNU_CONFIGURE= YES USE_TOOLS+= gmake -USE_X11= YES CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl} diff --git a/chat/xchat/Makefile.common b/chat/xchat/Makefile.common index 47f56505d45..b44818d810c 100644 --- a/chat/xchat/Makefile.common +++ b/chat/xchat/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.37 2005/05/22 20:07:43 jlam Exp $ +# $NetBSD: Makefile.common,v 1.38 2005/06/01 18:02:41 jlam Exp $ DISTNAME= xchat-1.8.11 PKGREVISION= 11 @@ -52,5 +52,6 @@ post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xchat ${INSTALL_DATA} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/xchat +.include "../../mk/x11.buildlink3.mk" .include "../../lang/perl5/buildlink3.mk" .include "../../lang/python/application.mk" diff --git a/chat/xchat2/Makefile b/chat/xchat2/Makefile index 0d273d936fc..22f88ff5116 100644 --- a/chat/xchat2/Makefile +++ b/chat/xchat2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2004/11/29 17:36:10 minskim Exp $ +# $NetBSD: Makefile,v 1.42 2005/06/01 18:02:41 jlam Exp $ # .include "Makefile.common" @@ -17,7 +17,6 @@ CONFLICTS= xchat-gnome-[0-9]* USE_DIRS+= xdg-1.1 USE_PKGLOCALEDIR= YES -USE_X11= YES CONFIGURE_ARGS+= --enable-textfe CONFIGURE_ARGS+= --enable-tcl=no diff --git a/chat/zephyr/Makefile b/chat/zephyr/Makefile index 4749fb22007..9abdfde1e81 100644 --- a/chat/zephyr/Makefile +++ b/chat/zephyr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/05/31 22:41:39 rillig Exp $ +# $NetBSD: Makefile,v 1.9 2005/06/01 18:02:41 jlam Exp $ # DISTNAME= zephyr-20010518 @@ -13,7 +13,6 @@ COMMENT= Project Athena's original Instant Messaging system WRKSRC= ${WRKDIR}/zephyr USE_PKGINSTALL= YES GNU_CONFIGURE= YES -USE_X11= YES CPPFLAGS.NetBSD+= -I/usr/include/kerberosIV -I/usr/include/krb5 LDFLAGS.NetBSD+= -lroken -lcrypto -lcom_err -ledit -lcurses @@ -44,4 +43,5 @@ pre-install: .include "../../devel/readline/buildlink3.mk" .include "../../net/hesiod/buildlink3.mk" .include "../../net/libares/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/comms/estic/Makefile b/comms/estic/Makefile index cf1c66b527b..a591d135136 100644 --- a/comms/estic/Makefile +++ b/comms/estic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/04/11 21:45:06 tv Exp $ +# $NetBSD: Makefile,v 1.16 2005/06/01 18:02:41 jlam Exp $ DISTNAME= estic-1.61 CATEGORIES= comms @@ -17,7 +17,6 @@ NO_SRC_ON_CDROM=${RESTRICTED} NO_BIN_ON_CDROM=${RESTRICTED} WRKSRC= ${WRKDIR}/${PKGNAME_NOREV:C/-.*//} -USE_X11= # defined BUILD_TARGET= depend all ESTICPATCH= ${DISTNAME}-patch-from-1.60${EXTRACT_SUFX} @@ -25,6 +24,8 @@ LIB_TARGET= depend lib LIBSRC= ${WRKDIR}/spunk MAKEFILE= make/freebsd-x.mak +.include "../../mk/x11.buildlink3.mk" + post-extract: ${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC} && \ ${LOCALBASE}/bin/unzip -p ${DISTDIR}/${ESTICPATCH} | \ diff --git a/comms/jpilot-syncmal/Makefile b/comms/jpilot-syncmal/Makefile index d7490929dc6..e1424092190 100644 --- a/comms/jpilot-syncmal/Makefile +++ b/comms/jpilot-syncmal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2005/05/22 20:07:43 jlam Exp $ +# $NetBSD: Makefile,v 1.30 2005/06/01 18:02:41 jlam Exp $ DISTNAME= jpilot-syncmal_0.71.2 PKGNAME= jpilot-syncmal-0.71.2 @@ -12,7 +12,6 @@ COMMENT= MAL synchronization plugin for J-Pilot BUILDLINK_DEPMETHOD.jpilot= full -USE_X11= # defined USE_TOOLS+= gmake USE_LIBTOOL= # defined diff --git a/comms/jpilot/Makefile b/comms/jpilot/Makefile index 9cb121ef2fd..e1d3a899f3b 100644 --- a/comms/jpilot/Makefile +++ b/comms/jpilot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2005/04/11 21:45:07 tv Exp $ +# $NetBSD: Makefile,v 1.46 2005/06/01 18:02:41 jlam Exp $ # DISTNAME= jpilot-0.99.5 @@ -17,7 +17,6 @@ CONFLICTS+= jpilot-libplugin-[0-9]* USE_DIRS+= gnome1-1.0 USE_LIBTOOL= YES USE_PKGLOCALEDIR= YES -USE_X11= YES USE_OLD_DES_API= YES GNU_CONFIGURE= YES diff --git a/comms/p5-pilot-link/Makefile b/comms/p5-pilot-link/Makefile index d5e21005867..f2caaef0407 100644 --- a/comms/p5-pilot-link/Makefile +++ b/comms/p5-pilot-link/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/05/22 20:07:44 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2005/06/01 18:02:41 jlam Exp $ # .include "../../comms/pilot-link/Makefile.common" @@ -10,7 +10,6 @@ COMMENT= Perl bindings for pilot-link BUILDLINK_DEPENDS.pilot-link-libs= pilot-link-libs>=${PILOT_LINK_VERS} -USE_X11= YES USE_TOOLS+= gmake CONFIGURE_ARGS+= --with-perl=${PERL5} @@ -37,6 +36,7 @@ post-install: .include "../../comms/pilot-link-libs/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/comms/pilot-link/Makefile b/comms/pilot-link/Makefile index c57b8d8c766..37f42e4b581 100644 --- a/comms/pilot-link/Makefile +++ b/comms/pilot-link/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2005/05/22 20:07:44 jlam Exp $ +# $NetBSD: Makefile,v 1.40 2005/06/01 18:02:41 jlam Exp $ .include "../../comms/pilot-link/Makefile.common" @@ -8,7 +8,6 @@ COMMENT= Tools to talk to the 3Com Pilot PDA BUILDLINK_DEPENDS.pilot-link-libs= pilot-link-libs>=${PILOT_LINK_VERS} -USE_X11= YES USE_TOOLS+= gmake USE_GNU_READLINE= YES diff --git a/comms/pilotmgr/Makefile b/comms/pilotmgr/Makefile index 8d5cced762b..a1cac0ee81e 100644 --- a/comms/pilotmgr/Makefile +++ b/comms/pilotmgr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2005/05/19 15:26:03 jlam Exp $ +# $NetBSD: Makefile,v 1.33 2005/06/01 18:02:41 jlam Exp $ DISTNAME= pilotmgr-1.107p2 PKGNAME= pilotmgr-1.107.2 @@ -17,7 +17,6 @@ DEPENDS+= p5-pilot-link-[0-9]*:../p5-pilot-link DEPENDS+= {p5-Data-Dumper-[0-9]*,perl>=5.6.1nb2}:../../lang/perl58 WRKSRC= ${WRKDIR}/${DISTNAME:C/-.*$//} -USE_X11= YES HAS_CONFIGURE= YES NO_BUILD= YES @@ -56,4 +55,5 @@ do-install: ${LN} -fs ${PM_DOC_DIR} ${PM_PERL_DIR}/docs .include "../../lang/perl5/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/comms/xisp/Makefile b/comms/xisp/Makefile index 2bd865a191c..ad27627b957 100644 --- a/comms/xisp/Makefile +++ b/comms/xisp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/04/11 21:45:08 tv Exp $ +# $NetBSD: Makefile,v 1.23 2005/06/01 18:02:41 jlam Exp $ # DISTNAME= xisp-2.7p1 @@ -12,8 +12,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://xisp.hellug.gr/ COMMENT= User-friendly X11 interface to pppd/chat -USE_X11= YES - post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xisp ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xisp/ diff --git a/converters/libiconv/builtin.mk b/converters/libiconv/builtin.mk index f81442a3e17..f8a4e7f5991 100644 --- a/converters/libiconv/builtin.mk +++ b/converters/libiconv/builtin.mk @@ -1,33 +1,35 @@ -# $NetBSD: builtin.mk,v 1.9 2005/05/24 04:22:24 jlam Exp $ +# $NetBSD: builtin.mk,v 1.10 2005/06/01 18:02:41 jlam Exp $ -BUILDLINK_FIND_LIBS:= iconv -.include "../../mk/buildlink3/find-libs.mk" +BUILTIN_PKG:= iconv -_BLNK_ICONV_H= /usr/include/iconv.h +BUILTIN_FIND_LIBS:= iconv +BUILTIN_FIND_FILES_VAR:= H_ICONV +BUILTIN_FIND_FILES.H_ICONV= /usr/include/iconv.h +BUILTIN_FIND_GREP.H_ICONV= GNU LIBICONV Library -# Determine if there is a built-in GNU iconv implementation and set -# IS_BUILTIN.iconv appropriately. -# +.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.iconv) IS_BUILTIN.iconv= no -. if exists(${_BLNK_ICONV_H}) && \ - !empty(BUILDLINK_LIB_FOUND.iconv:M[yY][eE][sS]) -IS_BUILTIN.iconv!= \ - if ${GREP} -q "GNU LIBICONV Library" ${_BLNK_ICONV_H}; then \ - ${ECHO} yes; \ - else \ - ${ECHO} no; \ - fi +. if empty(H_ICONV:M${LOCALBASE}/*) && exists(${H_ICONV}) && \ + !empty(BUILTIN_LIB_FOUND.iconv:M[yY][eE][sS]) +IS_BUILTIN.iconv= yes . endif .endif MAKEVARS+= IS_BUILTIN.iconv -# If there is a built-in GNU iconv implementation, then set -# BUILTIN_PKG.iconv to a package name for the built-in iconv. -# -.if !empty(IS_BUILTIN.iconv:M[yY][eE][sS]) -. if !defined(BUILTIN_PKG.iconv) -_BLNK_ICONV_VERSION!= \ +### +### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to +### a package name to represent the built-in package. +### +.if !defined(BUILTIN_PKG.iconv) && \ + !empty(IS_BUILTIN.iconv:M[yY][eE][sS]) && \ + exists(${H_ICONV}) +BUILTIN_VERSION.iconv!= \ ${AWK} 'BEGIN { hex="0123456789abcdef" } \ /\#define[ ]*_LIBICONV_VERSION[ ]/ { \ M = 16 * (index(hex, substr($$3, 3, 1)) - 1); \ @@ -37,75 +39,92 @@ _BLNK_ICONV_VERSION!= \ printf "%d.%d\n", M, m; \ exit 0; \ } \ - ' ${_BLNK_ICONV_H} + ' ${H_ICONV} # # If the native GNU iconv is ABI version 1.9, then treat it the same # as the latest version on the libiconv-1.9.x branch. # -. if ${_BLNK_ICONV_VERSION} == "1.9" -_BLNK_ICONV_VERSION= 1.9.2 # latest version on 1.9.x branch -. endif -BUILTIN_PKG.iconv= libiconv-${_BLNK_ICONV_VERSION} +. if ${BUILTIN_VERSION.iconv} == "1.9" +BUILTIN_ICONV_VERSION= 1.9.2 # latest version on 1.9.x branch . endif -MAKEVARS+= BUILTIN_PKG.iconv +BUILTIN_PKG.iconv= libiconv-${BUILTIN_VERSION.iconv} .endif +MAKEVARS+= BUILTIN_PKG.iconv -# Determine whether we should use the built-in iconv implementation -# if it exists, and set USE_BUILTIN.iconv appropriately. -# +### +### 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.iconv) -USE_BUILTIN.iconv?= ${IS_BUILTIN.iconv} -PREFER.iconv?= pkgsrc - -. if defined(BUILTIN_PKG.iconv) && !empty(IS_BUILTIN.iconv:M[yY][eE][sS]) +. if ${PREFER.iconv} == "pkgsrc" +USE_BUILTIN.iconv= no +. else +USE_BUILTIN.iconv= ${IS_BUILTIN.iconv} +. if defined(BUILTIN_PKG.iconv) && \ + !empty(IS_BUILTIN.iconv:M[yY][eE][sS]) USE_BUILTIN.iconv= yes -. for _dep_ in ${BUILDLINK_DEPENDS.iconv} +. for _dep_ in ${BUILDLINK_DEPENDS.iconv} +. if !empty(USE_BUILTIN.iconv:M[yY][eE][sS]) USE_BUILTIN.iconv!= \ if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.iconv:Q}; then \ ${ECHO} yes; \ else \ ${ECHO} no; \ fi -. endfor -. endif - -. if ${PREFER.iconv} == "native" -# XXX -# XXX By default, assume that the native iconv on NetBSD systems -# XXX supports GNU libiconv's API. -# XXX -. if (${OPSYS} == "NetBSD") && exists(${_BLNK_ICONV_H}) -USE_BUILTIN.iconv= yes -_INCOMPAT_ICONV?= # should be set from defs.${OPSYS}.mk -. for _pattern_ in ${_INCOMPAT_ICONV} ${INCOMPAT_ICONV} -. if !empty(MACHINE_PLATFORM:M${_pattern_}) -USE_BUILTIN.iconv= no . endif . endfor -. undef _pattern_ . endif +. if !defined(_BLNK_REPLACE.iconv) +_BLNK_REPLACE.iconv= no # XXX -# XXX By default, assume that the native iconv on Linux systems using -# XXX GLIBC supports GNU libiconv's API. +# XXX By default, assume that the native iconv implementation is good +# XXX enough to replace GNU libiconv if it is part of glibc (the GNU C +# XXX Library). # XXX -. if (${OPSYS} == "Linux") && exists(${_BLNK_ICONV_H}) -USE_BUILTIN.iconv!= \ - if ${GREP} -q "This file is part of the GNU C Library" ${_BLNK_ICONV_H}; then \ +. if exists(/usr/include/iconv.h) +H_ICONV= /usr/include/iconv.h +_BLNK_REPLACE.iconv!= \ + if ${GREP} -q "This file is part of the GNU C Library" ${H_ICONV}; then \ ${ECHO} yes; \ else \ ${ECHO} no; \ fi +. endif +# XXX +# XXX By default, assume that on NetBSD the native iconv implementation +# XXX (if it exists) is good enough to replace GNU libiconv. +# XXX +. if (${OPSYS} == "NetBSD") && exists(/usr/include/iconv.h) +H_ICONV= /usr/include/iconv.h +_BLNK_REPLACE.iconv= yes +. endif +. endif +MAKEVARS+= _BLNK_REPLACE.iconv +. if !empty(_BLNK_REPLACE.iconv:M[yY][eE][sS]) +USE_BUILTIN.iconv= yes . endif -. endif # PREFER.iconv == "native" +# +# Some platforms don't have an iconv implementation that can replace +# GNU libiconv. +# +_INCOMPAT_ICONV?= # should be set from defs.${OPSYS}.mk +. for _pattern_ in ${_INCOMPAT_ICONV} ${INCOMPAT_ICONV} +. if !empty(MACHINE_PLATFORM:M${_pattern_}) +USE_BUILTIN.iconv= no +. endif +. endfor +. endif # PREFER.iconv +.endif +MAKEVARS+= USE_BUILTIN.iconv -. if defined(USE_GNU_ICONV) -. if !empty(IS_BUILTIN.iconv:M[nN][oO]) || \ - (${PREFER.iconv} == "pkgsrc") +# If USE_GNU_ICONV is defined, then force the use of a GNU libiconv +# implementation. +# +.if defined(USE_GNU_ICONV) +. if !empty(IS_BUILTIN.iconv:M[nN][oO]) USE_BUILTIN.iconv= no -. endif . endif .endif -MAKEVARS+= USE_BUILTIN.iconv # ICONV_TYPE is either "gnu" or "native" depending on which iconv # implementation is used. @@ -118,13 +137,17 @@ ICONV_TYPE= native . endif .endif +### +### The section below only applies if we are not including this file +### solely to determine whether a built-in implementation exists. +### CHECK_BUILTIN.iconv?= no .if !empty(CHECK_BUILTIN.iconv:M[nN][oO]) . if !empty(USE_BUILTIN.iconv:M[nN][oO]) _BLNK_LIBICONV= -liconv . else -. if !empty(BUILDLINK_LIB_FOUND.iconv:M[yY][eE][sS]) +. if !empty(BUILTIN_LIB_FOUND.iconv:M[yY][eE][sS]) _BLNK_LIBICONV= -liconv . else _BLNK_LIBICONV= # empty diff --git a/converters/wv/Makefile b/converters/wv/Makefile index 5178d965621..55195259bea 100644 --- a/converters/wv/Makefile +++ b/converters/wv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2005/05/22 20:07:44 jlam Exp $ +# $NetBSD: Makefile,v 1.46 2005/06/01 18:02:41 jlam Exp $ DISTNAME= wv-1.0.3 PKGREVISION= 2 @@ -12,7 +12,6 @@ COMMENT= Library and executables to access Microsoft Word files USE_TOOLS+= gmake USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes -USE_X11= yes GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE+= wv-1.0.pc.in @@ -34,5 +33,6 @@ CONFIGURE_ARGS+= --with-png=${BUILDLINK_PREFIX.png} .include "../../graphics/png/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/converters/xdeview/Makefile b/converters/xdeview/Makefile index fdd1d29fd90..714cc68fb53 100644 --- a/converters/xdeview/Makefile +++ b/converters/xdeview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2005/04/17 01:06:06 kristerw Exp $ +# $NetBSD: Makefile,v 1.34 2005/06/01 18:02:41 jlam Exp $ DISTNAME= uudeview-0.5.20 PKGNAME= xdeview-0.5.20 @@ -10,7 +10,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.fpx.de/fp/Software/UUDeview/ COMMENT= X11 program for uu/xx/Base64/BinHex de-/encoding -USE_X11= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-tcl="${LOCALBASE}" --enable-tk="${LOCALBASE}" LDFLAGS+= -s -lX11 diff --git a/databases/gq/Makefile b/databases/gq/Makefile index 18057e17ae9..f340adebd92 100644 --- a/databases/gq/Makefile +++ b/databases/gq/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/04/11 21:45:11 tv Exp $ +# $NetBSD: Makefile,v 1.24 2005/06/01 18:02:42 jlam Exp $ # DISTNAME= gq-1.0beta1 @@ -11,7 +11,6 @@ HOMEPAGE= http://biot.com/gq/ COMMENT= GTK-based LDAP client USE_DIRS+= gnome2-1.5 -USE_X11= yes GNU_CONFIGURE= yes USE_PKGLOCALEDIR= yes diff --git a/databases/libgda/Makefile.common b/databases/libgda/Makefile.common index 746e3963c50..4187bec6c60 100644 --- a/databases/libgda/Makefile.common +++ b/databases/libgda/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.29 2005/05/22 20:07:45 jlam Exp $ +# $NetBSD: Makefile.common,v 1.30 2005/06/01 18:02:42 jlam Exp $ # DISTNAME= libgda-1.2.1 @@ -13,7 +13,6 @@ COMMENT= GNU database access library DISTINFO_FILE= ${.CURDIR}/../../databases/libgda/distinfo PATCHDIR= ${.CURDIR}/../../databases/libgda/patches -USE_X11= YES USE_TOOLS+= gmake USE_LIBTOOL= YES USE_PKGINSTALL= YES @@ -49,3 +48,4 @@ SUBST_SED.libs+= -e 's|$$(top_builddir)/libgda/libgda-2.la|${BUILDLINK_PREFIX.li .include "../../devel/pkgconfig/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile index 800f1e9ae83..53ad094b577 100644 --- a/databases/libgnomedb/Makefile +++ b/databases/libgnomedb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2005/05/22 20:07:45 jlam Exp $ +# $NetBSD: Makefile,v 1.37 2005/06/01 18:02:42 jlam Exp $ # DISTNAME= libgnomedb-1.2.1 @@ -12,7 +12,6 @@ COMMENT= GNOME2 database library BUILD_USES_MSGFMT= yes -USE_X11= YES USE_TOOLS+= gmake USE_LIBTOOL= YES USE_DIRS+= gnome2-1.5 diff --git a/databases/mergeant/Makefile b/databases/mergeant/Makefile index 3659c0980cb..05d50670976 100644 --- a/databases/mergeant/Makefile +++ b/databases/mergeant/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2005/05/22 20:07:45 jlam Exp $ +# $NetBSD: Makefile,v 1.28 2005/06/01 18:02:42 jlam Exp $ # DISTNAME= mergeant-0.52 @@ -12,7 +12,6 @@ COMMENT= GNOME2 GNOME-DB database front-end USE_PERL5= build USE_DIRS+= gnome2-1.5 -USE_X11= YES USE_TOOLS+= gmake USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES diff --git a/databases/quicklist/Makefile b/databases/quicklist/Makefile index 67136da648c..91aa5435e5e 100644 --- a/databases/quicklist/Makefile +++ b/databases/quicklist/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/04/11 21:45:15 tv Exp $ +# $NetBSD: Makefile,v 1.17 2005/06/01 18:02:42 jlam Exp $ # DISTNAME= quicklist-0.8.6 @@ -13,7 +13,6 @@ COMMENT= Simple database like AppleWorks & MS Works BUILD_USES_MSGFMT= yes GNU_CONFIGURE= yes -USE_X11= yes .include "../../devel/gettext-lib/buildlink3.mk" .include "../../x11/gtk/buildlink3.mk" diff --git a/databases/sqsh-x11/Makefile b/databases/sqsh-x11/Makefile index 3f8deb738cf..f5467005c45 100644 --- a/databases/sqsh-x11/Makefile +++ b/databases/sqsh-x11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/03/29 12:51:54 grant Exp $ +# $NetBSD: Makefile,v 1.3 2005/06/01 18:02:42 jlam Exp $ PKGNAME= sqsh-x11-2.1 COMMENT= SQL shell for Sybase and MS-SQL servers (X11 support) @@ -6,7 +6,6 @@ COMMENT= SQL shell for Sybase and MS-SQL servers (X11 support) CONFLICTS+= sqsh-[0-9]* CONFLICTS+= sqsh-motif-[0-9]* -USE_X11= YES CONFIGURE_ARGS+= --with-x PATCHDIR= ${.CURDIR}/../../databases/sqsh/patches @@ -14,4 +13,5 @@ DISTINFO_FILE= ${.CURDIR}/../../databases/sqsh/distinfo PLIST_SRC= ${.CURDIR}/../../databases/sqsh/PLIST DESCR_SRC= ${.CURDIR}/../../databases/sqsh/DESCR +.include "../../mk/x11.buildlink3.mk" .include "../../databases/sqsh/Makefile.common" diff --git a/databases/tk-postgresql73/Makefile b/databases/tk-postgresql73/Makefile index de48212c3f2..467626166c0 100644 --- a/databases/tk-postgresql73/Makefile +++ b/databases/tk-postgresql73/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/05/16 01:15:30 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2005/06/01 18:02:42 jlam Exp $ PKGNAME= tk-postgresql73-${BASE_VERS} PKGREVISION= 1 @@ -7,7 +7,6 @@ COMMENT= Tk interface to PostgreSQL .include "../postgresql73/Makefile.common" -USE_X11= yes PKGSRC_USE_TOOLS+= gtar CONFIGURE_ARGS+= --with-openssl=${SSLBASE} CONFIGURE_ARGS+= --with-tcl diff --git a/databases/unixodbc-DataManager/Makefile b/databases/unixodbc-DataManager/Makefile index fd8a5fe3891..73c355fe2ba 100644 --- a/databases/unixodbc-DataManager/Makefile +++ b/databases/unixodbc-DataManager/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.11 2005/04/17 01:44:29 kristerw Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/01 18:02:42 jlam Exp $ PKGNAME= unixodbc-DataManager-${ODBC_BASE_VERS} PKGREVISION= 4 COMMENT= GUI tool for unixODBC data source management -USE_X11= YES - .include "../../databases/unixodbc/Makefile.common" CONFIGURE_ARGS+= --enable-gui diff --git a/databases/unixodbc-ODBCConfig/Makefile b/databases/unixodbc-ODBCConfig/Makefile index d187c344372..8c9fc9ba519 100644 --- a/databases/unixodbc-ODBCConfig/Makefile +++ b/databases/unixodbc-ODBCConfig/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.10 2005/04/11 21:45:16 tv Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:42 jlam Exp $ PKGNAME= unixodbc-ODBCConfig-${ODBC_BASE_VERS} PKGREVISION= 4 COMMENT= GUI tool for unixODBC driver configuration -USE_X11= YES - .include "../../databases/unixodbc/Makefile.common" CONFIGURE_ARGS+= --enable-gui diff --git a/databases/xmysql/Makefile b/databases/xmysql/Makefile index 03fd928604c..13b458f1fc3 100644 --- a/databases/xmysql/Makefile +++ b/databases/xmysql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/04/11 21:45:16 tv Exp $ +# $NetBSD: Makefile,v 1.19 2005/06/01 18:02:42 jlam Exp $ # DISTNAME= xmysql-1.10 @@ -12,7 +12,6 @@ COMMENT= Graphical front end to the MySQL database engine BUILDLINK_DEPENDS.mysql-client= mysql-client>=3.23.35 -USE_X11= YES MAKE_ENV+= X11PREFIX=${X11PREFIX} BUILD_TARGET= xmysql diff --git a/databases/xmysqladmin/Makefile b/databases/xmysqladmin/Makefile index 39a0d389c74..6442cdaa030 100644 --- a/databases/xmysqladmin/Makefile +++ b/databases/xmysqladmin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/04/11 21:45:16 tv Exp $ +# $NetBSD: Makefile,v 1.20 2005/06/01 18:02:42 jlam Exp $ # DISTNAME= xmysqladmin-1.0 @@ -16,7 +16,6 @@ COMMENT= Graphical front end for administering MySQL databases BUILDLINK_DEPENDS.mysql-client= mysql-client>=3.23.35 -USE_X11= YES MAKE_ENV+= X11PREFIX=${X11PREFIX} BUILD_TARGET= xmysqladmin diff --git a/databases/xsqlmenu/Makefile b/databases/xsqlmenu/Makefile index 6ee19bf3ddf..ecfb8d76255 100644 --- a/databases/xsqlmenu/Makefile +++ b/databases/xsqlmenu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/05/22 20:07:47 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2005/06/01 18:02:42 jlam Exp $ # DISTNAME= xsqlmenu-2.10 @@ -10,7 +10,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.jlab.org/~saw/xsqlmenu/ COMMENT= X based GUI for MySQL -USE_X11= yes USE_TOOLS+= gmake MAKE_ENV+= MAKE=${MAKE_PROGRAM} diff --git a/devel/GConf/Makefile b/devel/GConf/Makefile index eed3a5c4397..c2c549ae224 100644 --- a/devel/GConf/Makefile +++ b/devel/GConf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2005/04/11 21:45:17 tv Exp $ +# $NetBSD: Makefile,v 1.49 2005/06/01 18:02:42 jlam Exp $ # DISTNAME= GConf-1.0.9 @@ -15,7 +15,6 @@ BUILD_DEPENDS= gtk-doc-[0-9]*:../../textproc/gtk-doc BUILD_USES_MSGFMT= yes USE_PKGLOCALEDIR= YES -USE_X11= YES GNU_CONFIGURE= YES MAKE_FLAGS+= AM_MAKEFLAGS="BDBBACKEND=" @@ -39,5 +38,6 @@ post-install: .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/oaf/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/Gorm/Makefile b/devel/Gorm/Makefile index ac6f2a53223..c629c2d350d 100644 --- a/devel/Gorm/Makefile +++ b/devel/Gorm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/04/11 21:45:17 tv Exp $ +# $NetBSD: Makefile,v 1.25 2005/06/01 18:02:42 jlam Exp $ DISTNAME= Gorm-0.9.2 CATEGORIES= devel gnustep @@ -8,7 +8,6 @@ MAINTAINER= rh@NetBSD.org HOMEPAGE= http://www.gnustep.org/ COMMENT= Graphical user interface builder for GNUstep -USE_X11= yes NO_CONFIGURE= yes .include "../../x11/gnustep-back/buildlink3.mk" diff --git a/devel/ProjectCenter/Makefile b/devel/ProjectCenter/Makefile index 13f337a91e7..afddc85e2fa 100644 --- a/devel/ProjectCenter/Makefile +++ b/devel/ProjectCenter/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/04/11 21:45:17 tv Exp $ +# $NetBSD: Makefile,v 1.19 2005/06/01 18:02:42 jlam Exp $ DISTNAME= ProjectCenter-0.4.2 CATEGORIES= devel gnustep @@ -8,7 +8,6 @@ MAINTAINER= rh@NetBSD.org HOMEPAGE= http://www.gnustep.org/experience/ProjectCenter.html COMMENT= GNUstep Integrated Development Environment -USE_X11= yes NO_CONFIGURE= yes .include "../../x11/gnustep-back/buildlink3.mk" diff --git a/devel/Renaissance/Makefile b/devel/Renaissance/Makefile index 57b1bdc8f8a..5237afc979f 100644 --- a/devel/Renaissance/Makefile +++ b/devel/Renaissance/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/04/11 21:45:17 tv Exp $ +# $NetBSD: Makefile,v 1.6 2005/06/01 18:02:42 jlam Exp $ # DISTNAME= Renaissance-0.8.0 @@ -10,7 +10,6 @@ MAINTAINER= rh@NetBSD.org HOMEPAGE= http://www.gnustep.it/Renaissance/ COMMENT= Structured GNUstep user interface development framework -USE_X11= yes NO_CONFIGURE= yes .include "../../x11/gnustep-back/buildlink3.mk" diff --git a/devel/SDL/Makefile.common b/devel/SDL/Makefile.common index f5477f518fe..60cbe448aaa 100644 --- a/devel/SDL/Makefile.common +++ b/devel/SDL/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.21 2005/05/22 20:07:47 jlam Exp $ +# $NetBSD: Makefile.common,v 1.22 2005/06/01 18:02:42 jlam Exp $ DISTNAME= SDL-1.2.8 CATEGORIES= devel games @@ -11,7 +11,6 @@ COMMENT= Simple DirectMedia Layer, a cross-platform multimedia library DISTINFO_FILE= ${.CURDIR}/../../devel/SDL/distinfo PATCHDIR= ${.CURDIR}/../../devel/SDL/patches -USE_X11= YES GNU_CONFIGURE= YES USE_TOOLS+= gmake USE_LANGUAGES= c c++ diff --git a/devel/SDL/buildlink3.mk b/devel/SDL/buildlink3.mk index ea466ada835..3505b3c3291 100644 --- a/devel/SDL/buildlink3.mk +++ b/devel/SDL/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2005/03/27 14:43:47 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2005/06/01 18:02:42 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ SDL_BUILDLINK3_MK:= ${SDL_BUILDLINK3_MK}+ @@ -16,7 +16,6 @@ BUILDLINK_RECOMMENDED.SDL+= SDL>=1.2.7nb4 BUILDLINK_PKGSRCDIR.SDL?= ../../devel/SDL .endif # SDL_BUILDLINK3_MK -USE_X11= yes PTHREAD_OPTS+= require .include "../../mk/bsd.prefs.mk" diff --git a/devel/SDL_gfx/Makefile b/devel/SDL_gfx/Makefile index 49170b2dabe..c82fe69fcae 100644 --- a/devel/SDL_gfx/Makefile +++ b/devel/SDL_gfx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/05/22 20:07:47 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2005/06/01 18:02:42 jlam Exp $ DISTNAME= SDL_gfx-2.0.13 PKGREVISION= 1 @@ -11,7 +11,6 @@ COMMENT= Basic drawing routines for SDL USE_TOOLS+= gmake USE_LIBTOOL= YES -USE_X11= YES GNU_CONFIGURE= YES .if (${MACHINE_ARCH} != "i386") diff --git a/devel/SDL_ttf/Makefile b/devel/SDL_ttf/Makefile index 0d2aa0f536a..788728d37ea 100644 --- a/devel/SDL_ttf/Makefile +++ b/devel/SDL_ttf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/04/11 21:45:17 tv Exp $ +# $NetBSD: Makefile,v 1.20 2005/06/01 18:02:42 jlam Exp $ DISTNAME= SDL_ttf-2.0.7 PKGREVISION= 1 @@ -10,7 +10,6 @@ HOMEPAGE= http://www.libsdl.org/projects/SDL_ttf/ COMMENT= Use TrueType fonts in your SDL applications USE_LIBTOOL= YES -USE_X11= YES GNU_CONFIGURE= YES .include "../../devel/SDL/buildlink3.mk" diff --git a/devel/allegro/Makefile b/devel/allegro/Makefile index b8aa8213972..1d70c121fd4 100644 --- a/devel/allegro/Makefile +++ b/devel/allegro/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/06/01 14:29:58 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:42 jlam Exp $ DISTNAME= allegro-4.1.18 CATEGORIES= devel @@ -9,7 +9,6 @@ HOMEPAGE= http://alleg.sourceforge.net/ COMMENT= Allegro game programming library USE_TOOLS+= gmake -USE_X11= yes GNU_CONFIGURE= yes MAKEFILE= makefile @@ -33,4 +32,5 @@ SUBST_MESSAGE.oss= "Fixing harcoded audio device." .include "../../mk/ossaudio.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile index 4d0fcefe08d..d35d07c1c97 100644 --- a/devel/anjuta/Makefile +++ b/devel/anjuta/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2005/05/22 20:07:47 jlam Exp $ +# $NetBSD: Makefile,v 1.29 2005/06/01 18:02:42 jlam Exp $ # DISTNAME= anjuta-1.2.2 @@ -23,7 +23,6 @@ DEPENDS+= yelp>=2.4.2:../../misc/yelp GNU_CONFIGURE= YES USE_DIRS+= gnome2-1.5 USE_PKGLOCALEDIR= YES -USE_X11= YES USE_TOOLS+= gmake USE_LIBTOOL= YES diff --git a/devel/at-spi/Makefile b/devel/at-spi/Makefile index 09329069023..831f96c03c1 100644 --- a/devel/at-spi/Makefile +++ b/devel/at-spi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/05/22 20:07:47 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2005/06/01 18:02:43 jlam Exp $ # DISTNAME= at-spi-1.6.3 @@ -14,7 +14,6 @@ USE_TOOLS+= gmake USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes -USE_X11= yes CONFIGURE_ARGS+= --disable-gtk-doc CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc diff --git a/devel/binutils/builtin.mk b/devel/binutils/builtin.mk index 54ea70ea6a3..d5c9cbded2c 100644 --- a/devel/binutils/builtin.mk +++ b/devel/binutils/builtin.mk @@ -1,44 +1,74 @@ -# $NetBSD: builtin.mk,v 1.2 2004/03/29 05:43:29 jlam Exp $ +# $NetBSD: builtin.mk,v 1.3 2005/06/01 18:02:43 jlam Exp $ -# XXX Assume that the base OS provides a built-in binutils. +BUILTIN_PKG:= binutils +.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"). +### +# XXX Assume that the base OS always provides a built-in binutils. IS_BUILTIN.binutils?= yes +### +### 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.binutils) -USE_BUILTIN.binutils?= ${IS_BUILTIN.binutils} -PREFER.binutils?= pkgsrc - -. if defined(USE_BINUTILS) -. if !empty(IS_BUILTIN.binutils:M[nN][oO]) || \ - (${PREFER.binutils} == "pkgsrc") +. if ${PREFER.binutils} == "pkgsrc" USE_BUILTIN.binutils= no +. else +USE_BUILTIN.binutils= ${IS_BUILTIN.binutils} +. if defined(BUILTIN_PKG.binutils) && \ + !empty(IS_BUILTIN.binutils:M[yY][eE][sS]) +USE_BUILTIN.binutils= yes +. for _dep_ in ${BUILDLINK_DEPENDS.binutils} +. if !empty(USE_BUILTIN.binutils:M[yY][eE][sS]) +USE_BUILTIN.binutils!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.binutils:Q}; then \ + ${ECHO} yes; \ + else \ + ${ECHO} no; \ + fi +. endif +. endfor . endif -. endif - -# These versions of NetBSD didn't have a toolchain that was capable of -# replacing binutils. # -_INCOMPAT_BINUTILS= NetBSD-0.*-* NetBSD-1.[01234]*-* -_INCOMPAT_BINUTILS+= NetBSD-1.5.*-* NetBSD-1.5[A-X]-* +# Some platforms don't have a toolchain that can replace pkgsrc binutils. # -# XXX _INCOMPAT_BINUTILS settings for other operating systems possibly -# XXX needed here +_INCOMPAT_BINUTILS= NetBSD-0.*-* NetBSD-1.[01234]*-* \ + NetBSD-1.5.*-* NetBSD-1.5[A-X]-* +. for _pattern_ in ${_INCOMPAT_BINUTILS} ${INCOMPAT_BINUTILS} +. if !empty(MACHINE_PLATFORM:M${_pattern_}) +USE_BUILTIN.binutils= no +. endif +. endfor +. endif # PREFER.binutils +.endif +MAKEVARS+= USE_BUILTIN.binutils + +# if USE_BINUTILS is defined, then force the use of a true binutils +# implementation. # -. for _pattern_ in ${_INCOMPAT_BINUTILS} ${INCOMPAT_BINUTILS} -. if !empty(MACHINE_PLATFORM:M${_pattern_}) +.if defined(USE_BINUTILS) +. if !empty(IS_BUILTIN.binutils:M[nN][oO]) USE_BUILTIN.binutils= no -. endif -. endfor -.endif # USE_BUILTIN.binutils +. endif +.endif +### +### The section below only applies if we are not including this file +### solely to determine whether a built-in implementation exists. +### CHECK_BUILTIN.binutils?= no .if !empty(CHECK_BUILTIN.binutils:M[nN][oO]) -.if !empty(USE_BUILTIN.binutils:M[nN][oO]) +. if !empty(USE_BUILTIN.binutils:M[nN][oO]) AR= ${BUILDLINK_PREFIX.binutils}/bin/ar AS= ${BUILDLINK_PREFIX.binutils}/bin/as LD= ${BUILDLINK_PREFIX.binutils}/bin/ld NM= ${BUILDLINK_PREFIX.binutils}/bin/nm RANLIB= ${BUILDLINK_PREFIX.binutils}/bin/ranlib -.endif +. endif .endif # CHECK_BUILTIN.binutils diff --git a/devel/cdk/builtin.mk b/devel/cdk/builtin.mk index 043b9360296..11110f5f13e 100644 --- a/devel/cdk/builtin.mk +++ b/devel/cdk/builtin.mk @@ -1,42 +1,47 @@ -# $NetBSD: builtin.mk,v 1.1 2004/04/26 05:09:29 jlam Exp $ +# $NetBSD: builtin.mk,v 1.2 2005/06/01 18:02:43 jlam Exp $ -_CDK_CDK_H= /usr/include/cdk/cdk.h +BUILTIN_PKG:= cdk +BUILTIN_FIND_FILES_VAR:= H_CDK +BUILTIN_FIND_FILES.H_CDK= /usr/include/cdk/cdk.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.cdk) IS_BUILTIN.cdk= no -. if exists(${_CDK_CDK_H}) +. if empty(H_CDK:M${LOCALBASE}/*) && exists(${H_CDK}) IS_BUILTIN.cdk= yes -# XXX -# XXX Consider the native CDK to be cdk-4.9.9nb1. -# XXX -BUILTIN_PKG.cdk= cdk-4.9.9nb1 -BUILDLINK_VARS+= BUILTIN_PKG.cdk . endif -BUILDLINK_VARS+= IS_BUILTIN.cdk -.endif # IS_BUILTIN.cdk +.endif +MAKEVARS+= IS_BUILTIN.cdk +### +### 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.cdk) -USE_BUILTIN.cdk?= ${IS_BUILTIN.cdk} -PREFER.cdk?= pkgsrc - -. if defined(BUILTIN_PKG.cdk) +. if ${PREFER.cdk} == "pkgsrc" +USE_BUILTIN.cdk= no +. else +USE_BUILTIN.cdk= ${IS_BUILTIN.cdk} +. if defined(BUILTIN_PKG.cdk) && \ + !empty(IS_BUILTIN.cdk:M[yY][eE][sS]) USE_BUILTIN.cdk= yes -. for _depend_ in ${BUILDLINK_DEPENDS.cdk} -. if !empty(USE_BUILTIN.cdk:M[yY][eE][sS]) -USE_BUILTIN.cdk!= \ - if ${PKG_ADMIN} pmatch '${_depend_}' ${BUILTIN_PKG.cdk}; then \ - ${ECHO} "yes"; \ - else \ - ${ECHO} "no"; \ +. for _dep_ in ${BUILDLINK_DEPENDS.cdk} +. if !empty(USE_BUILTIN.cdk:M[yY][eE][sS]) +USE_BUILTIN.cdk!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.cdk:Q}; then \ + ${ECHO} yes; \ + else \ + ${ECHO} no; \ fi -. endif -. endfor -. endif - -. if defined(USE_CDK) -. if !empty(IS_BUILTIN.cdk:M[nN][oO]) && \ - (${PREFER.cdk} == "pkgsrc") -USE_BUILTIN.cdk= no +. endif +. endfor . endif -. endif -.endif # USE_BUILTIN.cdk +. endif # PREFER.cdk +.endif +MAKEVARS+= USE_BUILTIN.cdk diff --git a/devel/coconut/Makefile b/devel/coconut/Makefile index 84e4ca63211..457e0041ad4 100644 --- a/devel/coconut/Makefile +++ b/devel/coconut/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/04/11 21:45:19 tv Exp $ +# $NetBSD: Makefile,v 1.25 2005/06/01 18:02:43 jlam Exp $ # DISTNAME= coconut-0.3.0 @@ -14,7 +14,6 @@ COMMENT= Objective-C library for Unix-like systems BUILD_DEPENDS+= papaya>=0.1.7:../../devel/papaya USE_LIBTOOL= YES -USE_X11= YES GNU_CONFIGURE= YES CPPFLAGS+= -I${PREFIX}/include/libxml2/libxml -DGL_GLEXT_LEGACY MAKE_ENV+= AM_MAKEFLAGS="am__depfiles_maybe=" diff --git a/devel/cvsup-gui/Makefile b/devel/cvsup-gui/Makefile index 07adaabeb7d..47f086e9f59 100644 --- a/devel/cvsup-gui/Makefile +++ b/devel/cvsup-gui/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.10 2004/01/06 00:11:02 xtraeme Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:43 jlam Exp $ .include "${.CURDIR}/../../devel/cvsup/Makefile.common" PKGNAME= cvsup-gui-16.1.h -USE_X11= YES - CONFLICTS= cvsup-[0-9]* +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/devIL/Makefile b/devel/devIL/Makefile index 54940a921cf..ef92b25f397 100644 --- a/devel/devIL/Makefile +++ b/devel/devIL/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/04/11 21:45:19 tv Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:43 jlam Exp $ # DISTNAME= DevIL-1.6.6 @@ -14,7 +14,6 @@ COMMENT= Developer's Image Library WRKSRC= ${WRKDIR}/DevIL GNU_CONFIGURE= yes USE_LIBTOOL= yes -USE_X11= yes CONFIGURE_ARGS+= --disable-lcms diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile index e4a214f2a5a..3b487d35b1e 100644 --- a/devel/devhelp/Makefile +++ b/devel/devhelp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/05/22 20:07:50 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2005/06/01 18:02:43 jlam Exp $ DISTNAME= devhelp-0.7 PKGREVISION= 11 @@ -15,7 +15,6 @@ USE_TOOLS+= gmake USE_LIBTOOL= yes USE_PERL5= build USE_PKGLOCALEDIR= yes -USE_X11= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-html-widget=gtkhtml2 diff --git a/devel/dlcompat/builtin.mk b/devel/dlcompat/builtin.mk index f8596d87a55..ce3f5b8c518 100644 --- a/devel/dlcompat/builtin.mk +++ b/devel/dlcompat/builtin.mk @@ -1,57 +1,62 @@ -# $NetBSD: builtin.mk,v 1.5 2004/12/05 07:01:19 jlam Exp $ +# $NetBSD: builtin.mk,v 1.6 2005/06/01 18:02:43 jlam Exp $ -.for _lib_ in dl -. if !defined(_BLNK_LIB_FOUND.${_lib_}) -_BLNK_LIB_FOUND.${_lib_}!= \ - if ${TEST} "`${ECHO} /usr/lib/lib${_lib_}.*`" != "/usr/lib/lib${_lib_}.*"; then \ - ${ECHO} "yes"; \ - elif ${TEST} "`${ECHO} /lib/lib${_lib_}.*`" != "/lib/lib${_lib_}.*"; then \ - ${ECHO} "yes"; \ - else \ - ${ECHO} "no"; \ - fi -BUILDLINK_VARS+= _BLNK_LIB_FOUND.${_lib_} -. endif -.endfor -.undef _lib_ +BUILTIN_PKG:= dlcompat + +BUILTIN_FIND_LIBS:= dl +BUILTIN_FIND_FILES_VAR:= H_DLFCN +BUILTIN_FIND_FILES.H_DLFCN= /usr/include/dlfcn.h -_DLFCN_H= /usr/include/dlfcn.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.dlcompat) IS_BUILTIN.dlcompat= no -. if !empty(_BLNK_LIB_FOUND.dl:M[yY][eE][sS]) && exists(${_DLFCN_H}) +. if empty(H_DLFCN:M${LOCALBASE}/*) && exists(${H_DLFCN}) && \ + !empty(BUILTIN_LIB_FOUND.dl:M[yY][eE][sS]) IS_BUILTIN.dlcompat= yes -_DLCOMPAT_VERSION= 20030629 -BUILTIN_PKG.dlcompat= dlcompat-${_DLCOMPAT_VERSION} -BUILDLINK_VARS+= BUILTIN_PKG.dlcompat . endif -BUILDLINK_VARS+= IS_BUILTIN.dlcompat -.endif # IS_BUILTIN.dlcompat +.endif +MAKEVARS+= IS_BUILTIN.dlcompat -.if !defined(USE_BUILTIN.dlcompat) -USE_BUILTIN.dlcompat?= ${IS_BUILTIN.dlcompat} -PREFER.dlcompat?= pkgsrc +### +### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to +### a package name to represent the built-in package. +### +.if !defined(BUILTIN_PKG.dlcompat) && \ + !empty(IS_BUILTIN.dlcompat:M[yY][eE][sS]) +# XXX +# XXX Consider any built-in dlcompat to be from version 20030629. +# XXX +BUILTIN_PKG.dlcompat= dlcompat-20030629 +.endif +MAKEVARS+= BUILTIN_PKG.dlcompat -. if defined(BUILTIN_PKG.dlcompat) +### +### 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.dlcompat) +. if ${PREFER.dlcompat} == "pkgsrc" +USE_BUILTIN.dlcompat= no +. else +USE_BUILTIN.dlcompat= ${IS_BUILTIN.dlcompat} +. if defined(BUILTIN_PKG.dlcompat) && \ + !empty(IS_BUILTIN.dlcompat:M[yY][eE][sS]) USE_BUILTIN.dlcompat= yes -. for _depend_ in ${BUILDLINK_DEPENDS.dlcompat} -. if !empty(USE_BUILTIN.dlcompat:M[yY][eE][sS]) +. for _dep_ in ${BUILDLINK_DEPENDS.dlcompat} +. if !empty(USE_BUILTIN.dlcompat:M[yY][eE][sS]) USE_BUILTIN.dlcompat!= \ - if ${PKG_ADMIN} pmatch '${_depend_}' ${BUILTIN_PKG.dlcompat}; then \ - ${ECHO} "yes"; \ + if ${PKG_ADMIN} pmatch ${_dep_:Q}' ${BUILTIN_PKG.dlcompat:Q}; then \ + ${ECHO} yes; \ else \ - ${ECHO} "no"; \ + ${ECHO} no; \ fi -. endif -. endfor -. endif - -. if ${PREFER.dlcompat} == "native" -USE_BUILTIN.dlcompat= yes -. endif - -. if !empty(IS_BUILTIN.dlcompat:M[nN][oO]) || \ - (${PREFER.dlcompat} == "pkgsrc") -USE_BUILTIN.dlcompat= no -. endif -.endif # USE_BUILTIN.dlcompat +. endif +. endfor +. endif +. endif # PREFER.dlcompat +.endif +MAKEVARS+= USE_BUILTIN.dlcompat diff --git a/devel/edcommon/Makefile b/devel/edcommon/Makefile index c1829926a11..3cd7ad2c5c0 100644 --- a/devel/edcommon/Makefile +++ b/devel/edcommon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/04/11 21:45:20 tv Exp $ +# $NetBSD: Makefile,v 1.3 2005/06/01 18:02:43 jlam Exp $ # DISTNAME= ${PKGNAME}-s @@ -11,7 +11,6 @@ HOMEPAGE= http://www.mulle-kybernetik.com/software/EDFrameworks/Downloads/ COMMENT= Foundation and AppKit extensions WRKSRC= ${WRKDIR}/ed/EDCommon -USE_X11= yes MAKE_ENV+= ADDITIONAL_OBJCFLAGS="-Wno-import -I${WRKSRC}/.." diff --git a/devel/eel/Makefile b/devel/eel/Makefile index 279fe19b851..937565789b8 100644 --- a/devel/eel/Makefile +++ b/devel/eel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/05/22 20:07:50 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2005/06/01 18:02:43 jlam Exp $ DISTNAME= eel-1.0.2 CATEGORIES= devel gnome @@ -15,7 +15,6 @@ USE_TOOLS+= gmake USE_LIBTOOL= yes USE_PERL5= build USE_PKGLOCALEDIR= yes -USE_X11= yes GNU_CONFIGURE= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig diff --git a/devel/eel2/Makefile b/devel/eel2/Makefile index b5e6b4475b6..1c5bbfd9380 100644 --- a/devel/eel2/Makefile +++ b/devel/eel2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2005/05/22 20:07:50 jlam Exp $ +# $NetBSD: Makefile,v 1.41 2005/06/01 18:02:43 jlam Exp $ DISTNAME= eel-2.10.1 PKGNAME= ${DISTNAME:S/-/2-/} @@ -16,7 +16,6 @@ USE_DIRS+= gnome2-1.5 USE_TOOLS+= gmake USE_LIBTOOL= YES USE_PKGLOCALEDIR= YES -USE_X11= YES GNU_CONFIGURE= YES PKGCONFIG_OVERRIDE= eel-2.0.pc.in diff --git a/devel/gail/Makefile b/devel/gail/Makefile index 38b478dafb2..5f79405ebe5 100644 --- a/devel/gail/Makefile +++ b/devel/gail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2005/05/22 20:07:51 jlam Exp $ +# $NetBSD: Makefile,v 1.33 2005/06/01 18:02:43 jlam Exp $ # DISTNAME= gail-1.8.4 @@ -12,7 +12,6 @@ COMMENT= GNOME Accessibility Implementation Library GNU_CONFIGURE= yes USE_TOOLS+= gmake -USE_X11= yes USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes diff --git a/devel/gal2/Makefile b/devel/gal2/Makefile index c44cbf5fc98..4244d2d35b4 100644 --- a/devel/gal2/Makefile +++ b/devel/gal2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2005/05/22 20:07:51 jlam Exp $ +# $NetBSD: Makefile,v 1.37 2005/06/01 18:02:43 jlam Exp $ # # Check the API before updating this package! gal-2.5 and above should # get their own gal26 package! @@ -14,7 +14,6 @@ MAINTAINER= recht@NetBSD.org HOMEPAGE= http://www.gnome.org/ COMMENT= Library functions that came from Gnumeric and Evolution (gal-2.4 API) -USE_X11= yes USE_TOOLS+= gmake USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes diff --git a/devel/gal20/Makefile b/devel/gal20/Makefile index c19fea99ee0..7c7dd93dfdc 100644 --- a/devel/gal20/Makefile +++ b/devel/gal20/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/05/22 20:07:51 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2005/06/01 18:02:43 jlam Exp $ # DISTNAME= gal-1.99.11 @@ -12,7 +12,6 @@ MAINTAINER= rh@NetBSD.org HOMEPAGE= http://www.gnome.org/ COMMENT= Library functions that came from Gnumeric and Evolution -USE_X11= yes USE_TOOLS+= gmake USE_PKGLOCALEDIR= yes BUILD_USES_MSGFMT= yes diff --git a/devel/gcvs/Makefile b/devel/gcvs/Makefile index 6c900e88c6e..49af8b8ab7d 100644 --- a/devel/gcvs/Makefile +++ b/devel/gcvs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/05/22 20:07:51 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2005/06/01 18:02:43 jlam Exp $ DISTNAME= gcvs-1.0 PKGREVISION= 1 @@ -13,7 +13,6 @@ COMMENT= GTK interface for CVS CONFLICTS= cvs-[0-9]* -USE_X11= yes USE_TOOLS+= gmake GNU_CONFIGURE= yes USE_MAKEINFO= yes diff --git a/devel/gettext-lib/buildlink3.mk b/devel/gettext-lib/buildlink3.mk index 4c5a7058a19..a2a5df03042 100644 --- a/devel/gettext-lib/buildlink3.mk +++ b/devel/gettext-lib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.22 2005/04/19 14:55:30 epg Exp $ +# $NetBSD: buildlink3.mk,v 1.23 2005/06/01 18:02:43 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GETTEXT_BUILDLINK3_MK:= ${GETTEXT_BUILDLINK3_MK}+ @@ -16,6 +16,7 @@ BUILDLINK_RECOMMENDED.gettext+= gettext-lib>=0.11.5nb4 BUILDLINK_PKGSRCDIR.gettext?= ../../devel/gettext-lib .endif # GETTEXT_BUILDLINK3_MK -.include "../../converters/libiconv/buildlink3.mk" +# Let the gettext-lib/builtin.mk pull in libiconv if it's needed. +#.include "../../converters/libiconv/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/devel/gettext-lib/builtin.mk b/devel/gettext-lib/builtin.mk index c65092c06a5..d7b3922122b 100644 --- a/devel/gettext-lib/builtin.mk +++ b/devel/gettext-lib/builtin.mk @@ -1,121 +1,170 @@ -# $NetBSD: builtin.mk,v 1.22 2005/05/24 05:43:37 jlam Exp $ +# $NetBSD: builtin.mk,v 1.23 2005/06/01 18:02:43 jlam Exp $ -BUILDLINK_FIND_LIBS:= intl -.include "../../mk/buildlink3/find-libs.mk" +BUILTIN_PKG:= gettext -_BLNK_LIBINTL_H= /usr/include/libintl.h +BUILTIN_FIND_LIBS:= intl +BUILTIN_FIND_FILES_VAR:= H_GETTEXT +BUILTIN_FIND_FILES.H_GETTEXT= /usr/include/libintl.h +BUILTIN_FIND_GREP.H_GETTEXT= \#define[ ]*__USE_GNU_GETTEXT +.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.gettext) IS_BUILTIN.gettext= no -. if exists(${_BLNK_LIBINTL_H}) && \ - !empty(BUILDLINK_LIB_FOUND.intl:M[yY][eE][sS]) -IS_BUILTIN.gettext!= \ - if ${GREP} -q "\#define[ ]*__USE_GNU_GETTEXT" ${_BLNK_LIBINTL_H}; then \ - ${ECHO} "yes"; \ - else \ - ${ECHO} "no"; \ - fi -. endif -. if !empty(IS_BUILTIN.gettext:M[yY][eE][sS]) -# XXX -# XXX Consider the native libintl to be gettext-lib-0.10.35nb1 until we -# XXX find a way to more accurately determine the version. -# XXX -BUILTIN_PKG.gettext= gettext-lib-0.10.35nb1 -BUILDLINK_VARS+= BUILTIN_PKG.gettext +. if empty(H_GETTEXT:M${LOCALBASE}/*) && exists(${H_GETTEXT}) && \ + !empty(BUILTIN_LIB_FOUND.intl:M[yY][eE][sS]) +IS_BUILTIN.gettext= yes . endif -.endif # IS_BUILTIN.gettext +.endif +MAKEVARS+= IS_BUILTIN.gettext -.if !defined(USE_BUILTIN.gettext) -USE_BUILTIN.gettext?= ${IS_BUILTIN.gettext} -PREFER.gettext?= pkgsrc +_BLTNH_GETTEXT= /usr/include/libintl.h +.if !defined(BUILTIN_GETTEXT_NGETTEXT) && exists(${_BLTNH_GETTEXT}) +BUILTIN_GETTEXT_NGETTEXT!= \ + if ${GREP} -q "char.*ngettext" ${_BLTNH_GETTEXT:Q}; then \ + ${ECHO} yes; \ + else \ + ${ECHO} no; \ + fi +.endif +MAKEVARS+= BUILTIN_GETTEXT_NGETTEXT -. if defined(BUILTIN_PKG.gettext) +### +### Determine whether we should use the built-in implementation if it +### exists, and uset USE_BUILTIN.<pkg> appropriate ("yes" or "no"). +### +.if !defined(USE_BUILTIN.gettext) +. if ${PREFER.gettext} == "pkgsrc" +USE_BUILTIN.gettext= no +. else +USE_BUILTIN.gettext= ${IS_BUILTIN.gettext} +. if defined(BUILTIN_PKG.gettext) && \ + !empty(IS_BUILTIN.gettext:M[yY][eE][sS]) USE_BUILTIN.gettext= yes -. for _depend_ in ${BUILDLINK_DEPENDS.gettext} -. if !empty(USE_BUILTIN.gettext:M[yY][eE][sS]) -USE_BUILTIN.gettext!= \ - if ${PKG_ADMIN} pmatch '${_depend_}' ${BUILTIN_PKG.gettext}; then \ - ${ECHO} "yes"; \ +. for _dep_ in ${BUILDLINK_DEPENDS.gettext} +. if !empty(USE_BUILTIN.gettext:M[yY][eE][sS]) +USE_BUILTIN.gettext!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.gettext:Q}; then \ + ${ECHO} yes; \ else \ - ${ECHO} "no"; \ + ${ECHO} no; \ fi -. endif -. endfor -. endif - -. if ${PREFER.gettext} == "native" +. endif +. endfor +. endif +. if !defined(_BLNK_REPLACE.gettext) +_BLNK_REPLACE.gettext= no # XXX # XXX By default, assume that the native gettext implementation is good -# XXX enough if it has a prototype for ngettext(). +# XXX enough to replace GNU gettext if it is part of glibc (the GNU C +# XXX Library). # XXX -. if !defined(_GETTEXT_NGETTEXT) && exists(${_BLNK_LIBINTL_H}) -_GETTEXT_NGETTEXT!= \ - if ${GREP} -q "char.*ngettext" ${_BLNK_LIBINTL_H}; then \ - ${ECHO} "yes"; \ +. if exists(${_BLTNH_GETTEXT}) +_BLNK_REPLACE.gettext!= \ + if ${GREP} -q "This file is part of the GNU C Library" ${_BLTNH_GETTEXT:Q}; then \ + ${ECHO} yes; \ else \ - ${ECHO} "no"; \ + ${ECHO} no; \ fi -BUILDLINK_VARS+= _GETTEXT_NGETTEXT -. if !empty(_GETTEXT_NGETTEXT:M[yY][eE][sS]) -USE_BUILTIN.gettext= yes -. else -USE_BUILTIN.gettext= no . endif . endif +MAKEVARS+= _BLNK_REPLACE.gettext +. if !empty(_BLNK_REPLACE.gettext:M[yY][eE][sS]) +USE_BUILTIN.gettext= yes +. endif # XXX -# XXX By default, assume the native gettext on Linux systems using GLIBC -# XXX supports the GNU gettext API, and use it. +# XXX By default, assume that the native gettext implementation is good +# XXX enough to replace GNU gettext if it supplies ngettext(). # XXX -. if (${OPSYS} == "Linux") -USE_BUILTIN.gettext!= \ - if ${GREP} -q "This file is part of the GNU C Library" ${_BLNK_LIBINTL_H}; then \ - ${ECHO} "yes"; \ - else \ - ${ECHO} "no"; \ - fi +. if !empty(BUILTIN_GETTEXT_NGETTEXT:M[yY][eE][sS]) +USE_BUILTIN.gettext= yes . endif # -# The listed platforms have an implementation of gettext that isn't -# GNUish enough. +# Some platforms don't have a gettext implementation that can replace +# GNU gettext. # -_INCOMPAT_GETTEXT= SunOS-*-* +_INCOMPAT_GETTEXT?= SunOS-*-* # XXX move to mk/platforms/SunOS.mk . for _pattern_ in ${_INCOMPAT_GETTEXT} ${INCOMPAT_GETTEXT} . if !empty(MACHINE_PLATFORM:M${_pattern_}) -USE_BUILTIN.gettext= no +USE_BUILTIN.gettext= no . endif . endfor -. endif # PREFER.gettext == "native" +. endif # PREFER.gettext +.endif +MAKEVARS+= USE_BUILTIN.gettext -. if defined(USE_GNU_GETTEXT) -. if !empty(IS_BUILTIN.gettext:M[nN][oO]) || \ - (${PREFER.gettext} == "pkgsrc") +# If USE_GNU_GETTEXT is defined, then force the use of a GNU gettext +# implementation. +# +.if defined(USE_GNU_GETTEXT) +. if !empty(IS_BUILTIN.gettext:M[nN][oO]) USE_BUILTIN.gettext= no -. endif . endif -.endif # USE_BUILTIN.gettext +.endif +### +### The section below only applies if we are not including this file +### solely to determine whether a built-in implementation exists. +### CHECK_BUILTIN.gettext?= no .if !empty(CHECK_BUILTIN.gettext:M[nN][oO]) ###################################################################### # If we are using the builtin gettext implementation... ###################################################################### -.if !empty(USE_BUILTIN.gettext:M[yY][eE][sS]) -. if ${BUILDLINK_LIB_FOUND.intl} == "yes" +. if !empty(USE_BUILTIN.gettext:M[yY][eE][sS]) +. if ${BUILTIN_LIB_FOUND.intl} == "yes" _BLNK_LIBINTL= -lintl -. else +. else _BLNK_LIBINTL= # empty BUILDLINK_TRANSFORM+= rm:-lintl +. endif . endif -.endif ###################################################################### # If we are using pkgsrc gettext implementation... ###################################################################### -.if !empty(USE_BUILTIN.gettext:M[nN][oO]) +. if !empty(USE_BUILTIN.gettext:M[nN][oO]) _BLNK_LIBINTL= -lintl -.endif +# +# Determine if we need to include the libiconv buildlink3.mk file. +# Since we're using the pkgsrc gettext, the only time we don't need +# iconv is if an already-installed gettext-lib package satisfied all +# of the gettext dependencies but is <0.11.5nb1. +# +_BLNK_GETTEXT_ICONV_DEPENDS= gettext-lib>=0.11.5nb1 +. if !defined(_BLNK_GETTEXT_NEEDS_ICONV) +_BLNK_GETTEXT_NEEDS_ICONV?= no +. for _dep_ in ${BUILDLINK_DEPENDS.gettext} +. if !empty(_BLNK_GETTEXT_NEEDS_ICONV:M[nN][oO]) +_BLNK_GETTEXT_NEEDS_ICONV!= \ + pkg=`${PKG_BEST_EXISTS} ${_dep_:Q}`; \ + if ${TEST} -z "$$pkg"; then \ + ${ECHO} yes; \ + elif ${PKG_ADMIN} pmatch ${_BLNK_GETTEXT_ICONV_DEPENDS:Q} "$$pkg"; then \ + ${ECHO} yes; \ + else \ + ${ECHO} no; \ + fi +. endif +. endfor +. endif +MAKEVARS+= _BLNK_GETTEXT_NEEDS_ICONV + +. if !empty(_BLNK_GETTEXT_NEEDS_ICONV:M[yY][eE][sS]) +. for _mkfile_ in buildlink3.mk builtin.mk +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +. sinclude "../../converters/libiconv/${_mkfile_}" +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +. endfor +BUILDLINK_DEPENDS.gettext+= ${_BLNK_GETTEXT_ICONV_DEPENDS} +_BLNK_LIBINTL+= ${BUILDLINK_LDADD.iconv} +. endif +. endif BUILDLINK_LDADD.gettext?= ${_BLNK_LIBINTL} @@ -131,34 +180,33 @@ BUILDLINK_LDADD.gettext?= ${_BLNK_LIBINTL} # XXX as "yes" until we can do a full bulk build test. # BROKEN_GETTEXT_DETECTION?= yes -.if !empty(BROKEN_GETTEXT_DETECTION:M[yY][eE][sS]) +. if !empty(BROKEN_GETTEXT_DETECTION:M[yY][eE][sS]) BUILDLINK_LIBS.gettext+= ${BUILDLINK_LDADD.gettext} CONFIGURE_ENV+= INTLLIBS="${BUILDLINK_LDADD.gettext}" -.endif # BROKEN_GETTEXT_DETECTION +. endif # If using a built-in libintl that isn't from GNU gettext, then set up # some GNU configure variables that are checked by modern gettext.m4 # so that it will detect "GNU gettext" in the existing libintl. # -.if !empty(USE_BUILTIN.gettext:M[yY][eE][sS]) -. if !empty(BUILDLINK_LIB_FOUND.intl:M[yY][eE][sS]) +. if defined(GNU_CONFIGURE) +. if !empty(USE_BUILTIN.gettext:M[yY][eE][sS]) +. if !empty(BUILTIN_LIB_FOUND.intl:M[yY][eE][sS]) CONFIGURE_ENV+= gt_cv_func_gnugettext_libintl="yes" CONFIGURE_ENV+= gt_cv_func_gnugettext1_libintl="yes" -. if defined(_GETTEXT_NGETTEXT) && !empty(_GETTEXT_NGETTEXT:M[yY][eE][sS]) +. if !empty(BUILTIN_GETTEXT_NGETTEXT:M[yY][eE][sS]) CONFIGURE_ENV+= gt_cv_func_gnugettext2_libintl="yes" +. endif +. endif . endif -. endif -.endif - -.if defined(GNU_CONFIGURE) -. if !empty(USE_BUILTIN.gettext:M[nN][oO]) +. if !empty(USE_BUILTIN.gettext:M[nN][oO]) CONFIGURE_ARGS+= --with-libintl-prefix="${BUILDLINK_PREFIX.gettext}" -. else +. else CONFIGURE_ARGS+= --without-libintl-prefix +. endif . endif -.endif -.if defined(USE_MSGFMT_PLURALS) && !empty(USE_MSGFMT_PLURALS:M[Yy][Ee][Ss]) +. if defined(USE_MSGFMT_PLURALS) && !empty(USE_MSGFMT_PLURALS:M[Yy][Ee][Ss]) USE_PERL5?= build CONFIGURE_ENV+= MSGFMT=${BUILDLINK_DIR}/bin/msgfmt @@ -177,6 +225,6 @@ ${BUILDLINK_DIR}/bin/msgfmt: ${.CURDIR}/../../devel/gettext/files/msgfmt.pl -e "s|@MSGFMT@|"${BUILDLINK_PREFIX.gettext:Q}/bin/msgfmt"|g" \ > ${.TARGET} @${CHMOD} +x ${.TARGET} -.endif +. endif .endif # CHECK_BUILTIN.gettext diff --git a/devel/giblib/Makefile b/devel/giblib/Makefile index 399e0844221..525b3942cd8 100644 --- a/devel/giblib/Makefile +++ b/devel/giblib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/04/11 21:45:23 tv Exp $ +# $NetBSD: Makefile,v 1.17 2005/06/01 18:02:43 jlam Exp $ DISTNAME= giblib-1.2.4 PKGREVISION= 2 @@ -12,8 +12,8 @@ COMMENT= Programming utility library GNU_CONFIGURE= YES PKGCONFIG_OVERRIDE= giblib.pc.in USE_LIBTOOL= YES -USE_X11= YES .include "../../graphics/imlib2/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/glade2/Makefile.common b/devel/glade2/Makefile.common index e3bc7e2f55d..ef44ea52f45 100644 --- a/devel/glade2/Makefile.common +++ b/devel/glade2/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.4 2005/05/22 20:07:51 jlam Exp $ +# $NetBSD: Makefile.common,v 1.5 2005/06/01 18:02:43 jlam Exp $ DISTNAME= glade-2.10.0 PKGNAME= ${DISTNAME:S/-/2-/} @@ -19,7 +19,6 @@ USE_DIRS+= gnome2-1.5 USE_TOOLS+= gmake USE_LIBTOOL= YES USE_PKGLOCALEDIR= YES -USE_X11= YES .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/pkgconfig/buildlink3.mk" diff --git a/devel/gnome2-libole2/Makefile b/devel/gnome2-libole2/Makefile index 374475ec858..292357f3681 100644 --- a/devel/gnome2-libole2/Makefile +++ b/devel/gnome2-libole2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/04/11 21:45:24 tv Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/01 18:02:43 jlam Exp $ # DISTNAME= libole2-2.2.8 @@ -15,10 +15,10 @@ COMMENT= OLE2 streams parsing library for GNOME2 BUILD_USES_MSGFMT= YES GNU_CONFIGURE= YES -USE_X11= YES USE_LIBTOOL= YES .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../devel/pkgconfig/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/gnustep-base/Makefile b/devel/gnustep-base/Makefile index 0b2b178c288..3d68947fa47 100644 --- a/devel/gnustep-base/Makefile +++ b/devel/gnustep-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/04/15 04:54:11 rh Exp $ +# $NetBSD: Makefile,v 1.24 2005/06/01 18:02:43 jlam Exp $ DISTNAME= gnustep-base-1.10.3 CATEGORIES= devel gnustep @@ -10,7 +10,6 @@ COMMENT= GNUstep foundation classes PTHREAD_LIBS= -lpthread -USE_X11= yes CONFIGURE_ARGS+= --exec-prefix=${PREFIX}/libexec/GNUstep CONFIGURE_ENV+= INSTALL_PROGRAM="${INSTALL_SCRIPT}" @@ -43,5 +42,6 @@ post-install: PTHREAD_LIBS+= -lpth .endif +.include "../../mk/x11.buildlink3.mk" .include "../../devel/gnustep-make/gnustep.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/gnustep-examples/Makefile b/devel/gnustep-examples/Makefile index aea5fa7e308..a71a4d022e0 100644 --- a/devel/gnustep-examples/Makefile +++ b/devel/gnustep-examples/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/04/11 21:45:24 tv Exp $ +# $NetBSD: Makefile,v 1.16 2005/06/01 18:02:43 jlam Exp $ # DISTNAME= gnustep-examples-1.0.0 @@ -10,7 +10,6 @@ MAINTAINER= rh@NetBSD.org HOMEPAGE= http://www.gnustep.org/ COMMENT= Some GUI programming examples for GNUstep -USE_X11= yes NO_CONFIGURE= yes .include "../../x11/gnustep-back/buildlink3.mk" diff --git a/devel/gnustep-make/Makefile b/devel/gnustep-make/Makefile index 24d3fc8e646..2aef47cc511 100644 --- a/devel/gnustep-make/Makefile +++ b/devel/gnustep-make/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/05/24 17:20:00 rillig Exp $ +# $NetBSD: Makefile,v 1.20 2005/06/01 18:02:43 jlam Exp $ DISTNAME= gnustep-make-1.10.0 PKGREVISION= 1 @@ -11,9 +11,9 @@ COMMENT= GNUstep makefile package PKG_INSTALLATION_TYPES= overwrite pkgviews -USE_X11= yes CONFIGURE_ENV+= INSTALL_PROGRAM="${INSTALL_SCRIPT}" +.include "../../mk/x11.buildlink3.mk" .include "gnustep.mk" post-patch: diff --git a/devel/gscope/Makefile b/devel/gscope/Makefile index 74e7c90cf98..d4df5a045b8 100644 --- a/devel/gscope/Makefile +++ b/devel/gscope/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/04/11 21:45:24 tv Exp $ +# $NetBSD: Makefile,v 1.15 2005/06/01 18:02:44 jlam Exp $ # DISTNAME= gscope-0.4.1 @@ -12,7 +12,6 @@ COMMENT= Software oscilloscope library BUILD_DEPENDS+= gtk-doc-[0-9]*:../../textproc/gtk-doc -USE_X11= # defined GNU_CONFIGURE= # defined USE_LIBTOOL= # defined diff --git a/devel/guile-gtk/Makefile b/devel/guile-gtk/Makefile index 71b971486bc..51280b0600a 100644 --- a/devel/guile-gtk/Makefile +++ b/devel/guile-gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/04/11 21:45:25 tv Exp $ +# $NetBSD: Makefile,v 1.23 2005/06/01 18:02:44 jlam Exp $ # DISTNAME= guile-gtk-0.40.91 @@ -9,7 +9,6 @@ MAINTAINER= gdt@ir.bbn.com HOMEPAGE= http://www.gnu.org/software/guile-gtk/ COMMENT= Library to make GTK 1.2 accessible from guile -USE_X11= # defined USE_LIBTOOL= # defined GNU_CONFIGURE= # defined diff --git a/devel/guile14-gtk/Makefile b/devel/guile14-gtk/Makefile index e3ba6ff87c5..6f3f20fc9f4 100644 --- a/devel/guile14-gtk/Makefile +++ b/devel/guile14-gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/04/11 21:45:25 tv Exp $ +# $NetBSD: Makefile,v 1.4 2005/06/01 18:02:44 jlam Exp $ # DISTNAME= guile-gtk-0.19 @@ -13,7 +13,6 @@ MAINTAINER= rh@NetBSD.org HOMEPAGE= http://www.ping.de/sites/zagadka/guile-gtk/ COMMENT= Library to make GTK accessible from guile 1.4 -USE_X11= # defined USE_LIBTOOL= # defined GNU_CONFIGURE= # defined diff --git a/devel/jgrasp/Makefile b/devel/jgrasp/Makefile index d8226f4c6ac..f234683a0a2 100644 --- a/devel/jgrasp/Makefile +++ b/devel/jgrasp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/04/04 13:58:32 jschauma Exp $ +# $NetBSD: Makefile,v 1.8 2005/06/01 18:02:44 jlam Exp $ # DISTNAME= jgrasp170 @@ -13,7 +13,6 @@ COMMENT= IDE with support for Software Visualizations WRKSRC= ${WRKDIR}/jgrasp PKG_JVMS_ACCEPTED= sun-jdk13 sun-jdk14 jdk13 jdk14 -USE_X11= yes do-configure: ${MKDIR} ${WRKSRC}/bin/${LOWER_OPSYS} @@ -42,5 +41,6 @@ do-install: ${LN} -s ${PREFIX}/${PKGNAME}/bin/${LOWER_OPSYS}/jgrasp \ ${PREFIX}/bin/jgrasp +.include "../../mk/x11.buildlink3.mk" .include "../../mk/java-vm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/libast/Makefile b/devel/libast/Makefile index 11077ec94f2..ae60c60f91b 100644 --- a/devel/libast/Makefile +++ b/devel/libast/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/05/31 21:35:13 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2005/06/01 18:02:44 jlam Exp $ DISTNAME= libast-0.6.1 CATEGORIES= devel @@ -9,7 +9,6 @@ HOMEPAGE= http://freshmeat.net/projects/libast/?topic_id=809%2C861 COMMENT= The Library of Assorted Spiffy Things USE_LIBTOOL= YES -USE_X11= YES GNU_CONFIGURE= YES TEST_TARGET= test @@ -22,4 +21,5 @@ LDFLAGS+=-lresolv .include "../../devel/pcre/buildlink3.mk" .include "../../graphics/imlib2/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/libbonoboui/Makefile b/devel/libbonoboui/Makefile index 2733c0ceb8e..0063a9dc396 100644 --- a/devel/libbonoboui/Makefile +++ b/devel/libbonoboui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2005/05/22 20:07:52 jlam Exp $ +# $NetBSD: Makefile,v 1.40 2005/06/01 18:02:44 jlam Exp $ # DISTNAME= libbonoboui-2.8.1 @@ -16,7 +16,6 @@ GNU_CONFIGURE= yes USE_DIRS+= gnome2-1.5 USE_PKGLOCALEDIR= yes USE_TOOLS+= gmake -USE_X11= yes USE_LIBTOOL= yes PKGCONFIG_OVERRIDE= bonobo/libbonoboui-2.0.pc.in diff --git a/devel/libdockapp/Makefile b/devel/libdockapp/Makefile index ce7f2115a7d..a5922378719 100644 --- a/devel/libdockapp/Makefile +++ b/devel/libdockapp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/04/11 21:45:26 tv Exp $ +# $NetBSD: Makefile,v 1.14 2005/06/01 18:02:44 jlam Exp $ # DISTNAME= libdockapp-0.4.0 @@ -13,7 +13,6 @@ COMMENT= Simple library to create dockapps for WindowMaker GNU_CONFIGURE= YES USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig -USE_X11= YES post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libdockapp diff --git a/devel/libevent/builtin.mk b/devel/libevent/builtin.mk index 2feb23bb0f0..14c77ca8ca5 100644 --- a/devel/libevent/builtin.mk +++ b/devel/libevent/builtin.mk @@ -1,10 +1,47 @@ -# $NetBSD: builtin.mk,v 1.2 2004/04/20 08:43:33 xtraeme Exp $ +# $NetBSD: builtin.mk,v 1.3 2005/06/01 18:02:44 jlam Exp $ +BUILTIN_PKG:= libevent + +BUILTIN_FIND_FILES_VAR:= H_LIBEVENT +BUILTIN_FIND_FILES.H_LIBEVENT= /usr/include/event.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.libevent) IS_BUILTIN.libevent= no -. if exists(/usr/include/event.h) +. if empty(H_LIBEVENT:M${LOCALBASE}/*) && exists(${H_LIBEVENT}) IS_BUILTIN.libevent= yes . endif .endif # IS_BUILTIN.libevent +MAKEVARS+= IS_BUILTIN.libevent -USE_BUILTIN.libevent?= ${IS_BUILTIN.libevent} +### +### 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.libevent) +. if ${PREFER.libevent} == "pkgsrc" +USE_BUILTIN.libevent= no +. else +USE_BUILTIN.libevent= ${IS_BUILTIN.libevent} +. if defined(BUILTIN_PKG.libevent) && \ + !empty(IS_BUILTIN.libevent:M[yY][eE][sS]) +USE_BUILTIN.libevent= yes +. for _dep_ in ${BUILDLINK_DEPENDS.libevent} +. if !empty(USE_BUILTIN.libevent:M[yY][eE][sS]) +USE_BUILTIN.libevent!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.libevent:Q}; then \ + ${ECHO} yes; \ + else \ + ${ECHO} no; \ + fi +. endif +. endfor +. endif +. endif # PREFER.libevent +.endif +MAKEVARS+= USE_BUILTIN.libevent diff --git a/devel/libgetopt/builtin.mk b/devel/libgetopt/builtin.mk index 7c43be9e1c5..7f533d245c3 100644 --- a/devel/libgetopt/builtin.mk +++ b/devel/libgetopt/builtin.mk @@ -1,26 +1,67 @@ -# $NetBSD: builtin.mk,v 1.2 2004/03/29 05:43:30 jlam Exp $ +# $NetBSD: builtin.mk,v 1.3 2005/06/01 18:02:44 jlam Exp $ +BUILTIN_PKG:= getopt + +BUILTIN_FIND_FILES_VAR:= H_GETOPT +BUILTIN_FIND_FILES.H_GETOPT= /usr/include/getopt.h +BUILTIN_FIND_GREP.H_GETOPT= int.*getopt_long + +.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.getopt) IS_BUILTIN.getopt= no -. if exists(/usr/include/getopt.h) +. if empty(H_GETOPT:M${LOCALBASE}/*) && exists(${H_GETOPT}) IS_BUILTIN.getopt= yes . endif .endif # IS_BUILTIN.getopt +MAKEVARS+= IS_BUILTIN.getopt -USE_BUILTIN.getopt?= ${IS_BUILTIN.getopt} +### +### 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.getopt) +. if ${PREFER.getopt} == "pkgsrc" +USE_BUILTIN.getopt= no +. else +USE_BUILTIN.getopt= ${IS_BUILTIN.getopt} +. if defined(BUILTIN_PKG.getopt) && \ + !empty(IS_BUILTIN.getopt:M[yY][eE][sS]) +USE_BUILTIN.getopt= yes +. for _dep_ in ${BUILDLINK_DEPENDS.getopt} +. if !empty(USE_BUILTIN.getopt:M[yY][eE][sS]) +USE_BUILTIN.getopt!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.getopt:Q}; then \ + ${ECHO} yes; \ + else \ + ${ECHO} no; \ + fi +. endif +. endfor +. endif +. endif # PREFER.getopt +.endif +MAKEVARS+= USE_BUILTIN.getopt +### +### The section below only applies if we are not including this file +### solely to determine whether a built-in implementation exists. +### CHECK_BUILTIN.getopt?= no .if !empty(CHECK_BUILTIN.getopt:M[nN][oO]) -.if !empty(USE_BUILTIN.getopt:M[nN][oO]) -LIBGETOPT= -lgetopt -.else -LIBGETOPT= # empty -.endif - -BUILDLINK_LDADD.getopt?= ${LIBGETOPT} +. if !empty(USE_BUILTIN.getopt:M[nN][oO]) +_BLNK_LIBGETOPT= -lgetopt +. else +_BLNK_LIBGETOPT= # empty +. endif +BUILDLINK_LDADD.getopt?= ${_BLNK_LIBGETOPT} -CONFIGURE_ENV+= LIBGETOPT="${LIBGETOPT}" -MAKE_ENV+= LIBGETOPT="${LIBGETOPT}" +CONFIGURE_ENV+= LIBGETOPT=${BUILDLINK_LDADD.getopt:Q} +MAKE_ENV+= LIBGETOPT=${BUILDLINK_LDADD.getopt:Q} .endif # CHECK_BUILTIN.getopt diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile index d6c544b8cf1..266136d4750 100644 --- a/devel/libglade2/Makefile +++ b/devel/libglade2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2005/05/22 20:07:52 jlam Exp $ +# $NetBSD: Makefile,v 1.37 2005/06/01 18:02:44 jlam Exp $ # DISTNAME= libglade-2.5.1 @@ -14,7 +14,6 @@ COMMENT= Runtime interpreter for GLADE GUI files (v2) BUILD_USES_MSGFMT= YES USE_TOOLS+= gmake -USE_X11= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES PKGCONFIG_OVERRIDE= libglade-2.0.pc.in diff --git a/devel/libgnomeui/Makefile b/devel/libgnomeui/Makefile index c283df8b137..d2240b0792d 100644 --- a/devel/libgnomeui/Makefile +++ b/devel/libgnomeui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2005/05/22 20:07:52 jlam Exp $ +# $NetBSD: Makefile,v 1.43 2005/06/01 18:02:44 jlam Exp $ # DISTNAME= libgnomeui-2.10.0 @@ -19,7 +19,6 @@ USE_DIRS+= xdg-1.1 USE_PKGLOCALEDIR= yes USE_TOOLS+= gmake USE_PERL5= build -USE_X11= yes USE_LIBTOOL= yes CONFIGURE_ARGS+= --disable-gtk-doc diff --git a/devel/libmatchbox/Makefile b/devel/libmatchbox/Makefile index cf7f98c5b07..428738eaf01 100644 --- a/devel/libmatchbox/Makefile +++ b/devel/libmatchbox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/06/01 04:06:53 reed Exp $ +# $NetBSD: Makefile,v 1.8 2005/06/01 18:02:44 jlam Exp $ # DISTNAME= libmatchbox-1.6 @@ -10,7 +10,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://projects.o-hand.com/matchbox/ COMMENT= Library for matchbox window manager for computers with small displays -USE_X11= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes diff --git a/devel/libstroke/Makefile b/devel/libstroke/Makefile index b253d9c0850..a9035df98b4 100644 --- a/devel/libstroke/Makefile +++ b/devel/libstroke/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/05/22 20:07:53 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2005/06/01 18:02:44 jlam Exp $ # DISTNAME= libstroke-0.5.1 @@ -14,7 +14,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews GNU_CONFIGURE= YES USE_LIBTOOL= YES -USE_X11= YES USE_TOOLS= gmake LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig @@ -22,4 +21,5 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig CONFIGURE_ENV+= ac_cv_path_GTK_CONFIG=no .include "../../lang/tcl/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/maketool/Makefile b/devel/maketool/Makefile index c3f98322561..e3819eb1d78 100644 --- a/devel/maketool/Makefile +++ b/devel/maketool/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2005/05/22 20:07:53 jlam Exp $ +# $NetBSD: Makefile,v 1.32 2005/06/01 18:02:44 jlam Exp $ # DISTNAME= maketool-0.7 @@ -14,7 +14,6 @@ COMMENT= Graphical front end to GNU make BUILD_USES_MSGFMT= # defined USE_PKGLOCALEDIR= # defined -USE_X11= # defined USE_TOOLS+= gmake GNU_CONFIGURE= # defined USE_PKGLOCALEDIR= # defined diff --git a/devel/ncurses/builtin.mk b/devel/ncurses/builtin.mk index f42eca9e9fe..952ece0d01a 100644 --- a/devel/ncurses/builtin.mk +++ b/devel/ncurses/builtin.mk @@ -1,145 +1,151 @@ -# $NetBSD: builtin.mk,v 1.7 2004/12/11 00:32:16 jlam Exp $ +# $NetBSD: builtin.mk,v 1.8 2005/06/01 18:02:44 jlam Exp $ -.for _lib_ in ncurses -. if !defined(_BLNK_LIB_FOUND.${_lib_}) -_BLNK_LIB_FOUND.${_lib_}!= \ - if ${TEST} "`${ECHO} /usr/lib/lib${_lib_}.*`" != "/usr/lib/lib${_lib_}.*"; then \ - ${ECHO} "yes"; \ - elif ${TEST} "`${ECHO} /lib/lib${_lib_}.*`" != "/lib/lib${_lib_}.*"; then \ - ${ECHO} "yes"; \ - else \ - ${ECHO} "no"; \ - fi -BUILDLINK_VARS+= _BLNK_LIB_FOUND.${_lib_} -. endif -.endfor -.undef _lib_ +BUILTIN_PKG:= ncurses -_NCURSES_H= /usr/include/curses.h +BUILTIN_FIND_LIBS:= ncurses +BUILTIN_FIND_FILES_VAR:= H_NCURSES +BUILTIN_FIND_FILES.H_NCURSES= /usr/include/curses.h +BUILTIN_FIND_GREP.H_NCURSES= \#define[ ]*NCURSES_VERSION +.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.ncurses) IS_BUILTIN.ncurses= no -. if !empty(_BLNK_LIB_FOUND.ncurses:M[yY][eE][sS]) +. if empty(H_NCURSES:M${LOCALBASE}/*) && exists(${H_NCURSES}) && \ + !empty(BUILTIN_LIB_FOUND.ncurses:M[yY][eE][sS]) IS_BUILTIN.ncurses= yes -. elif exists(${_NCURSES_H}) -IS_BUILTIN.ncurses!= \ - if ${GREP} -q "\#define[ ]*NCURSES_VERSION" ${_NCURSES_H}; then \ - ${ECHO} "yes"; \ - else \ - ${ECHO} "no"; \ - fi -. if !empty(IS_BUILTIN.ncurses:M[yY][eE][sS]) -# -# Create an appropriate name for the built-in package distributed -# with the system. This package name can be used to check against -# BUILDLINK_DEPENDS.<pkg> to see if we need to install the pkgsrc -# version or if the built-in one is sufficient. -# -_NCURSES_VERSION!= \ +. endif +.endif +MAKEVARS+= IS_BUILTIN.ncurses + +### +### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to +### a package name to represent the built-in package. +### +.if !defined(BUILTIN_PKG.ncurses) && \ + !empty(IS_BUILTIN.ncurses:M[yY][eE][sS]) && \ + exists(${H_NCURSES}) +BUILTIN_VERSION.ncurses!= \ ${AWK} '/\#define[ ]*NCURSES_VERSION[ ]/ { \ vers = $$3; \ gsub("\"", "", vers); \ print vers; \ } \ - ' ${_NCURSES_H} -BUILTIN_PKG.ncurses= ncurses-${_NCURSES_VERSION} -BUILDLINK_VARS+= BUILTIN_PKG.ncurses -. endif -. endif -BUILDLINK_VARS+= IS_BUILTIN.ncurses -.endif # IS_BUILTIN.ncurses + ' ${H_NCURSES:Q} +BUILTIN_PKG.ncurses= ncurses-${BUILTIN_VERSION.ncurses} +.endif +MAKEVARS+= BUILTIN_PKG.ncurses +### +### 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.ncurses) -USE_BUILTIN.ncurses?= ${IS_BUILTIN.ncurses} -PREFER.ncurses?= pkgsrc - -. if defined(BUILTIN_PKG.ncurses) +. if ${PREFER.ncurses} == "pkgsrc" +USE_BUILTIN.ncurses= no +. else +USE_BUILTIN.ncurses= ${IS_BUILTIN.ncurses} +. if defined(BUILTIN_PKG.ncurses) && \ + !empty(IS_BUILTIN.ncurses:M[yY][eE][sS]) USE_BUILTIN.ncurses= yes -. for _depend_ in ${BUILDLINK_DEPENDS.ncurses} -. if !empty(IS_BUILTIN.ncurses:M[yY][eE][sS]) +. for _dep_ in ${BUILDLINK_DEPENDS.ncurses} +. if !empty(USE_BUILTIN.ncurses:M[yY][eE][sS]) USE_BUILTIN.ncurses!= \ - if ${PKG_ADMIN} pmatch '${_depend_}' ${BUILTIN_PKG.ncurses}; then \ - ${ECHO} "yes"; \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.ncurses:Q}; then \ + ${ECHO} yes; \ else \ - ${ECHO} "no"; \ + ${ECHO} no; \ fi -. endif -. endfor -. endif - -. if ${PREFER.ncurses} == "native" +. endif +. endfor +. endif # XXX -# XXX By default, assume that the native curses on NetBSD systems -# XXX supports ncurses. +# XXX By default, assume that the native curses on NetBSD systems is +# XXX good enough to replace ncurses. In reality, no version of NetBSD +# XXX has a curses library that can completely replace ncurses; however, +# XXX some versions implement enough of ncurses that some packages are +# XXX happy. # XXX . if ${OPSYS} == "NetBSD" USE_BUILTIN.ncurses= yes +. endif # -# These versions of NetBSD didn't have a curses library that was -# capable of replacing ncurses. -# -# XXX In reality, no version of NetBSD has a curses library that can -# XXX completely replace ncurses; however, some versions implement -# XXX enough of ncurses that some packages are happy. +# Some platforms don't have a curses implementation that can replace +# ncurses. # -_INCOMPAT_CURSES= NetBSD-0.*-* NetBSD-1.[0123]*-* -_INCOMPAT_CURSES+= NetBSD-1.4.*-* NetBSD-1.4[A-X]-* -. for _pattern_ in ${_INCOMPAT_CURSES} ${INCOMPAT_CURSES} -. if !empty(MACHINE_PLATFORM:M${_pattern_}) +_INCOMPAT_CURSES?= NetBSD-0.*-* NetBSD-1.[0123]*-* \ + NetBSD-1.4.*-* NetBSD-1.4[A-X]-* +. for _pattern_ in ${_INCOMPAT_CURSES} ${INCOMPAT_CURSES} +. if !empty(MACHINE_PLATFORM:M${_pattern_}) USE_BUILTIN.ncurses= no -. endif -. endfor -. endif -. endif +. endif +. endfor +. endif # PREFER.ncurses +.endif +MAKEVARS+= USE_BUILTIN.ncurses -. if defined(USE_NCURSES) -. if !empty(IS_BUILTIN.ncurses:M[nN][oO]) || \ - (${PREFER.ncurses} == "pkgsrc") +# If USE_NCURSES is defined, then force the use of an ncurses +# implementation. +# +.if defined(USE_NCURSES) +. if !empty(IS_BUILTIN.ncurses:M[nN][oO]) USE_BUILTIN.ncurses= no -. endif . endif -.endif # USE_BUILTIN.ncurses +.endif +### +### The section below only applies if we are not including this file +### solely to determine whether a built-in implementation exists. +### CHECK_BUILTIN.ncurses?= no .if !empty(CHECK_BUILTIN.ncurses:M[nN][oO]) -.if !empty(USE_BUILTIN.ncurses:M[yY][eE][sS]) -. include "../../mk/bsd.prefs.mk" -. if !empty(_BLNK_LIB_FOUND.ncurses:M[nN][oO]) || ${OPSYS} == "Interix" +. if !empty(USE_BUILTIN.ncurses:M[yY][eE][sS]) +. if !empty(BUILTIN_LIB_FOUND.ncurses:M[nN][oO]) || (${OPSYS} == "Interix") BUILDLINK_TRANSFORM.ncurses+= -e "s|/curses\.h|/ncurses.h|g" BUILDLINK_TRANSFORM+= l:ncurses:curses -. endif +. endif BUILDLINK_FILES.ncurses+= include/curses.h BUILDLINK_TARGETS+= buildlink-ncurses-extra-includes -.endif - +. endif BUILDLINK_TARGETS+= buildlink-ncurses-curses-h -.if !target(buildlink-ncurses-extra-includes) +# A full ncurses implementation provides more headers than some curses +# implementations. Touch empty replacements for those headers so that +# packages can continue to use the familiar ncurses header names. +# +. if !target(buildlink-ncurses-extra-includes) .PHONY: buildlink-ncurses-extra-includes buildlink-ncurses-extra-includes: ${_PKG_SILENT}${_PKG_DEBUG} \ extra_includes="include/term.h"; \ - for f in $${extra_includes}; do \ - if [ ! -f ${BUILDLINK_PREFIX.ncurses}/$$f ]; then \ - ${ECHO_BUILDLINK_MSG} "Touching extra ncurses header ($$f) in ${BUILDLINK_DIR}."; \ - ${MKDIR} -p `${DIRNAME} ${BUILDLINK_DIR}/$$f`; \ - ${TOUCH} ${TOUCH_FLAGS} ${BUILDLINK_DIR}/$$f; \ + for f in $$extra_includes; do \ + src=${BUILDLINK_PREFIX.ncurses:Q}"/$$f"; \ + dest=${BUILDLINK_DIR:Q}"/$$f"; \ + if ${TEST} ! -f "$$src"; then \ + ${ECHO_BUILDLINK_MSG} "Touching extra ncurses header ($$f)"; \ + ${MKDIR} `${DIRNAME} "$$dest"`; \ + ${TOUCH} ${TOUCH_FLAGS} "$$dest"; \ fi; \ done -.endif +. endif -.if !target(buildlink-ncurses-curses-h) +# Some packages expect <curses.h> to provide declarations for ncurses. +. if !target(buildlink-ncurses-curses-h) .PHONY: buildlink-ncurses-curses-h buildlink-ncurses-curses-h: ${_PKG_SILENT}${_PKG_DEBUG} \ - if [ ! -f ${BUILDLINK_DIR}/include/curses.h -a \ - -f ${BUILDLINK_PREFIX.ncurses}/include/ncurses.h ]; then \ + src=${BUILDLINK_PREFIX.ncurses:Q}"/include/ncurses.h"; \ + dest=${BUILDLINK_DIR:Q}"/include/curses.h"; \ + if ${TEST} ! -f "$$dest" -a -f "$$src"; then \ ${ECHO_BUILDLINK_MSG} "Linking curses.h -> ncurses.h."; \ - ${MKDIR} -p ${BUILDLINK_DIR}/include; \ - ${LN} -s ${BUILDLINK_PREFIX.ncurses}/include/ncurses.h \ - ${BUILDLINK_DIR}/include/curses.h; \ + ${MKDIR} `${DIRNAME} "$$dest"`; \ + ${LN} -s "$$src" "$$dest"; \ fi -.endif +. endif .endif # CHECK_BUILTIN.ncurses diff --git a/devel/netbeans-ide/Makefile b/devel/netbeans-ide/Makefile index 127ee44f463..44b54ac9c4b 100644 --- a/devel/netbeans-ide/Makefile +++ b/devel/netbeans-ide/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:28 tv Exp $ +# $NetBSD: Makefile,v 1.5 2005/06/01 18:02:44 jlam Exp $ # DISTNAME= NetBeansIDE-release351 @@ -13,7 +13,6 @@ COMMENT= NetBeans Java IDE USE_JAVA= run PKG_JVMS_ACCEPTED= sun-jdk13 sun-jdk14 jdk13 jdk14 -USE_X11= yes NO_CONFIGURE= yes NO_BUILD= yes WRKSRC= ${WRKDIR}/netbeans @@ -37,5 +36,6 @@ do-install: tomcat406 update_tracking ${SHAREDIR} ${LN} -sf ${SHAREDIR}/bin/runide.sh ${PREFIX}/bin/netbeans +.include "../../mk/x11.buildlink3.mk" .include "../../mk/java-vm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ode/Makefile b/devel/ode/Makefile index 0ff0adc277b..76eb039c0d8 100644 --- a/devel/ode/Makefile +++ b/devel/ode/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/05/22 20:07:54 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:02:44 jlam Exp $ # DISTNAME= ode-0.039 @@ -11,7 +11,8 @@ HOMEPAGE= http://opende.sourceforge.net/ COMMENT= Library for the simulation of Rigid Body Dynamics USE_TOOLS+= gmake -USE_X11= yes + +.include "../../mk/x11.buildlink3.mk" do-configure: cd ${WRKSRC} && ${GMAKE} configure diff --git a/devel/ogre/Makefile b/devel/ogre/Makefile index 12f4d4e536e..6aa3261f082 100644 --- a/devel/ogre/Makefile +++ b/devel/ogre/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/05/22 20:07:54 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2005/06/01 18:02:44 jlam Exp $ # DISTNAME= ogre-v0-12-1 @@ -16,7 +16,6 @@ WRKSRC= ${WRKDIR}/ogrenew GNU_CONFIGURE= yes USE_TOOLS+= gmake USE_LIBTOOL= yes -USE_X11= yes CONFIGURE_ARGS+= --with-platform=SDL diff --git a/devel/pango/Makefile b/devel/pango/Makefile index c516b0ee4e0..6f64e21fa08 100644 --- a/devel/pango/Makefile +++ b/devel/pango/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.55 2005/05/22 20:07:54 jlam Exp $ +# $NetBSD: Makefile,v 1.56 2005/06/01 18:02:44 jlam Exp $ # DISTNAME= pango-1.8.1 @@ -16,7 +16,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_PKGINSTALL= yes USE_TOOLS+= gmake -USE_X11= yes GNU_CONFIGURE= yes TEST_TARGET= check USE_LIBTOOL= yes diff --git a/devel/py-idle/Makefile b/devel/py-idle/Makefile index 604ead5c51a..c0638685884 100644 --- a/devel/py-idle/Makefile +++ b/devel/py-idle/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/04/11 21:45:37 tv Exp $ +# $NetBSD: Makefile,v 1.20 2005/06/01 18:02:45 jlam Exp $ # PKGNAME= ${PYPKGPREFIX}-idle-0 @@ -9,8 +9,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.python.org/idle/ COMMENT= IDLE - The Integrated DeveLopment Environment for Python -USE_X11= yes - PLIST_SRC= ${WRKDIR}/.PLIST_SRC PY_PATCHPLIST= yes PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} diff --git a/devel/readline/builtin.mk b/devel/readline/builtin.mk index c15e7f4d84a..aa21f842ec6 100644 --- a/devel/readline/builtin.mk +++ b/devel/readline/builtin.mk @@ -1,109 +1,114 @@ -# $NetBSD: builtin.mk,v 1.9 2005/01/26 16:17:16 jlam Exp $ +# $NetBSD: builtin.mk,v 1.10 2005/06/01 18:02:45 jlam Exp $ -_READLINE_H= /usr/include/readline.h -_READLINE_READLINE_H= /usr/include/readline/readline.h +BUILTIN_PKG:= readline -.for _lib_ in readline edit -. if !defined(_BLNK_LIB_FOUND.${_lib_}) -_BLNK_LIB_FOUND.${_lib_}!= \ - if ${TEST} "`${ECHO} /usr/lib/lib${_lib_}.*`" != "/usr/lib/lib${_lib_}.*"; then \ - ${ECHO} "yes"; \ - elif ${TEST} "`${ECHO} /lib/lib${_lib_}.*`" != "/lib/lib${_lib_}.*"; then \ - ${ECHO} "yes"; \ - else \ - ${ECHO} "no"; \ - fi -BUILDLINK_VARS+= _BLNK_LIB_FOUND.${_lib_} -. endif -.endfor -.undef _lib_ +BUILTIN_FIND_LIBS:= edit readline +BUILTIN_FIND_FILES_VAR:= H_READLINE +BUILTIN_FIND_FILES.H_READLINE= /usr/include/readline/readline.h \ + /usr/include/readline.h +BUILTIN_FIND_GREP.H_READLINE= \#define[ ]*RL_VERSION_MAJOR +.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.readline) IS_BUILTIN.readline= no -. if exists(${_READLINE_H}) || exists(${_READLINE_READLINE_H}) -. if exists(${_READLINE_H}) -_READLINE_HEADER= ${_READLINE_H} -. else -_READLINE_HEADER= ${_READLINE_READLINE_H} -. endif -IS_BUILTIN.readline!= \ - if ${GREP} -q "\#define[ ]*RL_VERSION_MAJOR" ${_READLINE_HEADER}; then \ - ${ECHO} "yes"; \ - else \ - ${ECHO} "no"; \ - fi -. if !empty(IS_BUILTIN.readline:M[yY][eE][sS]) -# -# Create an appropriate name for the built-in package distributed -# with the system. This package name can be used to check against -# BUILDLINK_DEPENDS.<pkg> to see if we need to install the pkgsrc -# version or if the built-in one is sufficient. -# -_READLINE_MAJOR!= \ - ${AWK} '/\#define[ ]*RL_VERSION_MAJOR/ { print $$3 }' \ - ${_READLINE_HEADER} -_READLINE_MINOR!= \ - ${AWK} '/\#define[ ]*RL_VERSION_MINOR/ { print $$3 }' \ - ${_READLINE_HEADER} -_READLINE_VERSION= ${_READLINE_MAJOR}.${_READLINE_MINOR} -BUILTIN_PKG.readline= readline-${_READLINE_VERSION} -BUILDLINK_VARS+= BUILTIN_PKG.readline -. endif +. if empty(H_READLINE:M${LOCALBASE}/*) && exists(${H_READLINE}) && \ + !empty(BUILTIN_LIB_FOUND.readline:M[yY][eE][sS]) +IS_BUILTIN.readline= yes . endif -BUILDLINK_VARS+= IS_BUILTIN.readline -.endif # IS_BUILTIN.readline +.endif +MAKEVARS+= IS_BUILTIN.readline -.if !defined(USE_BUILTIN.readline) -USE_BUILTIN.readline?= ${IS_BUILTIN.readline} -PREFER.readline?= pkgsrc +### +### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to +### a package name to represent the built-in package. +### +.if !defined(BUILTIN_PKG.readline) && \ + !empty(IS_BUILTIN.readline:M[yY][eE][sS]) && \ + exists(${H_READLINE}) +BUILTIN_VERSION.readline!= \ + ${AWK} '/\#define[ ]*RL_VERSION_MAJOR/ { M = $$3 } \ + /\#define[ ]*RL_VERSION_MINOR/ { m = "."$$3 } \ + END { printf "%s%s\n", M, m } \ + ' ${H_READLINE:Q} +BUILTIN_PKG.readline= readline-${BUILTIN_VERSION.readline} +.endif +MAKEVARS+= BUILTIN_PKG.readline -. if defined(BUILTIN_PKG.readline) +### +### 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.readline) +. if ${PREFER.readline} == "pkgsrc" +USE_BUILTIN.readline= no +. else +USE_BUILTIN.readline= ${IS_BUILTIN.readline} +. if defined(BUILTIN_PKG.readline) && \ + !empty(IS_BUILTIN.readline:M[yY][eE][sS]) USE_BUILTIN.readline= yes -. for _depend_ in ${BUILDLINK_DEPENDS.readline} -. if !empty(USE_BUILTIN.readline:M[yY][eE][sS]) +. for _dep_ in ${BUILDLINK_DEPENDS.readline} +. if !empty(USE_BUILTIN.readline:M[yY][eE][sS]) USE_BUILTIN.readline!= \ - if ${PKG_ADMIN} pmatch '${_depend_}' ${BUILTIN_PKG.readline}; then \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.readline:Q}; then \ ${ECHO} "yes"; \ else \ ${ECHO} "no"; \ fi -. endif -. endfor -. endif - -. if ${PREFER.readline} == "native" +. endif +. endfor +. endif # XXX -# XXX By default, assume that the native editline library supports readline. +# XXX By default, assume that the native editline library is good enough +# XXX to replace GNU readline if it provides the readline-compatibility +# XXX headers. # XXX -. if !empty(_BLNK_LIB_FOUND.readline:M[nN][oO]) && \ - !empty(_BLNK_LIB_FOUND.edit:M[yY][eE][sS]) +. if !empty(BUILTIN_LIB_FOUND.readline:M[nN][oO]) && \ + !empty(BUILTIN_LIB_FOUND.edit:M[yY][eE][sS]) && \ + (exists(/usr/include/readline/readline.h) || \ + exists(/usr/include/readline.h)) USE_BUILTIN.readline= yes +. endif +# +# Some platforms don't have a readline/editline implementation that can +# replace GNU readline. +# _INCOMPAT_READLINE?= SunOS-*-* Darwin-*-* Interix-*-* -. for _pattern_ in ${_INCOMPAT_READLINE} ${INCOMPAT_READLINE} -. if !empty(MACHINE_PLATFORM:M${_pattern_}) +. for _pattern_ in ${_INCOMPAT_READLINE} ${INCOMPAT_READLINE} +. if !empty(MACHINE_PLATFORM:M${_pattern_}) USE_BUILTIN.readline= no -. endif -. endfor -. endif -. endif +. endif +. endfor +. endif # PREFER.readline +.endif +MAKEVARS+= USE_BUILTIN.readline -. if defined(USE_GNU_READLINE) -. if !empty(IS_BUILTIN.readline:M[nN][oO]) || \ - (${PREFER.readline} == "pkgsrc") +# If USE_GNU_READLINE is defined, then force the use of a GNU readline +# implementation. +# +.if defined(USE_GNU_READLINE) +. if !empty(IS_BUILTIN.readline:M[nN][oO]) USE_BUILTIN.readline= no -. endif . endif -.endif # USE_BUILTIN.readline +.endif +### +### The section below only applies if we are not including this file +### solely to determine whether a built-in implementation exists. +### CHECK_BUILTIN.readline?= no .if !empty(CHECK_BUILTIN.readline:M[nN][oO]) -.if !empty(USE_BUILTIN.readline:M[yY][eE][sS]) -. if !empty(_BLNK_LIB_FOUND.readline:M[nN][oO]) && \ - !empty(_BLNK_LIB_FOUND.edit:M[yY][eE][sS]) -BUILDLINK_TRANSFORM+= l:history:edit:termcap -BUILDLINK_TRANSFORM+= l:readline:edit:termcap +. if !empty(USE_BUILTIN.readline:M[yY][eE][sS]) +. if !empty(BUILTIN_LIB_FOUND.readline:M[nN][oO]) && \ + !empty(BUILTIN_LIB_FOUND.edit:M[yY][eE][sS]) +BUILDLINK_TRANSFORM+= l:history:edit:termcap +BUILDLINK_TRANSFORM+= l:readline:edit:termcap +. endif . endif -.endif .endif # CHECK_BUILTIN.readline diff --git a/devel/tcl-tclcl/Makefile b/devel/tcl-tclcl/Makefile index dac5a71c0cd..88c7e940988 100644 --- a/devel/tcl-tclcl/Makefile +++ b/devel/tcl-tclcl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/04/11 21:45:39 tv Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/01 18:02:45 jlam Exp $ DISTNAME= tclcl-src-1.16 PKGNAME= tcl-${DISTNAME:S/-src//} @@ -15,7 +15,6 @@ WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//} USE_LANGUAGES= c c++ GNU_CONFIGURE= yes USE_LIBTOOL= yes -USE_X11= yes CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl} CONFIGURE_ARGS+= --with-tk=${BUILDLINK_PREFIX.tk} diff --git a/devel/zlib/builtin.mk b/devel/zlib/builtin.mk index ca90ebdcd28..cfc48374a44 100644 --- a/devel/zlib/builtin.mk +++ b/devel/zlib/builtin.mk @@ -1,81 +1,94 @@ -# $NetBSD: builtin.mk,v 1.2 2004/03/29 05:43:30 jlam Exp $ +# $NetBSD: builtin.mk,v 1.3 2005/06/01 18:02:45 jlam Exp $ -_ZLIB_H= /usr/include/zlib.h +BUILTIN_PKG:= zlib +BUILTIN_FIND_FILES_VAR:= H_ZLIB +BUILTIN_FIND_FILES.H_ZLIB= /usr/include/zlib.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.zlib) IS_BUILTIN.zlib= no -. if exists(${_ZLIB_H}) +. if empty(H_ZLIB:M${LOCALBASE}/*) && exists(${H_ZLIB}) IS_BUILTIN.zlib= yes -# -# Create an appropriate name for the built-in package distributed -# with the system. This package name can be used to check against -# BUILDLINK_DEPENDS.<pkg> to see if we need to install the pkgsrc -# version or if the built-in one is sufficient. -# -_ZLIB_VERSION!= \ +. endif +.endif +MAKEVARS+= IS_BUILTIN.zlib + +### +### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to +### a package name to represent the built-in package. +### +.if !defined(BUILTIN_PKG.zlib) && \ + !empty(IS_BUILTIN.zlib:M[yY][eE][sS]) && \ + exists(${H_ZLIB}) +BUILTIN_VERSION.zlib!= \ ${AWK} '/\#define[ ]*ZLIB_VERSION/ { \ vers = $$3; \ gsub("\"", "", vers); \ print vers; \ } \ - ' ${_ZLIB_H} -BUILTIN_PKG.zlib= zlib-${_ZLIB_VERSION} + ' ${H_ZLIB:Q} # # If the built-in zlib is 1.1.4, then check whether it has the security # fix for CAN-2003-0107, which was a buffer overflow in the gzprintf # function. If it does, then treat it as the equivalent of zlib-1.1.4nb1. # -_HAVE_CAN_2003_0107_FIX= NetBSD-1.3[I-Z]*-* NetBSD-1.[456]*-* -_HAVE_CAN_2003_0107_FIX+= NetBSD-[2-9]*-* NetBSD-1[0-9]*-* +BUILTIN_CAN_2003_0107_FIX= NetBSD-1.3[I-Z]*-* NetBSD-1.[456]*-* \ + NetBSD-[2-9]*-* NetBSD-1[0-9]*-* # # XXX These patterns for {Free,Open}BSD are too permissive, but I'm not # XXX sure which versions of those OSes provide secure versions of # XXX zlib-1.1.4. # -_HAVE_CAN_2003_0107_FIX+= FreeBSD-*-* OpenBSD-*-* -. if ${_ZLIB_VERSION} == "1.1.4" -. for _pattern_ in ${_HAVE_CAN_2003_0107_FIX} -. if !empty(MACHINE_PLATFORM:M${_pattern_}) -BUILTIN_PKG.zlib= zlib-1.1.4nb1 -. endif -. endfor -. endif -BUILDLINK_VARS+= BUILTIN_PKG.zlib +BUILTIN_CAN_2003_0107_FIX+= FreeBSD-*-* OpenBSD-*-* +. if ${BUILTIN_VERSION.zlib} == "1.1.4" +. for _pattern_ in ${BUILTIN_CAN_2003_0107_FIX} +. if !empty(MACHINE_PLATFORM:M${_pattern_}) +BUILTIN_VERSION.zlib= 1.1.4nb1 +. endif +. endfor . endif -BUILDLINK_VARS+= IS_BUILTIN.zlib -.endif # IS_BUILTIN.zlib +BUILTIN_PKG.zlib= zlib-${BUILTIN_VERSION.zlib} +.endif +MAKEVARS+= BUILTIN_PKG.zlib +### +### 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.zlib) -USE_BUILTIN.zlib?= ${IS_BUILTIN.zlib} -PREFER.zlib?= pkgsrc - -. if defined(BUILTIN_PKG.zlib) +. if ${PREFER.zlib} == "pkgsrc" +USE_BUILTIN.zlib= no +. else +USE_BUILTIN.zlib= ${IS_BUILTIN.zlib} +. if defined(BUILTIN_PKG.zlib) && \ + !empty(IS_BUILTIN.zlib:M[yY][eE][sS]) USE_BUILTIN.zlib= yes -. for _depend_ in ${BUILDLINK_DEPENDS.zlib} -. if !empty(USE_BUILTIN.zlib:M[yY][eE][sS]) +. for _dep_ in ${BUILDLINK_DEPENDS.zlib} +. if !empty(USE_BUILTIN.zlib:M[yY][eE][sS]) USE_BUILTIN.zlib!= \ - if ${PKG_ADMIN} pmatch '${_depend_}' ${BUILTIN_PKG.zlib}; then \ - ${ECHO} "yes"; \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.zlib:Q}; then \ + ${ECHO} yes; \ else \ - ${ECHO} "no"; \ + ${ECHO} no; \ fi -. endif -. endfor -. endif +. endif +. endfor +. endif +. endif # PREFER.zlib +.endif +MAKEVARS+= USE_BUILTIN.zlib -. if defined(USE_ZLIB) -. if !empty(IS_BUILTIN.zlib:M[nN][oO]) && \ - (${PREFER.zlib} == "pkgsrc") +# If USE_ZLIB is defined, then force the use of a true zlib +# implementation. +# +.if defined(USE_ZLIB) +. if !empty(IS_BUILTIN.zlib:M[nN][oO]) USE_BUILTIN.zlib= no -. endif . endif -.endif # USE_BUILTIN.zlib - -CHECK_BUILTIN.zlib?= no -.if !empty(CHECK_BUILTIN.zlib:M[nN][oO]) - -.if !empty(USE_BUILTIN.zlib:M[nN][oO]) -BUILDLINK_DEPENDS.zlib+= zlib>=1.2.1 .endif - -.endif # CHECK_BUILTIN.zlib diff --git a/editors/TeXmacs/Makefile b/editors/TeXmacs/Makefile index faa8869af90..89ff79f3913 100644 --- a/editors/TeXmacs/Makefile +++ b/editors/TeXmacs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2005/05/31 16:37:09 drochner Exp $ +# $NetBSD: Makefile,v 1.44 2005/06/01 18:02:45 jlam Exp $ DISTNAME= TeXmacs-1.0.5.2-src PKGNAME= ${DISTNAME:S/-src//} @@ -15,7 +15,6 @@ BUILD_TARGET= TEXMACS USE_TOOLS+= gmake USE_LANGUAGES= c c++ -USE_X11= yes GNU_CONFIGURE= yes PYTHON_PATCH_SCRIPTS= plugins/python/bin/tm_python @@ -28,6 +27,7 @@ SUBST_SED.init= -e 's,@PYTHONBIN@,${PYTHONBIN},g' .include "../../converters/libiconv/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../lang/guile/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/abiword/Makefile.common b/editors/abiword/Makefile.common index 4f3e984f7dd..25c539c8aea 100644 --- a/editors/abiword/Makefile.common +++ b/editors/abiword/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.19 2005/05/22 20:07:55 jlam Exp $ +# $NetBSD: Makefile.common,v 1.20 2005/06/01 18:02:45 jlam Exp $ # Be sure to update PLIST and distinfo for editors/abiword-plugins when updating ABIWORD_VERSION= 2.2.7 @@ -19,7 +19,6 @@ GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_DIRS+= xdg-1.1 USE_TOOLS+= gmake -USE_X11= yes CONFIGURE_ARGS+= --with-libpng=${BUILDLINK_PREFIX.png} diff --git a/editors/beaver/Makefile b/editors/beaver/Makefile index 0cab4a5537c..9c4e668a81c 100644 --- a/editors/beaver/Makefile +++ b/editors/beaver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/04/11 21:45:40 tv Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:45 jlam Exp $ # DISTNAME= beaver-0.2.6 @@ -12,8 +12,6 @@ COMMENT= Lightweight GTK+ text editor with syntax highlighting WRKSRC= ${WRKDIR}/${DISTNAME}/src USE_DIRS+= xdg-1.1 -USE_X11= YES .include "../../x11/gtk/buildlink3.mk" - .include "../../mk/bsd.pkg.mk" diff --git a/editors/ce-x11/Makefile b/editors/ce-x11/Makefile index 80ec3cf705d..5c88a9d389b 100644 --- a/editors/ce-x11/Makefile +++ b/editors/ce-x11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/04/11 21:45:40 tv Exp $ +# $NetBSD: Makefile,v 1.14 2005/06/01 18:02:45 jlam Exp $ # .include "../ce/Makefile.common" @@ -8,7 +8,6 @@ COMMENT+= , X11 version PKG_INSTALLATION_TYPES= overwrite pkgviews -USE_X11= # defined BUILD_TARGET= xce INSTALL_TARGET= install-x11 man-install-x11 @@ -16,4 +15,5 @@ INSTALL_TARGET= install-x11 man-install-x11 INSTALLATION_DIRS= bin man/man1 .include "../../mk/curses.buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/cooledit/Makefile b/editors/cooledit/Makefile index 747bdafba65..3a7ae69ceb6 100644 --- a/editors/cooledit/Makefile +++ b/editors/cooledit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/05/22 20:07:55 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2005/06/01 18:02:45 jlam Exp $ DISTNAME= cooledit-3.17.14 CATEGORIES= editors @@ -13,7 +13,6 @@ BUILD_USES_MSGFMT= yes USE_TOOLS+= gmake USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes -USE_X11= yes GNU_CONFIGURE= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig diff --git a/editors/dasher/Makefile b/editors/dasher/Makefile index 59416891235..e0cb64c64e7 100644 --- a/editors/dasher/Makefile +++ b/editors/dasher/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/05/22 20:07:55 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2005/06/01 18:02:45 jlam Exp $ # DISTNAME= dasher-3.2.15 @@ -14,7 +14,6 @@ GNU_CONFIGURE= yes USE_DIRS+= gnome2-1.5 USE_TOOLS+= gmake USE_PKGLOCALEDIR= yes -USE_X11= yes .include "../../audio/gnome-speech/buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" diff --git a/editors/elvis-x11/Makefile b/editors/elvis-x11/Makefile index 7c76c72ddea..e59015cd789 100644 --- a/editors/elvis-x11/Makefile +++ b/editors/elvis-x11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2004/10/03 00:14:38 tv Exp $ +# $NetBSD: Makefile,v 1.6 2005/06/01 18:02:45 jlam Exp $ # .include "../elvis/Makefile.common" @@ -9,7 +9,6 @@ COMMENT= GUI for elvis, includes console elvis CONFLICTS+= elvis-[0-9]* -USE_X11= YES CONFIGURE_ARGS+= --with-x=yes CONFIGURE_ARGS+= --with-xft diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index 2a7c6155360..6f714fef719 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.84 2005/05/22 20:07:56 jlam Exp $ +# $NetBSD: Makefile,v 1.85 2005/06/01 18:02:45 jlam Exp $ DISTNAME= emacs-21.4a PKGREVISION= 1 @@ -11,7 +11,6 @@ COMMENT= GNU editing macros (editor) CONFLICTS= mule-[0-9]* -USE_X11= yes USE_TOOLS+= gmake GNU_CONFIGURE= yes diff --git a/editors/emacs20/Makefile b/editors/emacs20/Makefile index 2fe57db903b..01e0ab96d82 100644 --- a/editors/emacs20/Makefile +++ b/editors/emacs20/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/05/22 20:07:56 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2005/06/01 18:02:45 jlam Exp $ DISTNAME= emacs-20.7 PKGREVISION= 5 @@ -52,8 +52,8 @@ CONFIGURE_ARGS+=--with-pop .endif .if defined(EMACS_USE_X) +.include "../../mk/x11.buildlink3.mk" BUILD_DEFS+= EMACS_USE_X EMACS_USE_X_TOOLKIT -USE_X11= yes CONFIGURE_ARGS+= --with-x=yes .if defined(EMACS_USE_X_TOOLKIT) CONFIGURE_ARGS+= --with-x-toolkit=${EMACS_USE_X_TOOLKIT} diff --git a/editors/gconf-editor/Makefile b/editors/gconf-editor/Makefile index 5557887842b..315ae6a2166 100644 --- a/editors/gconf-editor/Makefile +++ b/editors/gconf-editor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2005/05/22 20:07:56 jlam Exp $ +# $NetBSD: Makefile,v 1.32 2005/06/01 18:02:45 jlam Exp $ # DISTNAME= gconf-editor-2.10.0 @@ -17,7 +17,6 @@ USE_DIRS+= xdg-1.1 gnome2-1.5 USE_LIBTOOL= YES USE_PKGLOCALEDIR= YES USE_TOOLS+= gmake -USE_X11= YES CONFIGURE_ARGS+= --with-gconf-defaults-source=${GCONF2_CONFIG_SOURCE} CONFIGURE_ARGS+= --with-gconf-mandatory-source=${GCONF2_CONFIG_SOURCE:S/gconf.xml.defaults/gconf.xml.mandatory/g} diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile index f94a7cfaaa4..8329f22ff6d 100644 --- a/editors/gedit/Makefile +++ b/editors/gedit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2005/05/22 20:07:56 jlam Exp $ +# $NetBSD: Makefile,v 1.47 2005/06/01 18:02:45 jlam Exp $ # DISTNAME= gedit-2.10.2 @@ -16,7 +16,6 @@ USE_PERL5= build USE_DIRS+= gnome2-1.5 USE_PKGLOCALEDIR= YES USE_TOOLS+= gmake -USE_X11= YES USE_LIBTOOL= YES GNU_CONFIGURE= YES diff --git a/editors/gice/Makefile b/editors/gice/Makefile index 127da75128e..da1aaf38592 100644 --- a/editors/gice/Makefile +++ b/editors/gice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/05/22 20:07:56 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2005/06/01 18:02:45 jlam Exp $ # DISTNAME= gice-0.6.2 @@ -11,7 +11,6 @@ HOMEPAGE= http://gice.sourceforge.net/ COMMENT= Powerful C text editor with advanced features WRKSRC= ${WRKDIR}/gice -USE_X11= YES USE_TOOLS+= gmake GNU_CONFIGURE= YES diff --git a/editors/gnuserv/Makefile b/editors/gnuserv/Makefile index 56718e95be4..58b417a2b9e 100644 --- a/editors/gnuserv/Makefile +++ b/editors/gnuserv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/01/31 00:10:12 minskim Exp $ +# $NetBSD: Makefile,v 1.6 2005/06/01 18:02:45 jlam Exp $ DISTNAME= gnuserv-3.12.7 PKGREVISION= 1 @@ -12,7 +12,8 @@ COMMENT= Improved version of emacsserver for GNU Emacs CONFLICTS+= xemacs-[0-9]* GNU_CONFIGURE= YES -USE_X11= YES + +.include "../../mk/x11.buildlink3.mk" EL_FILES= devices.el gnuserv.el gnuserv-compat.el post-install: diff --git a/editors/gtranslator/Makefile b/editors/gtranslator/Makefile index a9748a464fa..b195fa75df0 100644 --- a/editors/gtranslator/Makefile +++ b/editors/gtranslator/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/05/22 20:07:56 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:02:45 jlam Exp $ DISTNAME= gtranslator-1.0.2 CATEGORIES= editors @@ -13,7 +13,6 @@ BUILD_USES_MSGFMT= yes USE_DIRS+= gnome2-1.5 USE_TOOLS+= gmake USE_PKGLOCALEDIR= yes -USE_X11= yes GNU_CONFIGURE= yes MANCOMPRESSED= yes diff --git a/editors/lyx-qt/Makefile.common b/editors/lyx-qt/Makefile.common index 6cc924dd8ca..560332a5ddd 100644 --- a/editors/lyx-qt/Makefile.common +++ b/editors/lyx-qt/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.23 2005/05/22 20:07:56 jlam Exp $ +# $NetBSD: Makefile.common,v 1.24 2005/06/01 18:02:45 jlam Exp $ # DISTNAME= lyx-1.3.5 @@ -29,7 +29,6 @@ USE_TOOLS+= gmake USE_LIBTOOL= YES USE_PERL5= YES USE_PKGLOCALEDIR= YES -USE_X11= YES GCC_REQD+= 2.95 CONFIGURE_ARGS+= --with-pspell-lib=${BUILDLINK_PREFIX.aspell}/lib \ @@ -84,3 +83,4 @@ PYTHON_PATCH_SCRIPTS= lib/lyx2lyx/lyx2lyx \ .include "../../textproc/aiksaurus/buildlink3.mk" .include "../../textproc/aspell/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" diff --git a/editors/mule/Makefile b/editors/mule/Makefile index 6134eebe836..f92faf43e58 100644 --- a/editors/mule/Makefile +++ b/editors/mule/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2005/05/22 20:07:56 jlam Exp $ +# $NetBSD: Makefile,v 1.30 2005/06/01 18:02:45 jlam Exp $ DISTNAME= mule-2.3 PKGREVISION= 2 @@ -23,7 +23,6 @@ CONFLICTS= emacs-[0-9]* WRKSRC= ${WRKDIR}/mule GNU_CONFIGURE= yes USE_TOOLS+= gmake -USE_X11= yes CONFIGURE_ARGS+= ${MACHINE_ARCH}--netbsd --with-x --with-x-toolkit=lucid CONFIGURE_ARGS+= --terminal-face --mcpath @@ -47,6 +46,8 @@ INFO_FILES+= mule-jp quail sc terminology vip MAN1= coco.1 ctags.1 etags.1 m2ps.1 mule.1 +.include "../../mk/x11.buildlink3.mk" + post-patch: @${ECHO_MSG} "===> Applying jumbo patches in info directory" @${PATCH} ${PATCH_ARGS} < ${FILESDIR}/info.patch diff --git a/editors/nedit/Makefile b/editors/nedit/Makefile index 9976ca05f00..b961ab10e20 100644 --- a/editors/nedit/Makefile +++ b/editors/nedit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2005/04/11 21:45:41 tv Exp $ +# $NetBSD: Makefile,v 1.41 2005/06/01 18:02:45 jlam Exp $ DISTNAME= nedit-${VERS}-src PKGNAME= nedit-${VERS} @@ -16,7 +16,6 @@ COMMENT= Motif based standard GUI style text editor VERS= 5.5 WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} -USE_X11= YES BUILD_TARGET= netbsd do-install: diff --git a/editors/poedit/Makefile b/editors/poedit/Makefile index 67521e08b27..3b38387af2f 100644 --- a/editors/poedit/Makefile +++ b/editors/poedit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/05/22 20:07:57 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:02:45 jlam Exp $ # DISTNAME= poedit-1.2.5 @@ -15,7 +15,6 @@ DEPENDS+= zip-[0-9]*:../../archivers/zip GNU_CONFIGURE= yes USE_PKGLOCALEDIR= yes USE_TOOLS+= gmake -USE_X11= yes .include "../../databases/db4/buildlink3.mk" .include "../../x11/wxGTK/buildlink3.mk" diff --git a/editors/sam/Makefile b/editors/sam/Makefile index 21b1bbab305..b5c3372ee0f 100644 --- a/editors/sam/Makefile +++ b/editors/sam/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2005/04/11 21:45:41 tv Exp $ +# $NetBSD: Makefile,v 1.29 2005/06/01 18:02:46 jlam Exp $ DISTNAME= sam PKGNAME= sam-4.3 @@ -27,6 +27,8 @@ MAKE_ENV+= X11PREFIX=${X11PREFIX} OTHER_X_LIBS= -lSM -lICE .endif +.include "../../mk/x11.buildlink3.mk" + do-build: for d in libXg libframe sam samterm; do \ (cd ${WRKSRC}/$$d; ${MAKE_PROGRAM} -f Make.solaris \ diff --git a/editors/vigor/Makefile b/editors/vigor/Makefile index 3ab5f6c0aa0..069e9712c71 100644 --- a/editors/vigor/Makefile +++ b/editors/vigor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/04/11 21:45:42 tv Exp $ +# $NetBSD: Makefile,v 1.19 2005/06/01 18:02:46 jlam Exp $ # DISTNAME= vigor-0.016 @@ -13,7 +13,6 @@ COMMENT= nvi with excessive online "help" CONFLICTS+= nvi-[0-9]* WRKSRC= ${WRKDIR}/${DISTNAME}/build -USE_X11= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-x diff --git a/editors/vim-gtk/Makefile b/editors/vim-gtk/Makefile index 4cf539a588e..ecb2bd95093 100644 --- a/editors/vim-gtk/Makefile +++ b/editors/vim-gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2005/05/30 14:18:14 martti Exp $ +# $NetBSD: Makefile,v 1.49 2005/06/01 18:02:46 jlam Exp $ PKGNAME= vim-gtk-${VIM_VERSION}.${VIM_PATCHLEVEL} #PKGREVISION= 1 @@ -11,7 +11,6 @@ DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../vim-share CONFLICTS+= vim-[0-9]* vim-gtk2-[0-9]* vim-motif-[0-9]* CONFLICTS+= vim-xaw-[0-9]* vim-kde-[0-9]* -USE_X11= yes CONFIGURE_ARGS+= --enable-gui=gtk CONFIGURE_ARGS+= --with-tlib=ncurses diff --git a/editors/vim-gtk2/Makefile b/editors/vim-gtk2/Makefile index 4b33878010c..686faa9fb53 100644 --- a/editors/vim-gtk2/Makefile +++ b/editors/vim-gtk2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/05/30 14:18:14 martti Exp $ +# $NetBSD: Makefile,v 1.16 2005/06/01 18:02:46 jlam Exp $ PKGNAME= vim-gtk2-${VIM_VERSION}.${VIM_PATCHLEVEL} #PKGREVISION= 1 @@ -11,7 +11,6 @@ DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../vim-share CONFLICTS+= vim-[0-9]* vim-gtk-[0-9]* vim-motif-[0-9]* CONFLICTS+= vim-xaw-[0-9]* vim-kde-[0-9]* -USE_X11= yes CONFIGURE_ARGS+= --enable-gui=gtk2 CONFIGURE_ARGS+= --with-tlib=ncurses diff --git a/editors/vim-motif/Makefile b/editors/vim-motif/Makefile index 090d35a4244..c6864ba8556 100644 --- a/editors/vim-motif/Makefile +++ b/editors/vim-motif/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/05/30 14:18:14 martti Exp $ +# $NetBSD: Makefile,v 1.15 2005/06/01 18:02:46 jlam Exp $ PKGNAME= vim-motif-${VIM_VERSION}.${VIM_PATCHLEVEL} #PKGREVISION= 1 @@ -11,7 +11,6 @@ DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../vim-share CONFLICTS+= vim-[0-9]* vim-gtk-[0-9]* vim-gtk2-[0-9]* CONFLICTS+= vim-xaw-[0-9]* vim-kde-[0-9]* -USE_X11= yes CONFIGURE_ARGS+= --enable-gui=motif CONFIGURE_ARGS+= --with-tlib=ncurses diff --git a/editors/vim-xaw/Makefile b/editors/vim-xaw/Makefile index bbed1f1ad94..3f0dac1d781 100644 --- a/editors/vim-xaw/Makefile +++ b/editors/vim-xaw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2005/05/30 14:18:14 martti Exp $ +# $NetBSD: Makefile,v 1.38 2005/06/01 18:02:46 jlam Exp $ PKGNAME= vim-xaw-${VIM_VERSION}.${VIM_PATCHLEVEL} #PKGREVISION= 1 @@ -11,7 +11,6 @@ DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../vim-share CONFLICTS+= vim-[0-9]* vim-gtk-[0-9]* vim-gtk2-[0-9]* CONFLICTS+= vim-motif-[0-9]* vim-kde-[0-9]* -USE_X11= yes CONFIGURE_ARGS+= --enable-gui=athena CONFIGURE_ARGS+= --with-tlib=ncurses diff --git a/editors/wily/Makefile b/editors/wily/Makefile index 63a958e63b3..25d50203b53 100644 --- a/editors/wily/Makefile +++ b/editors/wily/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2003/07/17 21:35:10 grant Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 18:02:46 jlam Exp $ # DISTNAME= wily-0.13.41 @@ -11,8 +11,8 @@ HOMEPAGE= http://www.cs.yorku.ca/~oz/wily/ COMMENT= Unix/X11 clone of the Plan9 acme editor/environment GNU_CONFIGURE= yes -USE_X11= yes DEPENDS+= libXgFonts-1.0:../../fonts/Xg +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/xcoral/Makefile b/editors/xcoral/Makefile index ff71c6e8732..a7b6e4b5f80 100644 --- a/editors/xcoral/Makefile +++ b/editors/xcoral/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/03/24 21:12:54 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:46 jlam Exp $ DISTNAME= xcoral-3.2 CATEGORIES= editors @@ -18,6 +18,8 @@ LIBFILES= DEPEND README cmd.sc color.sc comments.sc compare-win.sc \ rcs.sc save.sc sun-keydef.sc title.sc top-ten.sc \ utilities.sc version.sc window-utilities.sc xcoralrc.lf +.include "../../mk/x11.buildlink3.mk" + do-install: ${INSTALL_DATA_DIR} ${PREFIX}/lib/xcoral ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xcoral/HTML/icons diff --git a/editors/xemacs-current/Makefile b/editors/xemacs-current/Makefile index cc875d2bc55..a51fae9576f 100644 --- a/editors/xemacs-current/Makefile +++ b/editors/xemacs-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2005/04/11 21:45:42 tv Exp $ +# $NetBSD: Makefile,v 1.48 2005/06/01 18:02:46 jlam Exp $ DISTNAME= xemacs-21.5.19 @@ -11,7 +11,6 @@ COMMENT= *BETA* XEmacs text editor version 21.5.19 CONFLICTS+= gnuclient-[0-9]* -USE_X11= YES BUILD_DEFS+= XEMACS_WIDGETS PLIST_SUBST+= EMACSVER=xemacs-21.5-b19 diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile index 037724625b9..b9b66b208a1 100644 --- a/editors/xemacs/Makefile +++ b/editors/xemacs/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.77 2005/04/25 17:23:50 magick Exp $ +# $NetBSD: Makefile,v 1.78 2005/06/01 18:02:46 jlam Exp $ .include "../../editors/xemacs/Makefile.common" MAINTAINER= uebayasi@NetBSD.org -USE_X11= YES CONFIGURE_ARGS+= --site-includes=${BUILDLINK_DIR}/include:${BUILDLINK_X11_DIR}/include CONFIGURE_ARGS+= --site-libraries=${BUILDLINK_DIR}/lib:${BUILDLINK_X11_DIR} diff --git a/editors/xemacs/Makefile.pkg b/editors/xemacs/Makefile.pkg index 44fbca5e5c8..606be3e3210 100644 --- a/editors/xemacs/Makefile.pkg +++ b/editors/xemacs/Makefile.pkg @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.pkg,v 1.1 2002/04/26 09:35:06 tron Exp $ +# $NetBSD: Makefile.pkg,v 1.2 2005/06/01 18:02:46 jlam Exp $ .include "../../mk/bsd.prefs.mk" @@ -9,5 +9,5 @@ MAKEFLAGS+= XEMACS_PREFIX=${XEMACS_PREFIX} .endif .if (${XEMACS_PREFIX} == ${X11BASE}) -USE_X11BASE= YES +.include "../../mk/x11.buildlink3.mk" .endif diff --git a/editors/xjed/Makefile b/editors/xjed/Makefile index b03a7eb1122..bed76696aac 100644 --- a/editors/xjed/Makefile +++ b/editors/xjed/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2004/12/03 15:14:56 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2005/06/01 18:02:46 jlam Exp $ # PKGNAME= xjed-0.99.16 .include "../jed/Makefile.common" @@ -6,7 +6,6 @@ COMMENT= Extensible folding editor with Emacs/WordStar/EDT emulations, X11 vers CONFLICTS= jed-[0-9]* -USE_X11= yes CONFIGURE_ARGS+= --with-x BUILD_TARGET= xjed @@ -22,4 +21,5 @@ PLIST_SRC+= ${.CURDIR}/PLIST.xjed CONFIGURE_ENV+= ac_cv_func_grantpt=no .endif +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile index f34fd3b3722..cf4f65eafc1 100644 --- a/editors/xvile/Makefile +++ b/editors/xvile/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2005/04/11 21:45:42 tv Exp $ +# $NetBSD: Makefile,v 1.44 2005/06/01 18:02:46 jlam Exp $ DISTNAME= vile-9.4 PKGNAME= xvile-9.4 @@ -12,7 +12,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://dickey.his.com/vile/vile.html COMMENT= VI Like Emacs, X11 version -- a fully "X aware" vi work-alike -USE_X11= # defined GNU_CONFIGURE= # defined CONFIGURE_ARGS+= --with-perl diff --git a/editors/xwpe/Makefile b/editors/xwpe/Makefile index 28c0fa91a5a..0913be44653 100644 --- a/editors/xwpe/Makefile +++ b/editors/xwpe/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/05/22 20:07:57 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2005/06/01 18:02:46 jlam Exp $ # DISTNAME= xwpe-1.5.29a @@ -13,9 +13,9 @@ COMMENT= Programming environment for UNIX systems GNU_CONFIGURE= yes USE_TOOLS+= gmake USE_NCURSES= # tigetstr() -USE_X11= yes BUILD_TARGET= # defined .include "../../devel/ncurses/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/yudit/Makefile b/editors/yudit/Makefile index 31ba2bd9be3..ff275505516 100644 --- a/editors/yudit/Makefile +++ b/editors/yudit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/05/22 20:07:57 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2005/06/01 18:02:46 jlam Exp $ # DISTNAME= yudit-2.7.6 @@ -12,10 +12,10 @@ COMMENT= Unicode Text Editor USE_TOOLS+= gmake USE_LANGUAGES= c c++ -USE_X11= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-x .include "../../graphics/freetype-lib/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/BasiliskII/Makefile b/emulators/BasiliskII/Makefile index 7e4c9fe69f8..18b46e4d1f8 100644 --- a/emulators/BasiliskII/Makefile +++ b/emulators/BasiliskII/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/05/22 20:07:57 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2005/06/01 18:02:46 jlam Exp $ DISTNAME= BasiliskII_src_14032003 PKGNAME= BasiliskII-1.0.20030314 @@ -16,13 +16,14 @@ WRKSRC= ${WRKDIR}/BasiliskII-1.0/src/Unix GNU_CONFIGURE= yes USE_TOOLS+= gmake USE_LANGUAGES= c c++ -USE_X11= yes CONFIGURE_ARGS+= --without-gtk \ --without-esd \ --disable-fbdev-dga \ --without-mon +.include "../../mk/x11.buildlink3.mk" + post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/BasiliskII ${INSTALL_DATA} ${WRKSRC}/../../README ${PREFIX}/share/doc/BasiliskII/ diff --git a/emulators/aranym/Makefile b/emulators/aranym/Makefile index e9a338d2182..2f3431d3ef8 100644 --- a/emulators/aranym/Makefile +++ b/emulators/aranym/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/05/22 20:07:57 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:46 jlam Exp $ # DISTNAME= aranym-0.8.9beta @@ -12,7 +12,6 @@ COMMENT= Atari Running on Any Machine USE_TOOLS+= gmake USE_LANGUAGES= c c++ -USE_X11= yes GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/${DISTNAME}/src/Unix USE_TOOLS+= gzip diff --git a/emulators/arcem/Makefile b/emulators/arcem/Makefile index d2ceb11d003..72e2f8a74b3 100644 --- a/emulators/arcem/Makefile +++ b/emulators/arcem/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/05/22 20:07:57 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:46 jlam Exp $ # DISTNAME= arcem-1.00-src @@ -24,11 +24,12 @@ HOMEPAGE= http://arcem.sourceforge.net/ COMMENT= Dave Gilbert's Acorn Archimedes emulator WRKSRC= ${WRKDIR}/arcem -USE_X11= # defined USE_TOOLS+= gmake MAKE_ENV+= SYSTEM=X +.include "../../mk/x11.buildlink3.mk" + post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/arcem ${INSTALL_DATA} ${WRKDIR}/linux.rom ${PREFIX}/share/arcem/ROM diff --git a/emulators/atari800/options.mk b/emulators/atari800/options.mk index 7a2d9ae3c16..17f99feade5 100644 --- a/emulators/atari800/options.mk +++ b/emulators/atari800/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2005/05/31 10:01:36 dillo Exp $ +# $NetBSD: options.mk,v 1.4 2005/06/01 18:02:46 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.atari800 PKG_SUPPORTED_OPTIONS= sdl x11 @@ -7,8 +7,8 @@ PKG_SUGGESTED_OPTIONS= sdl .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mx11) -USE_X11= yes CONFIGURE_ARGS+= --target=x11 +.include "../../mk/x11.buildlink3.mk" .endif .if !empty(PKG_OPTIONS:Msdl) diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile index 05992b1ee8c..e8efe94790f 100644 --- a/emulators/bochs/Makefile +++ b/emulators/bochs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2005/05/22 20:07:57 jlam Exp $ +# $NetBSD: Makefile,v 1.41 2005/06/01 18:02:46 jlam Exp $ DISTNAME= bochs-2.1.1 PKGREVISION= 1 @@ -50,7 +50,6 @@ CONFIGURE_ARGS+= --enable-daz CONFIGURE_ARGS+= --enable-sep .endif # !BOCHS_TINY CONFIGURE_ENV+= CXXFLAGS="-I${X11BASE}/include ${CXXFLAGS}" -USE_X11= yes MANCOMPRESSED= yes MAKE_ENV+= GZIP_CMD=${GZIP_CMD:Q} \ GUNZIP_CMD=${GUNZIP_CMD:Q} @@ -59,6 +58,8 @@ BOCHS_MAINDIR= ${PREFIX}/share/bochs BOCHS_BIOSDIR= ${BOCHS_MAINDIR}/bios BOCHS_FONTDIR= ${BOCHS_MAINDIR}/xfonts +.include "../../mk/x11.buildlink3.mk" + post-configure: ${MV} ${WRKSRC}/.bochsrc ${WRKSRC}/.bochsrc.BAK ${SED} -e 's@XXXPREFIXXXX@${PREFIX}@' \ diff --git a/emulators/darcnes/Makefile b/emulators/darcnes/Makefile index e3760548c0c..3338a4345ab 100644 --- a/emulators/darcnes/Makefile +++ b/emulators/darcnes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2003/09/17 07:15:32 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2005/06/01 18:02:46 jlam Exp $ PKGNAME= darcnes-20010401 PKGREVISION= 1 @@ -6,7 +6,6 @@ PKGREVISION= 1 MAINTAINER= wiz@NetBSD.org COMMENT= Multi-system emulator (NES, SMS, GG, PCE, and others) -USE_X11= yes MAKE_ENV+= TARGET=Linux_X do-install: @@ -15,4 +14,5 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/readme ${PREFIX}/share/doc/darcnes .include "Makefile.common" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/dega/Makefile b/emulators/dega/Makefile index 976d4c7d229..1f0d51e2758 100644 --- a/emulators/dega/Makefile +++ b/emulators/dega/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/05/22 20:07:57 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2005/06/01 18:02:46 jlam Exp $ # DISTNAME= dega-1.07 @@ -13,7 +13,6 @@ COMMENT= Sega Game Gear, Sega Mark III and Sega Master System emulator BUILD_DEPENDS= nasm>=0.98:../../devel/nasm USE_TOOLS+= gmake -USE_X11= yes # Uses i386 assembly code ONLY_FOR_PLATFORM= *-*-i386 diff --git a/emulators/dgen/Makefile b/emulators/dgen/Makefile index db39b764bae..02895381677 100644 --- a/emulators/dgen/Makefile +++ b/emulators/dgen/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/05/22 20:07:57 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2005/06/01 18:02:47 jlam Exp $ # DISTNAME= dgen-sdl-1.23 @@ -16,7 +16,6 @@ DEPENDS+= nasm-[0-9]*:../../devel/nasm USE_TOOLS+= gmake GNU_CONFIGURE= yes -USE_X11= yes CONFIGURE_ARGS+= --with-extra-opt diff --git a/emulators/fmsx/Makefile b/emulators/fmsx/Makefile index 7cb337935da..e39595906b0 100644 --- a/emulators/fmsx/Makefile +++ b/emulators/fmsx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/03/13 16:43:20 uebayasi Exp $ +# $NetBSD: Makefile,v 1.14 2005/06/01 18:02:47 jlam Exp $ DISTNAME= fMSX24.tar PKGNAME= fmsx-2.4 @@ -17,7 +17,6 @@ NO_BIN_ON_FTP= ${RESTRICTED} NO_SRC_ON_FTP= ${RESTRICTED} WRKSRC= ${WRKDIR}/MSX -USE_X11= yes .include "../../mk/bsd.prefs.mk" USE_SUN_AUDIO?= YES @@ -30,6 +29,8 @@ DEFS+= -DSUN_AUDIO MAKE_ENV= DEFS="${DEFS}" +.include "../../mk/x11.buildlink3.mk" + post-extract: @${RM} ${WRKSRC}/CMOS.ROM @${CHMOD} -R a+r ${WRKSRC} diff --git a/emulators/fuse-utils/Makefile b/emulators/fuse-utils/Makefile index b6b84e90c16..819866c50a2 100644 --- a/emulators/fuse-utils/Makefile +++ b/emulators/fuse-utils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/04/11 21:45:43 tv Exp $ +# $NetBSD: Makefile,v 1.9 2005/06/01 18:02:47 jlam Exp $ DISTNAME= fuse-utils-0.7.0 PKGREVISION= 1 @@ -9,7 +9,6 @@ MAINTAINER= adam@NetBSD.org HOMEPAGE= http://fuse-emulator.sourceforge.net/ COMMENT= ZX Spectrum Emulator utilities -USE_X11= yes GNU_CONFIGURE= yes LIBS+= -lgcrypt @@ -18,5 +17,6 @@ LIBS+= -lgpg-error .include "../../emulators/libspectrum/buildlink3.mk" .include "../../security/libgcrypt/buildlink3.mk" .include "../../security/libgpg-error/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/fuse/Makefile b/emulators/fuse/Makefile index 41bb1923a0a..85759142b24 100644 --- a/emulators/fuse/Makefile +++ b/emulators/fuse/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/04/11 21:45:43 tv Exp $ +# $NetBSD: Makefile,v 1.14 2005/06/01 18:02:47 jlam Exp $ DISTNAME= fuse-0.7.0 PKGREVISION= 1 @@ -10,7 +10,6 @@ HOMEPAGE= http://fuse-emulator.sourceforge.net/ COMMENT= ZX Spectrum Emulator USE_PERL5= build -USE_X11= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-gtk2 LIBS+= ${LIBOSSAUDIO} diff --git a/emulators/gcube/Makefile b/emulators/gcube/Makefile index 82e42b76c7d..43c5cf291b6 100644 --- a/emulators/gcube/Makefile +++ b/emulators/gcube/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/05/22 20:07:57 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:02:47 jlam Exp $ # DISTNAME= gcube-v0.2-src @@ -15,7 +15,6 @@ COMMENT= Opensource Nintendo GameCube(TM) emulator PKG_INSTALLATION_TYPES= overwrite pkgviews USE_TOOLS+= gmake -USE_X11= yes WRKSRC= ${WRKDIR} .include "../../mk/bsd.prefs.mk" diff --git a/emulators/generator/Makefile b/emulators/generator/Makefile index 57061d67dd7..70638d25999 100644 --- a/emulators/generator/Makefile +++ b/emulators/generator/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/04/15 19:04:20 kristerw Exp $ +# $NetBSD: Makefile,v 1.17 2005/06/01 18:02:47 jlam Exp $ # DISTNAME= generator-0.35 @@ -10,7 +10,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.squish.net/generator/ COMMENT= Sega Mega drive genesis emulator -USE_X11= yes GNU_CONFIGURE= yes .if (${MACHINE_ARCH} == "i386") diff --git a/emulators/gnuboy-sdl/Makefile b/emulators/gnuboy-sdl/Makefile index a3ec803f675..d0a4ad0de86 100644 --- a/emulators/gnuboy-sdl/Makefile +++ b/emulators/gnuboy-sdl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:43 tv Exp $ +# $NetBSD: Makefile,v 1.5 2005/06/01 18:02:47 jlam Exp $ DISTNAME= gnuboy-1.0.3 PKGNAME= ${DISTNAME:S/-/-sdl-/} @@ -11,7 +11,6 @@ HOMEPAGE= http://gnuboy.unix-fu.org/ COMMENT= SDL port of Gameboy emulator GNU_CONFIGURE= yes -USE_X11= yes CONFIGURE_ARGS+=--with-sdl .include "../../devel/SDL/buildlink3.mk" diff --git a/emulators/gnuboy/Makefile b/emulators/gnuboy/Makefile index c3123567a4a..529ab030ee8 100644 --- a/emulators/gnuboy/Makefile +++ b/emulators/gnuboy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/04/11 21:45:43 tv Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:02:47 jlam Exp $ DISTNAME= gnuboy-1.0.3 PKGREVISION= 1 @@ -10,7 +10,8 @@ HOMEPAGE= http://gnuboy.unix-fu.org/ COMMENT= Gameboy emulator GNU_CONFIGURE= yes -USE_X11= yes + +.include "../../mk/x11.buildlink3.mk" do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gnuboy diff --git a/emulators/gxemul/Makefile b/emulators/gxemul/Makefile index c7805c2babb..05ab2fdc6b9 100644 --- a/emulators/gxemul/Makefile +++ b/emulators/gxemul/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/05/31 11:21:41 dillo Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:02:47 jlam Exp $ # DISTNAME= gxemul-0.3.2 @@ -35,7 +35,6 @@ PKG_OPTIONS_LEGACY_OPTS+= X11:x11 .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mx11) -USE_X11= yes GLOBAL_LDFLAGS= -L${X11BASE}/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib SUBST_CLASSES= x11 SUBST_STAGE.x11= post-patch @@ -45,4 +44,5 @@ SUBST_SED.x11= -e "s|-L/usr/X11R6/lib|${GLOBAL_LDFLAGS}|g" \ SUBST_MESSAGE.x11= "Fixing X linking flags." .endif +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/hatari/Makefile b/emulators/hatari/Makefile index b97d134714e..7acd088c26f 100644 --- a/emulators/hatari/Makefile +++ b/emulators/hatari/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/05/22 20:07:58 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2005/06/01 18:02:47 jlam Exp $ DISTNAME= hatari-0.60 PKGREVISION= 1 @@ -10,7 +10,6 @@ HOMEPAGE= http://hatari.sourceforge.net/ COMMENT= Atari ST emulator USE_TOOLS+= gmake -USE_X11= YES GNU_CONFIGURE= YES post-install: diff --git a/emulators/minivmac/Makefile b/emulators/minivmac/Makefile index bfcbafea6d0..dd2e997d03a 100644 --- a/emulators/minivmac/Makefile +++ b/emulators/minivmac/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/04/11 21:45:44 tv Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 18:02:47 jlam Exp $ DISTNAME= minivmac-0.1.7.src PKGNAME= minivmac-0.1.7 @@ -12,12 +12,13 @@ HOMEPAGE= http://minivmac.sourceforge.net/ COMMENT= Miniature Macintosh emulator WRKSRC= ${WRKDIR}/minivmac -USE_X11= YES SCRIPTS_ENV+= CC="${CC}" DOCDIR= ${PREFIX}/share/doc/html/minivmac +.include "../../mk/x11.buildlink3.mk" + do-build: cd ${WRKSRC}/tool/bash; ${SETENV} ${SCRIPTS_ENV} ${SH} build diff --git a/emulators/openmsx/Makefile b/emulators/openmsx/Makefile index 9e556e4b06d..31222fc483d 100644 --- a/emulators/openmsx/Makefile +++ b/emulators/openmsx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/05/22 20:07:58 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2005/06/01 18:02:47 jlam Exp $ # DISTNAME= openmsx-0.5.0 @@ -12,7 +12,6 @@ COMMENT= MSX emulator that aims for perfection USE_TOOLS+= gmake USE_LANGUAGES= c c++ -USE_X11= yes HAS_CONFIGURE= yes MAKEFILE= GNUmakefile diff --git a/emulators/osf1_lib/Makefile b/emulators/osf1_lib/Makefile index c3925237d28..49cb5965c2f 100644 --- a/emulators/osf1_lib/Makefile +++ b/emulators/osf1_lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/05/25 12:11:23 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2005/06/01 18:02:47 jlam Exp $ DISTNAME= netscape-4.7-3.alpha PKGNAME= osf1_lib-1.1 @@ -34,7 +34,7 @@ RPMARGS= -i usr/lib -i usr/bin ${DISTDIR}/${DISTFILES} CHECK_SHLIBS= no SHLIB_HANDLING= no -USE_X11= yes +.include "../../mk/x11.buildlink3.mk" do-install: ${RM} -f ${WRKDIR}/PLIST_DYNAMIC diff --git a/emulators/palmosemulator/Makefile b/emulators/palmosemulator/Makefile index 0c67878c750..1d859df1ede 100644 --- a/emulators/palmosemulator/Makefile +++ b/emulators/palmosemulator/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/05/22 20:07:58 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2005/06/01 18:02:47 jlam Exp $ # DISTNAME= emulator_src_${POSE_VERSION} @@ -33,7 +33,6 @@ CONFIGURE_DIRS= ${POSE_BUILD_DIR} BUILD_DIRS= ${POSE_BUILD_DIR} USE_PERL5= build -USE_X11= YES USE_TOOLS+= gmake GNU_CONFIGURE= YES diff --git a/emulators/pcemu/Makefile b/emulators/pcemu/Makefile index d93c983286f..3c4556bb419 100644 --- a/emulators/pcemu/Makefile +++ b/emulators/pcemu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/03/24 21:12:54 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2005/06/01 18:02:47 jlam Exp $ DISTNAME= pcemu1.01alpha PKGNAME= pcemu-1.01a @@ -10,9 +10,10 @@ MASTER_SITES= ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/ \ MAINTAINER= eric@fox.phoenix.az.us COMMENT= 8086 PC emulator, by David Hedley -USE_X11= yes MAKE_ENV+= FILESDIR=${FILESDIR} +.include "../../mk/x11.buildlink3.mk" + do-configure: cd ${WRKSRC}; \ ${MKDIR} ${WRKSRC}/bootstrap; \ diff --git a/emulators/pearpc/Makefile b/emulators/pearpc/Makefile index c35ad95830b..7e0da592531 100644 --- a/emulators/pearpc/Makefile +++ b/emulators/pearpc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:44 tv Exp $ +# $NetBSD: Makefile,v 1.5 2005/06/01 18:02:47 jlam Exp $ # DISTNAME= pearpc-0.3.1 @@ -14,7 +14,6 @@ COMMENT= PowerPC emulator GNU_CONFIGURE= yes USE_LANGUAGES+= c++ USE_PKGINSTALL= yes -USE_X11= yes EGDIR= ${PREFIX}/share/examples/${PKGBASE} CONF_FILES= ${EGDIR}/ppccfg.example ${PKG_SYSCONFDIR}/ppccfg.conf @@ -59,4 +58,5 @@ CONFIGURE_ARGS+= --enable-ui=sdl .endif .include "../../mk/pthread.buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile index 5c6f3dd2a34..7b939095c90 100644 --- a/emulators/qemu/Makefile +++ b/emulators/qemu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/05/22 20:07:58 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2005/06/01 18:02:47 jlam Exp $ # DISTNAME= qemu-0.7.0 @@ -13,7 +13,6 @@ CONFLICTS+= qemu-bin-* NOT_FOR_PLATFORM= NetBSD-1.[0-6]*-* USE_TOOLS+= gmake -USE_X11= yes HAS_CONFIGURE= yes GCC_REQD+= 3.0 diff --git a/emulators/raine/Makefile b/emulators/raine/Makefile index 73e899d04f4..1f9c18d5359 100644 --- a/emulators/raine/Makefile +++ b/emulators/raine/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/05/22 20:07:58 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2005/06/01 18:02:48 jlam Exp $ # DISTNAME= raines-0.40.2 @@ -16,7 +16,6 @@ BUILD_DEPENDS+= nasm-[0-9]*:../../devel/nasm WRKSRC= ${WRKDIR}/raine USE_TOOLS+= gmake -USE_X11= yes MAKEFILE= makefile MAKE_ENV+= OSTYPE=linux USE_PERL5= run @@ -38,4 +37,5 @@ pre-install: .include "../../devel/allegro/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/snes9x/Makefile b/emulators/snes9x/Makefile index 2b2e1749282..d9356155faf 100644 --- a/emulators/snes9x/Makefile +++ b/emulators/snes9x/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/05/22 20:07:58 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2005/06/01 18:02:48 jlam Exp $ DISTNAME= s9xs139 PKGNAME= snes9x-1.39 @@ -15,7 +15,6 @@ BUILD_DEPENDS+= nasm>=0.98:../../devel/nasm WRKSRC= ${WRKDIR}/release USE_TOOLS+= gmake -USE_X11= yes PTHREAD_OPTS= require do-install: @@ -62,4 +61,5 @@ MAKE_ENV+= USBHID_H=1 .endif .include "../../mk/pthread.buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/tuxnes/Makefile b/emulators/tuxnes/Makefile index 4e969c6551c..27331a32e3b 100644 --- a/emulators/tuxnes/Makefile +++ b/emulators/tuxnes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/05/22 20:07:58 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2005/06/01 18:02:48 jlam Exp $ # DISTNAME= tuxnes-0.75 @@ -13,7 +13,6 @@ COMMENT= NES emulator ONLY_FOR_PLATFORM= *-*-i386 USE_TOOLS+= gmake -USE_X11= yes GNU_CONFIGURE= yes SUBST_CLASSES+= dsp diff --git a/emulators/twin/Makefile b/emulators/twin/Makefile index dfc1823ef09..9435be743db 100644 --- a/emulators/twin/Makefile +++ b/emulators/twin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/05/22 20:07:58 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2005/06/01 18:02:48 jlam Exp $ # DISTNAME= twin-src-3.1.14 @@ -14,11 +14,12 @@ COMMENT= Cross-platform implementation of the win32 api WRKSRC= ${WRKDIR}/twin GNU_CONFIGURE= yes USE_TOOLS+= gmake -USE_X11= yes BUILD_TARGET= depend world AUTOCONF_REQD= 2.13 CONFIGURE_ARGS= --enable-debugger +.include "../../mk/x11.buildlink3.mk" + pre-configure: cd ${WRKSRC} && ${AUTORECONF} --force diff --git a/emulators/uae/Makefile b/emulators/uae/Makefile index bd1c8403435..b8c3f2572fa 100644 --- a/emulators/uae/Makefile +++ b/emulators/uae/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2005/05/22 20:07:58 jlam Exp $ +# $NetBSD: Makefile,v 1.36 2005/06/01 18:02:48 jlam Exp $ DISTNAME= uae-0.8.22 PKGREVISION= 2 @@ -13,7 +13,6 @@ COMMENT= The UAE Amiga Emulator DEPENDS= unzip>=5.40:../../archivers/unzip USE_TOOLS+= gmake -USE_X11= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-dga --enable-vidmode @@ -26,6 +25,7 @@ CONFIGURE_ARGS+= --disable-ui .endif .include "../../mk/compiler.mk" +.include "../../mk/x11.buildlink3.mk" .if !empty(CC_VERSION:Mgcc-3.*) post-configure: diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile index 69f4c68cb5d..5b3f60142e1 100644 --- a/emulators/vice/Makefile +++ b/emulators/vice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.56 2005/05/31 10:01:36 dillo Exp $ +# $NetBSD: Makefile,v 1.57 2005/06/01 18:02:48 jlam Exp $ # DISTNAME= vice-1.16 @@ -21,7 +21,6 @@ NO_SRC_ON_FTP= ${RESTRICTED} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} USE_PKGLOCALEDIR= YES -USE_X11= YES USE_TOOLS+= gmake USE_LANGUAGES+= c c++ GNU_CONFIGURE= YES diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index e09f7a2a15b..830d11a7480 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.86 2005/05/31 21:42:04 wiz Exp $ +# $NetBSD: Makefile,v 1.87 2005/06/01 18:02:48 jlam Exp $ DISTNAME= Wine-20050524 PKGNAME= ${DISTNAME:S/W/w/} @@ -21,7 +21,6 @@ ONLY_FOR_PLATFORM+= FreeBSD*-i386 Linux*-i386 SunOS*-i386 Darwin*-i386 WRKSRC= ${WRKDIR}/${DISTNAME:S/W/w/} USE_TOOLS+= bison gmake USE_LIBTOOL= yes -USE_X11= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --without-curses --disable-trace #--disable-debug CONFIGURE_ENV+= ac_cv_path_ARTSCCONFIG=${TRUE} @@ -57,4 +56,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/emulators/xcopilot/Makefile b/emulators/xcopilot/Makefile index 045effa4188..735a3620afa 100644 --- a/emulators/xcopilot/Makefile +++ b/emulators/xcopilot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/04/11 21:45:46 tv Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/01 18:02:48 jlam Exp $ # DISTNAME= xcopilot-0.6.6 @@ -12,7 +12,6 @@ COMMENT= PalmPilot emulator for X NOT_FOR_PLATFORM= *-*-alpha # suspected LP64 bugs GNU_CONFIGURE= YES -USE_X11= YES post-extract: ${RM} -f ${WRKSRC}/mc68k/custom.c diff --git a/emulators/xm7/Makefile b/emulators/xm7/Makefile index 3ec511aa20c..49d094ebdd5 100644 --- a/emulators/xm7/Makefile +++ b/emulators/xm7/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/04/05 10:16:30 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/01 18:02:48 jlam Exp $ # DISTNAME= xm71010s @@ -24,7 +24,8 @@ EXTRACT_CMD= lha xqt ${DOWNLOADED_DISTFILE} WRKSRC= ${WRKDIR}/vm NO_CONFIGURE= yes MAKEFILE= makefile.x11 -USE_X11= yes + +.include "../../mk/x11.buildlink3.mk" post-extract: @cd ${WRKDIR}; ${MV} linux/* vm diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile index 2325007e91b..81775bd9edc 100644 --- a/emulators/xmame/Makefile +++ b/emulators/xmame/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.129 2005/05/22 20:07:59 jlam Exp $ +# $NetBSD: Makefile,v 1.130 2005/06/01 18:02:48 jlam Exp $ # DISTNAME= xmame-0.96 @@ -15,7 +15,6 @@ NO_SRC_ON_CDROM= ${RESTRICTED} NO_BIN_ON_CDROM= ${RESTRICTED} USE_PKGINSTALL= YES -USE_X11= YES USE_TOOLS+= gmake MAKEFILE= makefile.unix TARGET= ${PKGBASE} @@ -115,4 +114,5 @@ do-install: .include "../../devel/zlib/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/xmess/Makefile b/emulators/xmess/Makefile index f8ebce328c6..1b60623371c 100644 --- a/emulators/xmess/Makefile +++ b/emulators/xmess/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.69 2005/05/22 20:07:59 jlam Exp $ +# $NetBSD: Makefile,v 1.70 2005/06/01 18:02:48 jlam Exp $ # DISTNAME= xmame-0.96 @@ -16,7 +16,6 @@ NO_SRC_ON_CDROM= ${RESTRICTED} NO_BIN_ON_CDROM= ${RESTRICTED} USE_PKGINSTALL= YES -USE_X11= YES USE_TOOLS+= gmake MAKEFILE= makefile.unix TARGET= ${PKGBASE} @@ -110,4 +109,5 @@ do-install: .include "../../devel/zlib/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/xtrs/Makefile b/emulators/xtrs/Makefile index fd42a7d78c3..9df68ab20b4 100644 --- a/emulators/xtrs/Makefile +++ b/emulators/xtrs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:46 tv Exp $ +# $NetBSD: Makefile,v 1.5 2005/06/01 18:02:48 jlam Exp $ # DISTNAME= xtrs-4.9 @@ -10,7 +10,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= ${MASTER_SITES} COMMENT= TRS-80 Model I/III/4 Emulator for Unix -USE_X11= yes BUILD_TARGET= default @@ -31,4 +30,5 @@ post-install: .include "../../devel/ncurses/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/zsnes/Makefile b/emulators/zsnes/Makefile index 033ac4f1720..65bf35fe037 100644 --- a/emulators/zsnes/Makefile +++ b/emulators/zsnes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2005/05/22 20:07:59 jlam Exp $ +# $NetBSD: Makefile,v 1.28 2005/06/01 18:02:48 jlam Exp $ # DISTNAME= zsnes142src @@ -20,7 +20,6 @@ BUILD_TARGET= zsnes WRKSRC= ${WRKDIR}/zsnes_1_42/src GNU_CONFIGURE= yes USE_TOOLS+= gmake -USE_X11= yes .include "../../devel/SDL/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" diff --git a/finance/gnofin/Makefile b/finance/gnofin/Makefile index b2fb37aa832..73351248e8b 100644 --- a/finance/gnofin/Makefile +++ b/finance/gnofin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/05/22 20:07:59 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2005/06/01 18:02:48 jlam Exp $ # DISTNAME= gnofin-0.8.4 @@ -13,7 +13,6 @@ COMMENT= Personal checking/savings account management program BUILD_USES_MSGFMT= yes USE_PKGLOCALEDIR= yes -USE_X11= yes GNU_CONFIGURE= yes USE_TOOLS+= gmake USE_LIBTOOL= yes diff --git a/finance/gnucash-docs/Makefile b/finance/gnucash-docs/Makefile index 8eba2ba22a3..91e1aaf1ed2 100644 --- a/finance/gnucash-docs/Makefile +++ b/finance/gnucash-docs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/05/22 20:07:59 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/06/01 18:02:48 jlam Exp $ DISTNAME= gnucash-docs-1.8.5 CATEGORIES= finance @@ -16,7 +16,6 @@ BUILDLINK_DEPMETHOD.libxslt= build USE_DIRS+= gnome1-1.5 USE_TOOLS+= gmake -USE_X11= YES USE_LIBTOOL= YES USE_PKGLOCALEDIR= YES @@ -26,5 +25,6 @@ CONFIGURE_ARGS+= --with-perl-includes=${PERL5_ARCHLIB} .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/libxslt/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bdb.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile index 3231f3b121b..c2bfee507a0 100644 --- a/finance/gnucash/Makefile +++ b/finance/gnucash/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.85 2005/05/22 20:07:59 jlam Exp $ +# $NetBSD: Makefile,v 1.86 2005/06/01 18:02:48 jlam Exp $ DISTNAME= gnucash-1.8.11 PKGREVISION= 2 @@ -18,7 +18,6 @@ BUILD_DEPENDS+= bison>=1.28:../../devel/bison USE_DIRS+= gnome1-1.5 USE_TOOLS+= gmake -USE_X11= YES USE_LIBTOOL= YES USE_PKGLOCALEDIR= YES diff --git a/fonts/XFree86-fontserver/Makefile b/fonts/XFree86-fontserver/Makefile index 68990b0a9ff..f0f1693a30e 100644 --- a/fonts/XFree86-fontserver/Makefile +++ b/fonts/XFree86-fontserver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/04/11 21:45:47 tv Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 18:02:48 jlam Exp $ DISTNAME= ${DISTFILES} PKGNAME= XFree86-fontserver-${XF_VER} @@ -12,7 +12,6 @@ MAINTAINER= xtraeme@NetBSD.org HOMEPAGE= http://www.xfree86.org/ COMMENT= XFree86 font server -USE_X11= yes DISTINFO_FILE= ${.CURDIR}/../../x11/XFree86-libs/distinfo PATCHDIR= ${.CURDIR}/../../x11/XFree86-libs/patches @@ -22,4 +21,5 @@ XINSTALL_MAN_DIRS= programs/xfs .include "../../graphics/freetype2/buildlink3.mk" .include "../../meta-pkgs/XFree86/Makefile.common" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/fonts/Xft2/Makefile b/fonts/Xft2/Makefile index 652ab30c755..892ee8f3b7e 100644 --- a/fonts/Xft2/Makefile +++ b/fonts/Xft2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2005/05/22 22:06:28 jlam Exp $ +# $NetBSD: Makefile,v 1.37 2005/06/01 18:02:48 jlam Exp $ DISTNAME= libXft-2.1.6 PKGNAME= Xft2-2.1.6 @@ -15,7 +15,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews GNU_CONFIGURE= YES USE_LIBTOOL= YES -USE_X11= YES USE_TOOLS+= gmake PKGCONFIG_OVERRIDE= xft.pc.in diff --git a/fonts/Xft2/builtin-imake.mk b/fonts/Xft2/builtin-imake.mk new file mode 100644 index 00000000000..173c5fbd0a4 --- /dev/null +++ b/fonts/Xft2/builtin-imake.mk @@ -0,0 +1,12 @@ +XCOMM $NetBSD: builtin-imake.mk,v 1.1 2005/06/01 18:02:48 jlam Exp $ + +/* + * Check the value of BuildXftLibrary for the presence of + * Xft2 in the X11 distribution. + */ +builtin-test: +#if BuildXftLibrary + @echo yes +#else + @echo no +#endif diff --git a/fonts/Xft2/builtin.mk b/fonts/Xft2/builtin.mk index a3054887996..d60ecbb5c12 100644 --- a/fonts/Xft2/builtin.mk +++ b/fonts/Xft2/builtin.mk @@ -1,130 +1,110 @@ -# $NetBSD: builtin.mk,v 1.6 2005/03/01 18:56:43 xtraeme Exp $ +# $NetBSD: builtin.mk,v 1.7 2005/06/01 18:02:48 jlam Exp $ -_X11_TMPL= ${X11BASE}/lib/X11/config/X11.tmpl +BUILTIN_PKG:= Xft2 +BUILTIN_FIND_FILES_VAR:= H_XFT2 +BUILTIN_FIND_FILES.H_XFT2= ${X11BASE}/include/X11/Xft.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.Xft2) IS_BUILTIN.Xft2= no -. if exists(${_X11_TMPL}) +. if exists(${H_XFT2}) +PKGSRC_USE_TOOLS+= imake # XXX +IMAKE?= ${X11BASE}/bin/imake # XXX +. if defined(IMAKE) && exists(${IMAKE}) IS_BUILTIN.Xft2!= \ - if ${GREP} -q BuildXftLibrary ${_X11_TMPL}; then \ - ${ECHO} "yes"; \ - else \ - ${ECHO} "no"; \ - fi -. if !empty(IS_BUILTIN.Xft2:M[yY][eE][sS]) -# -# Create an appropriate package name for the built-in Xft2 distributed -# with the system. This package name can be used to check against -# BUILDLINK_DEPENDS.<pkg> to see if we need to install the pkgsrc version -# or if the built-in one is sufficient. -# -# Xft2 doesn't provide a method of discovering the version number of -# the software. Match up Xft2 versions with XFree86 versions for an -# approximate determination of the Xft2 version. -# -_XFT2_VERSIONS= 2.1.2 2.1.1 2.1.0 -_XFT2_2.1.0= 4.2.99.* 4.3 4.3.[0-9] 4.3.[0-9].* 4.3.[1-8][0-9]* 4.3.9[0-8]* -_XFT2_2.1.0+= 4.3.99.* 4.[4-9]* 4.[1-9][0-9]* -. if !defined(XF86_VERSION) -XF86_VERSION= 3.3 -. if exists(${X11BASE}/lib/X11/config/xorgversion.def) -_X11_CONFIG_VERSION_DEF= ${X11BASE}/lib/X11/config/xorgversion.def -. elif exists(${X11BASE}/lib/X11/config/xorg.cf) -_X11_CONFIG_VERSION_DEF= ${X11BASE}/lib/X11/config/xorg.cf -_XORG_MAJOR!= \ - ${AWK} '/\#define[ ]*XORG_VERSION_MAJOR/ { print $$3 }' \ - ${_X11_CONFIG_VERSION_DEF} -_XORG_MINOR!= \ - ${AWK} '/\#define[ ]*XORG_VERSION_MINOR/ { print $$3 }' \ - ${_X11_CONFIG_VERSION_DEF} -_XORG_PATCH!= \ - ${AWK} '/\#define[ ]*XORG_VERSION_PATCH/ { print $$3 }' \ - ${_X11_CONFIG_VERSION_DEF} -_XORG_SNAP!= \ - ${AWK} '/\#define[ ]*XORG_VERSION_SNAP/ { print $$3 }' \ - ${_X11_CONFIG_VERSION_DEF} -_XORG_TEENY= ${_XORG_PATCH}.${_XORG_SNAP} -. if !empty(_XORG_TEENY:M0.0) -XF86_VERSION= 4.4 -. else -XF86_VERSION= 4.4.${_XORG_TEENY} -. endif -. elif exists(${X11BASE}/lib/X11/config/version.def) -_X11_CONFIG_VERSION_DEF= ${X11BASE}/lib/X11/config/version.def -_XF86_MAJOR!= \ - ${AWK} '/\#define[ ]*XF86_VERSION_MAJOR/ { print $$3 }' \ - ${_X11_CONFIG_VERSION_DEF} -_XF86_MINOR!= \ - ${AWK} '/\#define[ ]*XF86_VERSION_MINOR/ { print $$3 }' \ - ${_X11_CONFIG_VERSION_DEF} -_XF86_PATCH!= \ - ${AWK} '/\#define[ ]*XF86_VERSION_PATCH/ { print $$3 }' \ - ${_X11_CONFIG_VERSION_DEF} -_XF86_SNAP!= \ - ${AWK} '/\#define[ ]*XF86_VERSION_SNAP/ { print $$3 }' \ - ${_X11_CONFIG_VERSION_DEF} -_XF86_TEENY= ${_XF86_PATCH}.${_XF86_SNAP} -. if !empty(_XF86_TEENY:M0.0) -XF86_VERSION= ${_XF86_MAJOR}.${_XF86_MINOR} -. else -XF86_VERSION= ${_XF86_MAJOR}.${_XF86_MINOR}.${_XF86_TEENY} -. endif -. endif -. endif # defined(XF86_VERSION) -BUILDLINK_VARS+= XF86_VERSION -. for _xrender_version_ in ${_XFT2_VERSIONS} -. for _pattern_ in ${_XFT2_${_xrender_version_}} -. if !empty(XF86_VERSION:M${_pattern_}) -_XFT2_VERSION?= ${_xrender_version_} -. endif -. endfor -. endfor -_XFT2_VERSION?= 0.0 -BUILTIN_PKG.Xft2= Xft2-${_XFT2_VERSION} -BUILDLINK_VARS+= BUILTIN_PKG.Xft2 + ${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config \ + -f ${BUILDLINK_PKGSRCDIR.Xft2}/builtin-imake.mk \ + -s - | \ + ${MAKE} -f - builtin-test . endif . endif -BUILDLINK_VARS+= IS_BUILTIN.Xft2 -.endif # IS_BUILTIN.Xft2 +.endif +MAKEVARS+= IS_BUILTIN.Xft2 -.if defined(USE_BUILTIN.fontconfig) && !empty(USE_BUILTIN.fontconfig:M[nN][oO]) -USE_BUILTIN.Xft2= no +### +### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to +### a package name to represent the built-in package. +### +.if !defined(BUILTIN_PKG.Xft2) && \ + !empty(IS_BUILTIN.Xft2:M[yY][eE][sS]) && \ + exists(${H_XFT2}) +# +# Extract the version number from the header file, but if it's not +# there, then pretend it's from version 2.0. +# +BUILTIN_VERSION.Xft2!= \ + ${AWK} 'BEGIN { M = 2; m = ".0"; r = "" } \ + /\#define[ ]*XFT_MAJOR/ { M = $$3 } \ + /\#define[ ]*XFT_MINOR/ { m = "."$$3 } \ + /\#define[ ]*XFT_REVISION/ { r = "."$$3 } \ + END { printf "%s%s%s\n", M, m, r }' \ + ${H_XFT2} +BUILTIN_PKG.Xft2= Xft2-${BUILTIN_VERSION.Xft2} .endif +MAKEVARS+= BUILTIN_PKG.Xft2 + +### +### Determine whether we should use the built-in implementation if it +### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no"). +### +# +# These are dependencies of Xft2. If we need to use the pkgsrc +# versions of any of these, then also use the pkgsrc version of +# Xft2. +# .if defined(USE_BUILTIN.Xrender) && !empty(USE_BUILTIN.Xrender:M[nN][oO]) USE_BUILTIN.Xft2= no .endif +.if defined(USE_BUILTIN.fontconfig) && !empty(USE_BUILTIN.fontconfig:M[nN][oO]) +USE_BUILTIN.Xft2= no +.endif .if !defined(USE_BUILTIN.Xft2) -USE_BUILTIN.Xft2?= ${IS_BUILTIN.Xft2} - -. if defined(BUILTIN_PKG.Xft2) +. if ${PREFER.Xft2} == "pkgsrc" +USE_BUILTIN.Xft2= no +. else +USE_BUILTIN.Xft2= ${IS_BUILTIN.Xft2} +. if defined(BUILTIN_PKG.Xft2) && \ + !empty(IS_BUILTIN.Xft2:M[yY][eE][sS]) USE_BUILTIN.Xft2= yes -. for _depend_ in ${BUILDLINK_DEPENDS.Xft2} -. if !empty(USE_BUILTIN.Xft2:M[yY][eE][sS]) -USE_BUILTIN.Xft2!= \ - if ${PKG_ADMIN} pmatch '${_depend_}' ${BUILTIN_PKG.Xft2}; then \ - ${ECHO} "yes"; \ +. for _dep_ in ${BUILDLINK_DEPENDS.Xft2} +. if !empty(USE_BUILTIN.Xft2:M[yY][eE][sS]) +USE_BUILTIN.Xft2!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.Xft2:Q}; then \ + ${ECHO} yes; \ else \ - ${ECHO} "no"; \ + ${ECHO} no; \ fi -. endif -. endfor -. endif -.endif # USE_BUILTIN.Xft2 +. endif +. endfor +. endif +. endif # PREFER.Xft2 +.endif +MAKEVARS+= USE_BUILTIN.Xft2 +### +### The section below only applies if we are not including this file +### solely to determine whether a built-in implementation exists. +### CHECK_BUILTIN.Xft2?= no .if !empty(CHECK_BUILTIN.Xft2:M[nN][oO]) -.if !empty(USE_BUILTIN.Xft2:M[nN][oO]) -BUILDLINK_DEPENDS.Xft2+= Xft2>=2.1nb1 -.endif +. if !empty(USE_BUILTIN.Xft2:M[nN][oO]) +BUILDLINK_DEPENDS.Xft2+= Xft2>=2.1nb2 +. endif -.if !empty(USE_BUILTIN.Xft2:M[yY][eE][sS]) +. if !empty(USE_BUILTIN.Xft2:M[yY][eE][sS]) BUILDLINK_PREFIX.Xft2= ${X11BASE} -BUILDLINK_FILES.Xft2+= lib/pkgconfig/xft.pc +BUILDLINK_FILES.Xft2+= lib/pkgconfig/Xft2.pc USE_BUILTIN.Xrender= yes USE_BUILTIN.fontconfig= yes -.endif +. endif .endif # CHECK_BUILTIN.Xft2 diff --git a/fonts/fontconfig/builtin-imake.mk b/fonts/fontconfig/builtin-imake.mk new file mode 100644 index 00000000000..0698c062e62 --- /dev/null +++ b/fonts/fontconfig/builtin-imake.mk @@ -0,0 +1,12 @@ +XCOMM $NetBSD: builtin-imake.mk,v 1.1 2005/06/01 18:02:48 jlam Exp $ + +/* + * Check the value of BuildFontconfigLibrary for the presence of + * fontconfig in the X11 distribution. + */ +builtin-test: +#if BuildFontconfigLibrary + @echo yes +#else + @echo no +#endif diff --git a/fonts/fontconfig/builtin.mk b/fonts/fontconfig/builtin.mk index b8184f41ea8..150f0d5c698 100644 --- a/fonts/fontconfig/builtin.mk +++ b/fonts/fontconfig/builtin.mk @@ -1,42 +1,59 @@ -# $NetBSD: builtin.mk,v 1.2 2004/03/29 05:43:30 jlam Exp $ +# $NetBSD: builtin.mk,v 1.3 2005/06/01 18:02:48 jlam Exp $ -_FONTCONFIG_FONTCONFIG_H= ${X11BASE}/include/fontconfig/fontconfig.h -_X11_TMPL= ${X11BASE}/lib/X11/config/X11.tmpl +BUILTIN_PKG:= fontconfig +BUILTIN_FIND_FILES_VAR:= H_FONTCONFIG +BUILTIN_FIND_FILES.H_FONTCONFIG= \ + ${X11BASE}/include/fontconfig/fontconfig.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.fontconfig) IS_BUILTIN.fontconfig= no -. if exists(${_FONTCONFIG_FONTCONFIG_H}) && exists(${_X11_TMPL}) +. if exists(${H_FONTCONFIG}) +PKGSRC_USE_TOOLS+= imake # XXX +IMAKE?= ${X11BASE}/bin/imake # XXX +. if defined(IMAKE) && exists(${IMAKE}) IS_BUILTIN.fontconfig!= \ - if ${GREP} -q BuildFontconfigLibrary ${_X11_TMPL}; then \ - ${ECHO} "yes"; \ - else \ - ${ECHO} "no"; \ - fi -. if !empty(IS_BUILTIN.fontconfig:M[yY][eE][sS]) -# -# Create an appropriate package name for the built-in fontconfig distributed -# with the system. This package name can be used to check against -# BUILDLINK_DEPENDS.<pkg> to see if we need to install the pkgsrc version -# or if the built-in one is sufficient. -# -_FONTCONFIG_MAJOR!= \ - ${AWK} '/\#define[ ]*FC_MAJOR/ { print $$3 }' \ - ${_FONTCONFIG_FONTCONFIG_H} -_FONTCONFIG_MINOR!= \ - ${AWK} '/\#define[ ]*FC_MINOR/ { print $$3 }' \ - ${_FONTCONFIG_FONTCONFIG_H} -_FONTCONFIG_REVISION!= \ - ${AWK} '/\#define[ ]*FC_REVISION/ { print $$3 }' \ - ${_FONTCONFIG_FONTCONFIG_H} -_FONTCONFIG_VERSION= \ - ${_FONTCONFIG_MAJOR}.${_FONTCONFIG_MINOR}.${_FONTCONFIG_REVISION} -BUILTIN_PKG.fontconfig= fontconfig-${_FONTCONFIG_VERSION} -BUILDLINK_VARS+= BUILTIN_PKG.fontconfig + ${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config \ + -f ${BUILDLINK_PKGSRCDIR.fontconfig}/builtin-imake.mk \ + -s - | \ + ${MAKE} -f - builtin-test . endif . endif -BUILDLINK_VARS+= IS_BUILTIN.fontconfig -.endif # IS_BUILTIN.fontconfig +.endif +MAKEVARS+= IS_BUILTIN.fontconfig +### +### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to +### a package name to represent the built-in package. +### +.if !defined(BUILTIN_PKG.fontconfig) && \ + !empty(IS_BUILTIN.fontconfig:M[yY][eE][sS]) && \ + exists(${H_FONTCONFIG}) +BUILTIN_VERSION.fontconfig!= \ + ${AWK} '/\#define[ ]*FC_MAJOR/ { M = $$3 } \ + /\#define[ ]*FC_MINOR/ { m = "."$$3 } \ + /\#define[ ]*FC_REVISION/ { r = "."$$3 } \ + END { printf "%s%s%s\n", M, m, r }' \ + ${H_FONTCONFIG} +BUILTIN_PKG.fontconfig= fontconfig-${BUILTIN_VERSION.fontconfig} +.endif +MAKEVARS+= BUILTIN_PKG.fontconfig + +### +### Determine whether we should use the built-in implementation if it +### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no"). +### +# +# These are dependencies of fontconfig. If we need to use the pkgsrc +# versions of any of these, then also use the pkgsrc version of +# fontconfig. +# .if defined(USE_BUILTIN.zlib) && !empty(USE_BUILTIN.zlib:M[nN][oO]) USE_BUILTIN.fontconfig= no .endif @@ -48,38 +65,47 @@ USE_BUILTIN.fontconfig= no .endif .if !defined(USE_BUILTIN.fontconfig) -USE_BUILTIN.fontconfig?= ${IS_BUILTIN.fontconfig} - -. if defined(BUILTIN_PKG.fontconfig) -USE_BUILTIN.fontconfig= yes -. for _depend_ in ${BUILDLINK_DEPENDS.fontconfig} -. if !empty(USE_BUILTIN.fontconfig:M[yY][eE][sS]) -USE_BUILTIN.fontconfig!= \ - if ${PKG_ADMIN} pmatch '${_depend_}' ${BUILTIN_PKG.fontconfig}; then \ - ${ECHO} "yes"; \ +. if ${PREFER.fontconfig} == "pkgsrc" +USE_BUILTIN.fontconfig= no +. else +USE_BUILTIN.fontconfig= ${IS_BUILTIN.fontconfig} +. if defined(BUILTIN_PKG.fontconfig) && \ + !empty(IS_BUILTIN.fontconfig:M[yY][eE][sS]) +USE_BUILTIN.fontconfig= yes +. for _dep_ in ${BUILDLINK_DEPENDS.fontconfig} +. if !empty(USE_BUILTIN.fontconfig:M[yY][eE][sS]) +USE_BUILTIN.fontconfig!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.fontconfig:Q}; then \ + ${ECHO} yes; \ else \ - ${ECHO} "no"; \ + ${ECHO} no; \ fi -. endif -. endfor -. endif -.endif # USE_BUILTIN.fontconfig +. endif +. endfor +. endif +. endif # PREFER.fontconfig +.endif +MAKEVARS+= USE_BUILTIN.fontconfig +### +### The section below only applies if we are not including this file +### solely to determine whether a built-in implementation exists. +### CHECK_BUILTIN.fontconfig?= no .if !empty(CHECK_BUILTIN.fontconfig:M[nN][oO]) -.if !empty(USE_BUILTIN.fontconfig:M[nN][oO]) +. if !empty(USE_BUILTIN.fontconfig:M[nN][oO]) BUILDLINK_DEPENDS.fontconfig+= fontconfig>=2.1nb2 BUILDLINK_DEPENDS.freetype2+= freetype2>=2.1.3 -.endif +. endif -.if !empty(USE_BUILTIN.fontconfig:M[yY][eE][sS]) +. if !empty(USE_BUILTIN.fontconfig:M[yY][eE][sS]) BUILDLINK_PREFIX.fontconfig= ${X11BASE} BUILDLINK_FILES.fontconfig+= lib/pkgconfig/fontconfig.pc USE_BUILTIN.expat= yes USE_BUILTIN.freetype2= yes USE_BUILTIN.zlib= yes -.endif +. endif .endif # CHECK_BUILTIN.fontconfig diff --git a/fonts/fontforge/Makefile b/fonts/fontforge/Makefile index c1956cc4e4d..76d4c05914d 100644 --- a/fonts/fontforge/Makefile +++ b/fonts/fontforge/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/05/23 08:39:50 adam Exp $ +# $NetBSD: Makefile,v 1.10 2005/06/01 18:02:48 jlam Exp $ DISTNAME= fontforge_full-${VERSION} PKGNAME= fontforge-${VERSION} @@ -14,7 +14,6 @@ VERSION= 20050502 USE_LIBTOOL= yes USE_TOOLS+= gmake -USE_X11= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-freetype-src=no WRKSRC= ${WRKDIR}/fontforge-${VERSION} @@ -26,5 +25,6 @@ WRKSRC= ${WRKDIR}/fontforge-${VERSION} .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/fonts/gucharmap/Makefile b/fonts/gucharmap/Makefile index 955a5f5be11..46a34e1b78f 100644 --- a/fonts/gucharmap/Makefile +++ b/fonts/gucharmap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/05/22 20:07:59 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2005/06/01 18:02:48 jlam Exp $ # DISTNAME= gucharmap-1.4.3 @@ -16,7 +16,6 @@ USE_DIRS+= gnome2-1.5 USE_TOOLS+= gmake USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes -USE_X11= yes GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE+= gucharmap.pc.in diff --git a/fonts/intlfonts/Makefile b/fonts/intlfonts/Makefile index 49dd90b5105..c87ac07a13a 100644 --- a/fonts/intlfonts/Makefile +++ b/fonts/intlfonts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2003/07/28 15:07:37 tron Exp $ +# $NetBSD: Makefile,v 1.19 2005/06/01 18:02:49 jlam Exp $ DISTNAME= intlfonts-1.2.1 PKGREVISION= 2 @@ -50,6 +50,8 @@ CONFIGURE_ARGS+=--with-fontdir=${PREFIX}/lib/X11/fonts/intlfonts \ FONT_SETS+= ${EXTRA_FONTS} PLIST_SRC= ${WRKDIR}/PLIST +.include "../../mk/x11.buildlink3.mk" + # the order may look strange, but we need to make "@dirrm" the last item. post-patch: ${CAT} ${PKGDIR}/PLIST.extrafonts ${PKGDIR}/PLIST > ${PLIST_SRC} diff --git a/fonts/ja-shinonome/Makefile b/fonts/ja-shinonome/Makefile index 4cf932756ce..dde21cdeab4 100644 --- a/fonts/ja-shinonome/Makefile +++ b/fonts/ja-shinonome/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:00 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2005/06/01 18:02:49 jlam Exp $ # DISTNAME= shinonome-0.9.10-src @@ -31,6 +31,8 @@ CONFIGURE_ARGS+= --with-fontdir=${FONTDIR} CONFIGURE_ARGS+= --disable-progressbar CONFIGURE_ARGS+= --with-foundry=${FOUNDRY} +.include "../../mk/x11.buildlink3.mk" + do-install: cd ${WRKSRC}; \ ${MAKE_PROGRAM} install; \ diff --git a/fonts/t1lib/Makefile b/fonts/t1lib/Makefile index 568e4a07386..00753d9adbe 100644 --- a/fonts/t1lib/Makefile +++ b/fonts/t1lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/05/22 20:08:00 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2005/06/01 18:02:49 jlam Exp $ # DISTNAME= t1lib-5.0.2 @@ -16,7 +16,6 @@ USE_PKGINSTALL= YES USE_TOOLS+= gmake GNU_CONFIGURE= YES USE_LIBTOOL= YES -USE_X11= YES BUILD_TARGET= without_doc @@ -26,6 +25,8 @@ DATADIR= ${PREFIX}/share/${PKGBASE} CONF_FILES= ${EGDIR}/t1lib.config.sample ${DATADIR}/t1lib.config CONF_FILES+= ${EGDIR}/FontDataBase ${DATADIR}/FontDataBase +.include "../../mk/x11.buildlink3.mk" + pre-build: ${FIND} ${WRKSRC} -name "*.orig" -print | ${XARGS} ${RM} diff --git a/fonts/ttmkfdir2/Makefile b/fonts/ttmkfdir2/Makefile index 0d14a69bf7c..4cd4e59f3ee 100644 --- a/fonts/ttmkfdir2/Makefile +++ b/fonts/ttmkfdir2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:00 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:49 jlam Exp $ # DISTNAME= ttmkfdir2.20021109 @@ -20,7 +20,7 @@ USE_TOOLS+= gmake lex USE_LANGUAGES= c c++ MAKE_ENV+= FREETYPE_CONFIG=${FREETYPE_CONFIG} -LDFLAGS+= ${LIBGETOPT} +LDFLAGS+= ${BUILDLINK_LDADD.getopt} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/ttmkfdir ${PREFIX}/bin diff --git a/fonts/vfontcap-kochi/Makefile b/fonts/vfontcap-kochi/Makefile index 54a87f08537..c1931a7ba02 100644 --- a/fonts/vfontcap-kochi/Makefile +++ b/fonts/vfontcap-kochi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2004/01/25 20:37:03 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2005/06/01 18:02:49 jlam Exp $ DISTNAME= vfontcap-kochi-0.0 PKGREVISION= 1 @@ -16,7 +16,6 @@ WRKSRC= ${WRKDIR} EXTRACT_ONLY= # empty NO_CHECKSUM= YES NO_BUILD= YES -USE_X11= YES # kochi font defines this as well. USE_PKGINSTALL= YES DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL diff --git a/fonts/xmbdfed/Makefile b/fonts/xmbdfed/Makefile index a9a28b213cc..66ff15c5c4c 100644 --- a/fonts/xmbdfed/Makefile +++ b/fonts/xmbdfed/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/04/11 21:45:48 tv Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:02:49 jlam Exp $ DISTNAME= xmbdfed-4.5 PKGREVISION= # @@ -17,5 +17,4 @@ do-install: .include "../../graphics/freetype-lib/buildlink3.mk" .include "../../mk/motif.buildlink3.mk" - .include "../../mk/bsd.pkg.mk" diff --git a/fonts/xorg-fontserver/Makefile b/fonts/xorg-fontserver/Makefile index 3e87d5600f8..efc8b2a2ca4 100644 --- a/fonts/xorg-fontserver/Makefile +++ b/fonts/xorg-fontserver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/04/11 21:45:48 tv Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:02:49 jlam Exp $ DISTNAME= ${DISTFILES} PKGNAME= xorg-fontserver-${XORG_VER} @@ -11,7 +11,6 @@ MAINTAINER= xtraeme@NetBSD.org HOMEPAGE= http://www.x.org/ COMMENT= X.org font server -USE_X11= yes DISTINFO_FILE= ${.CURDIR}/../../x11/xorg-libs/distinfo PATCHDIR= ${.CURDIR}/../../x11/xorg-libs/patches @@ -21,4 +20,5 @@ XINSTALL_MAN_DIRS= programs/xfs .include "../../graphics/freetype2/buildlink3.mk" .include "../../meta-pkgs/xorg/Makefile.common" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/KoboDeluxe/Makefile b/games/KoboDeluxe/Makefile index 2171c11d5cf..e8a0220e8e1 100644 --- a/games/KoboDeluxe/Makefile +++ b/games/KoboDeluxe/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/05/22 20:08:00 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/01 18:02:49 jlam Exp $ DISTNAME= KoboDeluxe-0.4pre8 PKGNAME= ${DISTNAME:S/pre/rc/} @@ -12,7 +12,6 @@ COMMENT= Multi-way scrolling shoot 'em up game for X GNU_CONFIGURE= YES USE_TOOLS+= gmake -USE_X11= YES .include "../../devel/SDL/buildlink3.mk" .include "../../graphics/SDL_image/buildlink3.mk" diff --git a/games/abuse/Makefile b/games/abuse/Makefile index f790feef3dc..4cfdef7ce7e 100644 --- a/games/abuse/Makefile +++ b/games/abuse/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:00 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2005/06/01 18:02:49 jlam Exp $ DISTNAME= abuse_pd PKGNAME= abuse-2.0 @@ -20,6 +20,8 @@ PKGSRC_USE_TOOLS+= gtar NOT_FOR_PLATFORM= NetBSD-*-arm32 +.include "../../mk/x11.buildlink3.mk" + post-extract: cd ${WRKSRC}/abuse && \ ${GZCAT} ${DISTDIR}/abuse_data.tar.gz | ${GTAR} xf - diff --git a/games/angband-x11/Makefile b/games/angband-x11/Makefile index 7b9b4469faa..68332a52858 100644 --- a/games/angband-x11/Makefile +++ b/games/angband-x11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2005/04/11 21:45:48 tv Exp $ +# $NetBSD: Makefile,v 1.35 2005/06/01 18:02:49 jlam Exp $ # DISTNAME= angband-3.0.3 @@ -16,7 +16,6 @@ CONFLICTS= angband-tty-[0-9]* EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} -USE_X11= # defined INCOMPAT_CURSES= NetBSD-1.5* NetBSD-1.6[-_.]* INCOMPAT_CURSES+= NetBSD-1.6[A-M]-* @@ -38,4 +37,5 @@ post-install: ${FIND} ${PREFIX}/share/games/angband -name delete.me -exec ${RM} {} \; .include "../../devel/ncurses/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/baduki/Makefile b/games/baduki/Makefile index 6ac90748e81..4ba32c2df2c 100644 --- a/games/baduki/Makefile +++ b/games/baduki/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2005/04/11 21:45:48 tv Exp $ +# $NetBSD: Makefile,v 1.34 2005/06/01 18:02:49 jlam Exp $ DISTNAME= baduki-0.2.9 PKGREVISION= 3 @@ -12,7 +12,6 @@ COMMENT= Go playing program based on xamigo BUILD_USES_MSGFMT= # defined USE_PKGLOCALEDIR= # defined -USE_X11= # defined GNU_CONFIGURE= # defined CONFIGURE_ARGS+= --without-included-gettext diff --git a/games/battalion/Makefile b/games/battalion/Makefile index 0e96a28778f..8472d41e6ac 100644 --- a/games/battalion/Makefile +++ b/games/battalion/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2005/05/16 01:15:31 jlam Exp $ +# $NetBSD: Makefile,v 1.30 2005/06/01 18:02:49 jlam Exp $ DISTNAME= battalion PKGNAME= battalion-1.4 @@ -15,7 +15,6 @@ NOT_FOR_PLATFORM= *-*-alpha # relies on Mesa (gcc) WRKSRC= ${WRKDIR}/battalionSource EXTRACT_ONLY= battalionSource1.4.tar.Z -USE_X11= yes PKGSRC_USE_TOOLS+= gtar .include "../../mk/bsd.prefs.mk" @@ -49,4 +48,5 @@ pre-clean: .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/battleball/Makefile b/games/battleball/Makefile index 6fcb58830f6..17b61c2e50d 100644 --- a/games/battleball/Makefile +++ b/games/battleball/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/04/11 21:45:48 tv Exp $ +# $NetBSD: Makefile,v 1.18 2005/06/01 18:02:49 jlam Exp $ DISTNAME= battleball.21.src PKGNAME= battleball-2.1 @@ -11,11 +11,12 @@ HOMEPAGE= http://www.cs.utexas.edu/users/pahardin/bb.html COMMENT= 3d game of soccer, with tanks WRKSRC= ${WRKDIR}/battleball-2.1-src -USE_X11= YES USE_LANGUAGES= c c++ SED_CMDS= -e '/^INCS/s|$$|${CPPFLAGS}|' -e '/^LIBS/s|$$|${LDFLAGS}|' +.include "../../mk/x11.buildlink3.mk" + do-configure: ${CP} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.orig; \ ${SED} ${SED_CMDS} < ${WRKSRC}/Makefile.orig > ${WRKSRC}/Makefile diff --git a/games/boson/Makefile b/games/boson/Makefile index e356941f096..5239799f31f 100644 --- a/games/boson/Makefile +++ b/games/boson/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:00 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 18:02:49 jlam Exp $ # DISTNAME= boson-all-0.8 @@ -16,7 +16,6 @@ BUILD_USES_MSGFMT= yes USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes -USE_X11= yes USE_TOOLS+= gmake USE_LIBTOOL= yes diff --git a/games/bzflag/Makefile b/games/bzflag/Makefile index 2c4a1fd2f4f..ae60974506b 100644 --- a/games/bzflag/Makefile +++ b/games/bzflag/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/05/22 20:08:00 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2005/06/01 18:02:49 jlam Exp $ DISTNAME= bzflag-1.10.6.20040515 PKGNAME= ${DISTNAME:S/.20040515//} @@ -15,7 +15,6 @@ USE_TOOLS+= gmake USE_LANGUAGES= c c++ USE_NCURSES= # resize_term() USE_PERL5= build -USE_X11= yes .include "../../mk/bsd.prefs.mk" @@ -36,4 +35,5 @@ CONFIGURE_ARGS+= --with-ncurses .include "../../mk/ossaudio.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/cgoban/Makefile b/games/cgoban/Makefile index ad5b216838f..346dddeeff1 100644 --- a/games/cgoban/Makefile +++ b/games/cgoban/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2003/07/21 16:49:36 martti Exp $ +# $NetBSD: Makefile,v 1.10 2005/06/01 18:02:49 jlam Exp $ DISTNAME= cgoban-1.9.12 CATEGORIES= games @@ -8,7 +8,7 @@ MAINTAINER= bad@NetBSD.org HOMEPAGE= http://www.igoweb.org/~wms/comp/cgoban/index.html COMMENT= The complete goban. A Go server client and sgf viewer/editor -USE_X11= yes GNU_CONFIGURE= yes +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/crack-attack/Makefile b/games/crack-attack/Makefile index 31d8ae101b0..4c847ff0eaa 100644 --- a/games/crack-attack/Makefile +++ b/games/crack-attack/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/05/19 06:49:33 snj Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:02:49 jlam Exp $ DISTNAME= crack-attack-1.1.14 CATEGORIES= games @@ -10,7 +10,6 @@ COMMENT= Tetris Attack inspired game GNU_CONFIGURE= YES USE_LANGUAGES= c c++ -USE_X11= YES post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/${PKGBASE} diff --git a/games/craft/Makefile b/games/craft/Makefile index c933431dfaf..26fff9ce0d8 100644 --- a/games/craft/Makefile +++ b/games/craft/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/05/22 20:08:00 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2005/06/01 18:02:49 jlam Exp $ DISTNAME= craftcc35 PKGNAME= craft-3.5 @@ -14,6 +14,8 @@ WRKSRC= ${WRKDIR} USE_TOOLS+= gmake USE_X11BASE= yes +.include "../../mk/x11.buildlink3.mk" + post-extract: @${FIND} ${WRKSRC} -type f -name '*~' -print | ${XARGS} ${RM} -f @${LN} -fs ${FILESDIR}/Makefile ${WRKSRC} diff --git a/games/criticalmass/Makefile b/games/criticalmass/Makefile index 633f4a3fe10..e143c354eb0 100644 --- a/games/criticalmass/Makefile +++ b/games/criticalmass/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:00 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2005/06/01 18:02:49 jlam Exp $ # DISTNAME= CriticalMass-0.9.10 @@ -14,7 +14,6 @@ COMMENT= SDL/OpenGL space shoot'em up game GNU_CONFIGURE= YES USE_TOOLS+= gmake -USE_X11= YES .include "../../devel/SDL/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" diff --git a/games/crossfire-cli/Makefile b/games/crossfire-cli/Makefile index dd8ef0ac5f6..ea3d4bc3c12 100644 --- a/games/crossfire-cli/Makefile +++ b/games/crossfire-cli/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/05/22 20:08:00 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2005/06/01 18:02:49 jlam Exp $ # DISTNAME= crossfire-client-1.0.0 @@ -18,7 +18,6 @@ CF_SND= client-0.95.2-au-sounds.tgz CF_RAW= client-0.95.2-raw-sounds.tgz USE_PERL5= yes -USE_X11= yes USE_TOOLS+= gmake GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-sound-dir=${LOCALBASE}/share/cfclient/sounds diff --git a/games/crossfire-srv/Makefile b/games/crossfire-srv/Makefile index 872b497274c..79c41121f75 100644 --- a/games/crossfire-srv/Makefile +++ b/games/crossfire-srv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:00 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2005/06/01 18:02:49 jlam Exp $ # DISTNAME= crossfire-1.0.0 @@ -17,7 +17,6 @@ EXTRACT_ONLY= ${CF_SRC} CF_SRC= crossfire-1.0.0.tar.bz2 CF_MAPS= crossfire-1.0.0-maps.tar.bz2 -USE_X11= yes USE_TOOLS+= gmake GNU_CONFIGURE= yes USE_PERL5= yes diff --git a/games/d2x/Makefile b/games/d2x/Makefile index d378d58a69b..fe37f6def13 100644 --- a/games/d2x/Makefile +++ b/games/d2x/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:00 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:02:50 jlam Exp $ # DISTNAME= d2x-0.2.5 @@ -12,7 +12,6 @@ COMMENT= Descent II port HAS_CONFIGURE= yes USE_TOOLS+= gmake -USE_X11= yes D2X_DATA= ${PREFIX}/share/games/${PKGBASE} MAKE_DIRS= ${D2X_DATA} diff --git a/games/dd2/Makefile b/games/dd2/Makefile index 45872007918..c9fcca13184 100644 --- a/games/dd2/Makefile +++ b/games/dd2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/04/11 21:45:49 tv Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:02:50 jlam Exp $ # DISTNAME= dd2-0.2.1 @@ -10,7 +10,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.usebox.net/jjm/dd2/ COMMENT= Shoot'em up arcade game for one or two players -USE_X11= yes GNU_CONFIGURE= yes .include "../../audio/SDL_mixer/buildlink3.mk" diff --git a/games/defendguin/Makefile b/games/defendguin/Makefile index 9959e47fad0..2b8132076ea 100644 --- a/games/defendguin/Makefile +++ b/games/defendguin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:01 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:50 jlam Exp $ DISTNAME= defendguin-0.0.10 PKGREVISION= 4 @@ -9,7 +9,6 @@ MAINTAINER= reed@reedmedia.net HOMEPAGE= http://www.newbreedsoftware.com/defendguin/ COMMENT= Clone of the arcade game Defender -USE_X11= YES USE_TOOLS+= gmake diff --git a/games/falcons-eye/Makefile b/games/falcons-eye/Makefile index b318d5e12c5..3b32f949b85 100644 --- a/games/falcons-eye/Makefile +++ b/games/falcons-eye/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/05/22 20:08:01 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2005/06/01 18:02:50 jlam Exp $ # DISTNAME= nethack_source_331_jtp_193 @@ -20,7 +20,6 @@ DIST_SUBDIR= ${PKGNAME_NOREV}-20050216-2 WRKSRC= ${WRKDIR} USE_TOOLS+= bison lex MAKE_ENV+= YACC=${TOOLS_YACC:Q} -USE_X11= yes LIBS.SunOS+= -lm diff --git a/games/finalbattle/Makefile b/games/finalbattle/Makefile index 5cad65cdb79..4a66a0d4ff4 100644 --- a/games/finalbattle/Makefile +++ b/games/finalbattle/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2004/01/20 12:15:40 agc Exp $ +# $NetBSD: Makefile,v 1.8 2005/06/01 18:02:50 jlam Exp $ # DISTNAME= finalbattle.0.0 @@ -15,4 +15,5 @@ MAKEFILE= makefile USE_X11BASE= yes +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/fire/Makefile b/games/fire/Makefile index 0a17bb8ed7d..fa710019a1f 100644 --- a/games/fire/Makefile +++ b/games/fire/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/04/11 21:45:49 tv Exp $ +# $NetBSD: Makefile,v 1.17 2005/06/01 18:02:50 jlam Exp $ # DISTNAME= fire-1.0 @@ -10,7 +10,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.libsdl.org/projects/fire/index.html COMMENT= Organic fireworks demo -USE_X11= YES GNU_CONFIGURE= YES .include "../../devel/SDL/buildlink3.mk" diff --git a/games/fkiss/Makefile b/games/fkiss/Makefile index f18ba659ee2..aa801bcb37c 100644 --- a/games/fkiss/Makefile +++ b/games/fkiss/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:01 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2005/06/01 18:02:50 jlam Exp $ # DISTNAME= fkiss-0.33 @@ -16,7 +16,6 @@ PATCH_DIST_STRIP= -p1 DEPENDS+= lha-[0-9]*:../../archivers/lha -USE_X11= yes USE_TOOLS+= gmake GNU_CONFIGURE= yes CFLAGS+= -DUSE_STDARG -DHAVE_STDARG_H @@ -45,4 +44,5 @@ do-install: done .include "../../mk/ossaudio.buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/foobillard/Makefile b/games/foobillard/Makefile index 88c572fb7c9..2ffc5a33b1d 100644 --- a/games/foobillard/Makefile +++ b/games/foobillard/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:01 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:50 jlam Exp $ # DISTNAME= foobillard-3.0a @@ -11,7 +11,6 @@ HOMEPAGE= http://foobillard.sunsite.dk/ COMMENT= Free OpenGL-billard game USE_TOOLS+= gmake -USE_X11= yes GNU_CONFIGURE= yes .include "../../mk/bsd.prefs.mk" diff --git a/games/freeciv-client-gtk/Makefile b/games/freeciv-client-gtk/Makefile index 707570ad4e6..ed5e1645b63 100644 --- a/games/freeciv-client-gtk/Makefile +++ b/games/freeciv-client-gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2004/11/03 14:19:20 adam Exp $ +# $NetBSD: Makefile,v 1.25 2005/06/01 18:02:50 jlam Exp $ PKGNAME= ${DISTNAME:S/-/-client-gtk-/} COMMENT= Freeciv client with GTK+ interface @@ -6,7 +6,6 @@ COMMENT= Freeciv client with GTK+ interface DEPENDS+= freeciv-share>=${FC_VERS}:../../games/freeciv-share DEPENDS+= freeciv-sounds>=2.0:../../games/freeciv-sounds -USE_X11= yes CONFIGURE_ARGS+= --disable-server --disable-make-data CONFIGURE_ARGS+= --enable-client=gtk diff --git a/games/freeciv-client-gtk2/Makefile b/games/freeciv-client-gtk2/Makefile index 8223cc89786..ee0a18c1eb1 100644 --- a/games/freeciv-client-gtk2/Makefile +++ b/games/freeciv-client-gtk2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2004/11/03 14:19:45 adam Exp $ +# $NetBSD: Makefile,v 1.6 2005/06/01 18:02:50 jlam Exp $ PKGNAME= ${DISTNAME:S/-/-client-gtk2-/} COMMENT= Freeciv client with GTK+ interface @@ -6,7 +6,6 @@ COMMENT= Freeciv client with GTK+ interface DEPENDS+= freeciv-share>=${FC_VERS}:../../games/freeciv-share DEPENDS+= freeciv-sounds>=2.0:../../games/freeciv-sounds -USE_X11= yes CONFIGURE_ARGS+= --disable-server --disable-make-data CONFIGURE_ARGS+= --enable-client=gtk2 diff --git a/games/freeciv-client/Makefile b/games/freeciv-client/Makefile index ba05d3c05eb..0772378a579 100644 --- a/games/freeciv-client/Makefile +++ b/games/freeciv-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2004/11/03 14:18:52 adam Exp $ +# $NetBSD: Makefile,v 1.22 2005/06/01 18:02:50 jlam Exp $ PKGNAME= ${DISTNAME:S/-/-client-/} COMMENT= Freeciv client with Xaw interface @@ -8,7 +8,6 @@ DEPENDS+= freeciv-sounds>=2.0:../../games/freeciv-sounds CONFLICTS= freeciv-client-gtk<=1.11.4 -USE_X11= yes CONFIGURE_ARGS+= --disable-server --disable-make-data CONFIGURE_ARGS+= --enable-client=xaw diff --git a/games/galaxa/Makefile b/games/galaxa/Makefile index 74fbc246cce..620dc84d9b4 100644 --- a/games/galaxa/Makefile +++ b/games/galaxa/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/04/11 21:45:50 tv Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 18:02:50 jlam Exp $ # DISTNAME= galaxa.0.1 @@ -13,7 +13,8 @@ COMMENT= Space game based loosely on "Galaga" WRKSRC= ${WRKDIR}/galaxa MAKEFILE= makefile -USE_X11= yes + +.include "../../mk/x11.buildlink3.mk" pre-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/galaxa diff --git a/games/glaxium/Makefile b/games/glaxium/Makefile index bca548a264e..c7bfaf6d353 100644 --- a/games/glaxium/Makefile +++ b/games/glaxium/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:01 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:02:50 jlam Exp $ # DISTNAME= glaxium_0.5 @@ -12,7 +12,6 @@ HOMEPAGE= http://xhosxe.free.fr/glaxium/ COMMENT= Space-ship OpenGL shoot them up GNU_CONFIGURE= yes -USE_X11= yes USE_TOOLS+= gmake USE_LANGUAGES= c c++ diff --git a/games/glchess/Makefile b/games/glchess/Makefile index 74b27a233c1..14c2d3d5af4 100644 --- a/games/glchess/Makefile +++ b/games/glchess/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/04/11 21:45:50 tv Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/01 18:02:50 jlam Exp $ # DISTNAME= glchess-0.4.7 @@ -10,7 +10,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://glchess.sourceforge.net/ COMMENT= 3D chess interface -USE_X11= YES GNU_CONFIGURE= YES INSTALL_DIRS= ${WRKSRC}/src ${WRKSRC}/man ${WRKSRC}/textures diff --git a/games/gnocatan/Makefile b/games/gnocatan/Makefile index 49813fcd5e1..ef5e29194bf 100644 --- a/games/gnocatan/Makefile +++ b/games/gnocatan/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2005/05/22 20:08:01 jlam Exp $ +# $NetBSD: Makefile,v 1.31 2005/06/01 18:02:50 jlam Exp $ # DISTNAME= gnocatan-0.8.1.16 @@ -15,7 +15,6 @@ USE_DIRS+= xdg-1.1 USE_TOOLS+= gmake USE_LIBTOOL= YES USE_PKGLOCALEDIR= YES -USE_X11= YES .include "../../devel/glib2/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" diff --git a/games/gnome2-games/Makefile b/games/gnome2-games/Makefile index c4fb4ed0538..f04724e5be0 100644 --- a/games/gnome2-games/Makefile +++ b/games/gnome2-games/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2005/05/22 20:08:01 jlam Exp $ +# $NetBSD: Makefile,v 1.48 2005/06/01 18:02:50 jlam Exp $ DISTNAME= gnome-games-2.10.1 CATEGORIES= games gnome @@ -18,7 +18,6 @@ BUILD_USES_MSGFMT= yes USE_DIRS+= gnome2-1.5 USE_PKGLOCALEDIR= yes USE_TOOLS+= gmake -USE_X11= yes USE_CONFIG_WRAPPER= yes USE_LANGUAGES= c c++ USE_LIBTOOL= yes diff --git a/games/golddig/Makefile b/games/golddig/Makefile index 164bb0c775a..bfc547826e2 100644 --- a/games/golddig/Makefile +++ b/games/golddig/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/07/17 21:38:42 grant Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:02:50 jlam Exp $ # DISTNAME= golddigC3.0 @@ -10,6 +10,7 @@ MAINTAINER= wiz@NetBSD.org COMMENT= Fast action game designed for use with X USE_X11BASE= yes +.include "../../mk/x11.buildlink3.mk" post-build: for f in ${WRKSRC}/golddig.6 ${WRKSRC}/gdedit.6; do \ diff --git a/games/gtkgo/Makefile b/games/gtkgo/Makefile index eb6451c4ff1..3936bdf1291 100644 --- a/games/gtkgo/Makefile +++ b/games/gtkgo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/04/11 21:45:51 tv Exp $ +# $NetBSD: Makefile,v 1.14 2005/06/01 18:02:50 jlam Exp $ # DISTNAME= gtkgo-0_0_10 @@ -13,7 +13,6 @@ COMMENT= Go board with skin support CPPFLAGS+= -DPKGDATADIR='"${PREFIX}/share/gtkgo/"' GNU_CONFIGURE= YES -USE_X11= YES WRKSRC= ${WRKDIR}/${DISTNAME:S/_/./g} .include "../../x11/gnome-libs/buildlink3.mk" diff --git a/games/gturing/Makefile b/games/gturing/Makefile index a33b4376393..e10dd99de14 100644 --- a/games/gturing/Makefile +++ b/games/gturing/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/05/22 20:08:02 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2005/06/01 18:02:50 jlam Exp $ # DISTNAME= gturing-0.1.1 @@ -15,7 +15,6 @@ BUILD_USES_MSGFMT= YES GNU_CONFIGURE= YES USE_PKGLOCALEDIR= YES -USE_X11= YES USE_TOOLS+= gmake USE_LIBTOOL= YES diff --git a/games/icbm3d/Makefile b/games/icbm3d/Makefile index 85c0f71bdab..42c17d06a83 100644 --- a/games/icbm3d/Makefile +++ b/games/icbm3d/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2004/01/20 12:15:40 agc Exp $ +# $NetBSD: Makefile,v 1.10 2005/06/01 18:02:50 jlam Exp $ # DISTNAME= icbm3d.0.4 @@ -12,6 +12,6 @@ COMMENT= 3D X11 game of defense WRKSRC= ${WRKDIR}/icbm3d MAKEFILE= makefile -USE_X11= yes +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/icebreaker/Makefile b/games/icebreaker/Makefile index 164d83b9d8a..61642d3f3f2 100644 --- a/games/icebreaker/Makefile +++ b/games/icebreaker/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:02 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2005/06/01 18:02:51 jlam Exp $ # DISTNAME= icebreaker-1.9.7 @@ -12,7 +12,6 @@ HOMEPAGE= http://www.mattdm.org/icebreaker/ COMMENT= Penguin capturing simulation USE_TOOLS+= gmake -USE_X11= yes MAKE_ENV+= mandir="${PREFIX}/man" highscoredir="/var/games" MAKE_ENV+= prefix="${PREFIX}" diff --git a/games/ketm/Makefile b/games/ketm/Makefile index 44eb9186475..7f7b0622a6a 100644 --- a/games/ketm/Makefile +++ b/games/ketm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/05/22 20:08:02 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2005/06/01 18:02:51 jlam Exp $ # DISTNAME= ketm-0.0.6 @@ -13,7 +13,6 @@ COMMENT= Old-school 2d-scrolling shooter BUILD_TARGET= ketm -USE_X11= YES USE_TOOLS+= gmake post-patch: diff --git a/games/knightcap/Makefile b/games/knightcap/Makefile index f478a7727c4..898a53b8786 100644 --- a/games/knightcap/Makefile +++ b/games/knightcap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/04/11 21:45:51 tv Exp $ +# $NetBSD: Makefile,v 1.20 2005/06/01 18:02:51 jlam Exp $ DISTNAME= KnightCap-3.6 PKGNAME= knightcap-3.6 @@ -13,7 +13,6 @@ COMMENT= Chess engine with 3D OpenGL-rendered chessboard BUILD_TARGET= KnightCap WRKSRC= ${WRKDIR}/Export -USE_X11= # defined MAKE_ENV+= MESA=${BUILDLINK_PREFIX.MesaLib} MAKE_ENV+= DEFINES="${DEFINES}" @@ -29,4 +28,5 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR} .include "../../graphics/Mesa/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/lbreakout/Makefile b/games/lbreakout/Makefile index 8e530ef812b..e134e212403 100644 --- a/games/lbreakout/Makefile +++ b/games/lbreakout/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/04/11 21:45:51 tv Exp $ +# $NetBSD: Makefile,v 1.22 2005/06/01 18:02:51 jlam Exp $ DISTNAME= lbreakout-010315 PKGREVISION= 5 @@ -9,7 +9,6 @@ MAINTAINER= rh@NetBSD.org HOMEPAGE= http://lgames.sourceforge.net/ COMMENT= Breakout-style arcade game -USE_X11= YES GNU_CONFIGURE= YES CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" CONFIGURE_ARGS+= --disable-sound diff --git a/games/lbreakout2/Makefile b/games/lbreakout2/Makefile index 834a8c145b5..b536b9af1f4 100644 --- a/games/lbreakout2/Makefile +++ b/games/lbreakout2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/04/11 21:45:51 tv Exp $ +# $NetBSD: Makefile,v 1.18 2005/06/01 18:02:51 jlam Exp $ DISTNAME= lbreakout2-2.5.2 PKGREVISION= 1 @@ -9,7 +9,6 @@ MAINTAINER= xs@nitric.net HOMEPAGE= http://lgames.sourceforge.net/ COMMENT= Breakout-style arcade game -USE_X11= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-highscore-path=${LOCALBASE}/share/games/ \ --with-docdir=${LOCALBASE}/share/doc/html diff --git a/games/lgeneral/Makefile b/games/lgeneral/Makefile index 710c5e81017..3a5f9cdc8df 100644 --- a/games/lgeneral/Makefile +++ b/games/lgeneral/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/04/11 21:45:51 tv Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 18:02:51 jlam Exp $ # DISTNAME= lgeneral-1.1.1 @@ -11,7 +11,6 @@ HOMEPAGE= http://lgames.sourceforge.net/index.php?project=LGeneral COMMENT= Panzer General play-a-like, uses Panzer General data files GNU_CONFIGURE= YES -USE_X11= YES CONFIGURE_ARGS+= --disable-dl diff --git a/games/lincity/Makefile b/games/lincity/Makefile index 1eb56840f2b..9ed398b9984 100644 --- a/games/lincity/Makefile +++ b/games/lincity/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/05/22 20:08:02 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2005/06/01 18:02:51 jlam Exp $ DISTNAME= lincity-1.12.1 CATEGORIES= games x11 @@ -13,7 +13,6 @@ BUILD_USES_MSGFMT= yes USE_TOOLS+= gmake USE_PKGLOCALEDIR= yes -USE_X11= yes GNU_CONFIGURE= yes pre-install: @@ -26,4 +25,5 @@ post-install: ${LN} -sf lincity.6 ${PREFIX}/man/man6/xlincity.6 .include "../../devel/gettext-lib/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/lmarbles/Makefile b/games/lmarbles/Makefile index 51527b5d6eb..5622322fec4 100644 --- a/games/lmarbles/Makefile +++ b/games/lmarbles/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/04/16 14:43:49 cube Exp $ +# $NetBSD: Makefile,v 1.5 2005/06/01 18:02:51 jlam Exp $ DISTNAME= lmarbles-1.0.7 PKGREVISION= 2 @@ -9,7 +9,6 @@ MAINTAINER= xs@nitric.net HOMEPAGE= http://lgames.sourceforge.net/ COMMENT= Atomix-like puzzle -USE_X11= yes GNU_CONFIGURE= yes .include "../../audio/SDL_mixer/buildlink3.mk" diff --git a/games/lpairs/Makefile b/games/lpairs/Makefile index 5dc710fa637..4f4d9754353 100644 --- a/games/lpairs/Makefile +++ b/games/lpairs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/04/11 21:45:51 tv Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:51 jlam Exp $ DISTNAME= lpairs-1.0.1 PKGREVISION= 1 @@ -9,7 +9,6 @@ MAINTAINER= xs@nitric.net HOMEPAGE= http://lgames.sourceforge.net/ COMMENT= Memory game matching pairs of cards -USE_X11= yes GNU_CONFIGURE= yes .include "../../devel/SDL/buildlink3.mk" diff --git a/games/ltris/Makefile b/games/ltris/Makefile index 80db9bbb7de..434d0626b4f 100644 --- a/games/ltris/Makefile +++ b/games/ltris/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/04/11 21:45:51 tv Exp $ +# $NetBSD: Makefile,v 1.15 2005/06/01 18:02:51 jlam Exp $ DISTNAME= ltris-1.0.7 PKGREVISION= 1 @@ -9,7 +9,6 @@ MAINTAINER= xs@nitric.net HOMEPAGE= http://lgames.sourceforge.net/ COMMENT= SDL tetris clone -USE_X11= yes GNU_CONFIGURE= yes .include "../../audio/SDL_mixer/buildlink3.mk" diff --git a/games/maelstrom-sdl/Makefile b/games/maelstrom-sdl/Makefile index 21013a7eec8..b192b77fd30 100644 --- a/games/maelstrom-sdl/Makefile +++ b/games/maelstrom-sdl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/04/11 21:45:52 tv Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:51 jlam Exp $ # DISTNAME= Maelstrom-3.0.5 @@ -13,7 +13,6 @@ COMMENT= High resolution version of Asteroids (SDL version) CONFLICTS= maelstrom-x11-[0-9]* maelstrom-[0-9]* -USE_X11= YES GNU_CONFIGURE= YES MAKE_ENV+= CP=${CP} diff --git a/games/mirrormagic/Makefile b/games/mirrormagic/Makefile index 74c850677bd..db1984e21fe 100644 --- a/games/mirrormagic/Makefile +++ b/games/mirrormagic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/05/22 20:08:02 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2005/06/01 18:02:51 jlam Exp $ # DISTNAME= mirrormagic-2.0.2 @@ -12,12 +12,13 @@ COMMENT= Nice little puzzle game with color graphics and sound CONFLICTS= mirrormagic-sdl-[1-9]* USE_TOOLS+= gmake -USE_X11= YES PLIST_SRC= ${WRKDIR}/PLIST PLIST # if you change SCORE_PATH, don't forget to change patch-aa, too SCORE_PATH= /var/games/mirrormagic +.include "../../mk/x11.buildlink3.mk" + do-install: ${INSTALL_PROGRAM} -o bin -g games -m 2755 \ ${WRKSRC}/mirrormagic ${PREFIX}/bin diff --git a/games/nethack-qt/Makefile b/games/nethack-qt/Makefile index 6c5248b1d17..417a3513da3 100644 --- a/games/nethack-qt/Makefile +++ b/games/nethack-qt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2005/04/11 21:45:55 tv Exp $ +# $NetBSD: Makefile,v 1.43 2005/06/01 18:02:51 jlam Exp $ # .include "../nethack-lib/Makefile.common" @@ -11,7 +11,6 @@ COMMENT= The QT-Enhanced X11 version of NetHack DEPENDS+= nethack-lib-${NETHACK_VERSION}:../nethack-lib -USE_X11= # defined BUILD_TARGET= x11tiles nethack INSTALL_TARGET= binfiles diff --git a/games/nethack-x11/Makefile b/games/nethack-x11/Makefile index 61413b7670a..d52d6e5b320 100644 --- a/games/nethack-x11/Makefile +++ b/games/nethack-x11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/05/08 10:17:30 pooka Exp $ +# $NetBSD: Makefile,v 1.26 2005/06/01 18:02:51 jlam Exp $ # .include "../nethack-lib/Makefile.common" @@ -10,7 +10,6 @@ CATEGORIES+= x11 DEPENDS+= nethack-lib-${NETHACK_VERSION}:../nethack-lib -USE_X11= YES BUILD_TARGET= x11tiles nethack INSTALL_TARGET= binfiles diff --git a/games/nethack/Makefile b/games/nethack/Makefile index cb7d653fd71..507c5cfe002 100644 --- a/games/nethack/Makefile +++ b/games/nethack/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2004/10/28 11:51:04 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2005/06/01 18:02:51 jlam Exp $ # Needed so configure/patch rules don't get pulled in NO_BUILD= yes @@ -17,7 +17,6 @@ DEPENDS+= nethack-tty-${NETHACK_VERSION}:../nethack-tty DEPENDS+= nethack-x11-${NETHACK_VERSION}:../nethack-x11 DEPENDS+= nethack-qt-${NETHACK_VERSION}nb2:../nethack-qt -USE_X11= yes EXTRACT_ONLY= # empty NO_CHECKSUM= yes diff --git a/games/neverball/Makefile b/games/neverball/Makefile index 4420d1e7f36..ce9c4996ab2 100644 --- a/games/neverball/Makefile +++ b/games/neverball/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:02 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:02:51 jlam Exp $ # DISTNAME= neverball-1.2.2 @@ -11,7 +11,6 @@ HOMEPAGE= http://www.icculus.org/neverball/ COMMENT= Part puzzle game, part action game and with SDL graphics USE_TOOLS+= gmake -USE_X11= yes # Avoiding multiples patches... BUILDLINK_TRANSFORM.SDL+= -e "s|/SDL/|/|g" diff --git a/games/newvox/Makefile b/games/newvox/Makefile index 25fc2bbc225..2458483a7f6 100644 --- a/games/newvox/Makefile +++ b/games/newvox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/04/11 21:45:56 tv Exp $ +# $NetBSD: Makefile,v 1.18 2005/06/01 18:02:51 jlam Exp $ # DISTNAME= newvox-1.0 @@ -10,7 +10,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.libsdl.org/projects/newvox/index.html COMMENT= Voxel-style landscape rendering fly-by -USE_X11= YES GNU_CONFIGURE= YES LIBS.SunOS+= -lm diff --git a/games/nighthawk/Makefile b/games/nighthawk/Makefile index 39ebd6683fa..a478667ce9e 100644 --- a/games/nighthawk/Makefile +++ b/games/nighthawk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/05/22 20:08:02 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2005/06/01 18:02:51 jlam Exp $ # DISTNAME= nighthawk-2.1 @@ -17,7 +17,6 @@ COMMENT= C64 Paradroid clone WRKSRC= ${WRKDIR}/nighthawk USE_TOOLS+= gmake USE_LANGUAGES= c c++ -USE_X11= YES post-build: cd ${WRKSRC}/src_sound && \ diff --git a/games/openmortal/Makefile b/games/openmortal/Makefile index 6d8ac3bebae..23409850cd7 100644 --- a/games/openmortal/Makefile +++ b/games/openmortal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:02 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2005/06/01 18:02:51 jlam Exp $ # DISTNAME= openmortal-0.7 @@ -14,7 +14,6 @@ COMMENT= Parody of Mortal Kombat with real characters GNU_CONFIGURE= yes USE_TOOLS+= gmake USE_PERL5= yes -USE_X11= yes REPLACE_PERL= data/script/*.pl diff --git a/games/openttd/Makefile b/games/openttd/Makefile index a76ac3c7fea..8e73b80c4bd 100644 --- a/games/openttd/Makefile +++ b/games/openttd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:02 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2005/06/01 18:02:51 jlam Exp $ DISTNAME= openttd-0.3.6-source PKGNAME= openttd-0.3.6 @@ -10,7 +10,6 @@ HOMEPAGE= http://www.openttd.com/ COMMENT= Open source clone of Transport Tycoon Deluxe USE_TOOLS+= gmake -USE_X11= yes DATA_DIR= ${PREFIX}/share/games/openttd diff --git a/games/plib/Makefile b/games/plib/Makefile index cd469987583..3a217c29754 100644 --- a/games/plib/Makefile +++ b/games/plib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/04/11 21:45:56 tv Exp $ +# $NetBSD: Makefile,v 1.15 2005/06/01 18:02:51 jlam Exp $ # DISTNAME= plib-1.6.0 @@ -10,11 +10,11 @@ MAINTAINER= rh@NetBSD.org HOMEPAGE= http://plib.sourceforge.net/ COMMENT= Libraries for writing portable games/realtime interactive apps -USE_X11= YES GNU_CONFIGURE= YES USE_LANGUAGES= c++ CPPFLAGS+= -Dunix=1 .include "../../graphics/Mesa/buildlink3.mk" .include "../../mk/ossaudio.buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/powermanga/Makefile b/games/powermanga/Makefile index eb8312d4b1a..845838d8381 100644 --- a/games/powermanga/Makefile +++ b/games/powermanga/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/04/11 21:45:56 tv Exp $ +# $NetBSD: Makefile,v 1.10 2005/06/01 18:02:52 jlam Exp $ # DISTNAME= powermanga-0.79 @@ -11,7 +11,6 @@ HOMEPAGE= http://linux.tlk.fr/games/Powermanga/ COMMENT= Arcade 2D shoot-em-up game GNU_CONFIGURE= yes -USE_X11= yes CONFIGURE_ARGS+= --localstatedir=${VARBASE} MAKE_ENV+= TOUCH=${TOUCH} diff --git a/games/quake/Makefile b/games/quake/Makefile index f6722a74bc5..49ca21635fd 100644 --- a/games/quake/Makefile +++ b/games/quake/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2005/05/22 20:08:02 jlam Exp $ +# $NetBSD: Makefile,v 1.36 2005/06/01 18:02:52 jlam Exp $ DISTNAME= q1source PKGNAME= quake-2.30 @@ -20,7 +20,6 @@ WRKSRC= ${WRKDIR} USE_TOOLS+= gmake MAKE_ENV+= MAINDIR=${WRKSRC} -USE_X11= yes MAKE_ENV+= MESA_DIR=${BUILDLINK_PREFIX.Mesa} MAKE_ENV+= X11BASE=${X11BASE} @@ -53,4 +52,5 @@ do-install: .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" .include "../../mk/ossaudio.buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/quake2forge/Makefile b/games/quake2forge/Makefile index eea986ffa77..450b29a9afd 100644 --- a/games/quake2forge/Makefile +++ b/games/quake2forge/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/05/22 20:08:02 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2005/06/01 18:02:52 jlam Exp $ # DISTNAME= quake2-0.2.1 @@ -14,7 +14,6 @@ COMMENT= Enhanced Quake II engine USE_TOOLS+= gmake USE_LIBTOOL= yes -USE_X11= yes GNU_CONFIGURE= yes USE_BUILTIN.glu= yes diff --git a/games/quake3arena-demo/Makefile b/games/quake3arena-demo/Makefile index 20bc493c847..066108c7aa9 100644 --- a/games/quake3arena-demo/Makefile +++ b/games/quake3arena-demo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/05/16 01:15:31 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2005/06/01 18:02:52 jlam Exp $ DISTNAME= linuxq3ademo-1_11-6_x86_gz PKGREVISION= 2 @@ -22,7 +22,7 @@ DEPENDS+= suse_x11>=6.3:../../emulators/${SUSE_DIR_PREFIX}_base DEPENDS+= suse_glx>=6.4:../../emulators/${SUSE_DIR_PREFIX}_glx .include "../../emulators/suse_linux/Makefile.application" .else -USE_X11= yes +.include "../../mk/x11.buildlink3.mk" .endif NO_CONFIGURE= yes diff --git a/games/quake3arena/Makefile b/games/quake3arena/Makefile index a730b4ec07c..deb96944417 100644 --- a/games/quake3arena/Makefile +++ b/games/quake3arena/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/05/16 01:15:31 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2005/06/01 18:02:52 jlam Exp $ DISTNAME= linuxq3apoint-1.32b.x86 PKGREVISION= 1 @@ -22,7 +22,6 @@ DEPENDS+= suse_x11>=6.3:../../emulators/${SUSE_DIR_PREFIX}_x11 DEPENDS+= suse_glx>=6.4:../../emulators/${SUSE_DIR_PREFIX}_glx .include "../../emulators/suse_linux/Makefile.application" .else -USE_X11= yes .endif NO_SRC_ON_FTP= no @@ -45,6 +44,8 @@ WRKSRC= ${WRKDIR} LIBDIR= ${PREFIX}/lib/lokigames/${BINNAME} SHAREDIR= ${PREFIX}/share/doc/lokigames +.include "../../mk/x11.buildlink3.mk" + do-build: ${SED} -e 's#@@PREFIX@@#${PREFIX}#g' \ -e 's#@@LIBDIR@@#${LIBDIR}#g' \ diff --git a/games/quake6/Makefile b/games/quake6/Makefile index 7e7da59524c..2644b2e1273 100644 --- a/games/quake6/Makefile +++ b/games/quake6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2005/05/22 20:08:02 jlam Exp $ +# $NetBSD: Makefile,v 1.29 2005/06/01 18:02:52 jlam Exp $ DISTNAME= quake-v6-bsd-kame PKGNAME= quake6-0.0 @@ -13,7 +13,6 @@ COMMENT= Quake over IPv6 DEPENDS= quakedata-[0-9]*:../../games/quakedata WRKSRC= ${WRKDIR}/quakeforge -USE_X11= yes post-extract: cd ${WRKSRC}; ${FIND} . -name \*.o -exec ${RM} {} \; @@ -35,4 +34,5 @@ CONFIGURE_ARGS+=--disable-asmopt --bindir=/bin .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" .include "../../mk/ossaudio.buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile index e1a36ddd4d1..dd4fcf8dd4f 100644 --- a/games/quakeforge/Makefile +++ b/games/quakeforge/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/05/22 20:28:47 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2005/06/01 18:02:52 jlam Exp $ DISTNAME= quakeforge-0.5.5 PKGREVISION= 2 @@ -15,7 +15,6 @@ CONFIGURE_ARGS+= --disable-xmms GNU_CONFIGURE= YES USE_TOOLS+= bison gmake USE_LIBTOOL= YES -USE_X11= YES SUBST_CLASSES+= dsp SUBST_STAGE.dsp= post-patch diff --git a/games/rocksndiamonds/Makefile.common b/games/rocksndiamonds/Makefile.common index 2fe692e3968..2b957606ae3 100644 --- a/games/rocksndiamonds/Makefile.common +++ b/games/rocksndiamonds/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.13 2005/05/22 20:08:03 jlam Exp $ +# $NetBSD: Makefile.common,v 1.14 2005/06/01 18:02:52 jlam Exp $ DISTNAME= rocksndiamonds-3.1.0 CATEGORIES= games x11 @@ -9,7 +9,6 @@ HOMEPAGE= http://www.artsoft.org/rocksndiamonds/ USE_TOOLS+= gmake USE_PKGINSTALL= YES -USE_X11= YES INSTALLATION_DIRS= man/man6 @@ -30,6 +29,8 @@ MAKE_ENV+= HAVE_JOYSTICK=1 SCORE_PATH= ${VARBASE}/games/rocksndiamonds +.include "../../mk/x11.buildlink3.mk" + pre-configure: @${SED} -e "s,@SCORE_PATH@,${SCORE_PATH},g" \ ${WRKSRC}/Makefile > ${WRKSRC}/Makefile.fixed && \ diff --git a/games/rtcw/Makefile b/games/rtcw/Makefile index a8fc62984a9..17afb597260 100644 --- a/games/rtcw/Makefile +++ b/games/rtcw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/05/16 01:15:32 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:02:52 jlam Exp $ DISTNAME= wolf-linux-1.33.x86 PKGNAME= rtcw-1.33 @@ -31,7 +31,7 @@ PKGSRC_USE_TOOLS+= gtar DEPENDS+= suse_base>=6.3:../../emulators/${SUSE_DIR_PREFIX}_base .include "../../emulators/suse_linux/Makefile.application" .else -USE_X11= yes +.include "../../mk/x11.buildlink3.mk" .endif pre-extract: diff --git a/games/scummvm/options.mk b/games/scummvm/options.mk index 8f1c1a5729b..45f27fe706b 100644 --- a/games/scummvm/options.mk +++ b/games/scummvm/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2005/05/31 10:01:36 dillo Exp $ +# $NetBSD: options.mk,v 1.4 2005/06/01 18:02:52 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.scummvm PKG_SUPPORTED_OPTIONS= sdl x11 @@ -12,7 +12,7 @@ CONFIGURE_ARGS+= --backend=sdl .endif .if !empty(PKG_OPTIONS:Mx11) -USE_X11= yes CONFIGURE_ARGS+= --backend=x11 .include "../../mk/ossaudio.buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .endif diff --git a/games/sirius/Makefile b/games/sirius/Makefile index 203d7040863..b9194dbe792 100644 --- a/games/sirius/Makefile +++ b/games/sirius/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/05/22 20:08:03 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2005/06/01 18:02:52 jlam Exp $ # DISTNAME= sirius-0.8.0 @@ -17,7 +17,6 @@ USE_DIRS+= xdg-1.1 USE_TOOLS+= gmake USE_LIBTOOL= YES USE_PKGLOCALEDIR= YES -USE_X11= YES .include "../../devel/GConf2/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/games/spellcast/Makefile b/games/spellcast/Makefile index 89d67ac377a..18a9f9a8f22 100644 --- a/games/spellcast/Makefile +++ b/games/spellcast/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/04/11 21:45:57 tv Exp $ +# $NetBSD: Makefile,v 1.8 2005/06/01 18:02:52 jlam Exp $ # DISTNAME= spellcast @@ -12,5 +12,6 @@ HOMEPAGE= http://www.eblong.com/zarf/spellcast.html COMMENT= Game of dueling wizards for two players USE_X11BASE= yes +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/starfighter/Makefile b/games/starfighter/Makefile index e549abaef63..85965f430af 100644 --- a/games/starfighter/Makefile +++ b/games/starfighter/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:03 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2005/06/01 18:02:52 jlam Exp $ # DISTNAME= starfighter-1.1-1 @@ -13,7 +13,6 @@ COMMENT= Old school 2D shoot them up USE_TOOLS+= gmake USE_LANGUAGES+= c++ -USE_X11= yes WRKSRC= ${WRKDIR}/${DISTNAME:S/-1$//} MAKEFILE= makefile diff --git a/games/tileworld/Makefile b/games/tileworld/Makefile index 35077c73507..3fe0db01ada 100644 --- a/games/tileworld/Makefile +++ b/games/tileworld/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/05/22 20:08:03 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2005/06/01 18:02:52 jlam Exp $ DISTNAME= tworld-1.2.1 PKGNAME= ${DISTNAME:S/^t/tile/} @@ -11,7 +11,6 @@ HOMEPAGE= http://www.muppetlabs.com/~breadbox/software/tworld/ COMMENT= "Game based on Chip's Challenge" USE_TOOLS+= date gmake -USE_X11= YES GNU_CONFIGURE= YES BUILD_TARGET= tworld diff --git a/games/urban/Makefile b/games/urban/Makefile index ae8a6926d18..c3fa3bfed82 100644 --- a/games/urban/Makefile +++ b/games/urban/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/04/11 21:45:57 tv Exp $ +# $NetBSD: Makefile,v 1.9 2005/06/01 18:02:52 jlam Exp $ # DISTNAME= urban-1.5.3 @@ -10,7 +10,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://urban.bengburken.net/eng/ COMMENT= U.R.B.A.N The Cyborg Project -USE_X11= yes GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} diff --git a/games/wormz/Makefile b/games/wormz/Makefile index 635eabebf96..fc8c7eddc0c 100644 --- a/games/wormz/Makefile +++ b/games/wormz/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:03 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2005/06/01 18:02:52 jlam Exp $ # DISTNAME= Wormz-1.0b5 @@ -11,9 +11,10 @@ HOMEPAGE= http://lide.punknet.cz/miri/wormz.html COMMENT= Networked game for X11 WRKSRC= ${WRKDIR}/Wormz -USE_X11= yes USE_TOOLS+= gmake +.include "../../mk/x11.buildlink3.mk" + post-extract: ${MKDIR} ${WRKSRC}/NetBSD ${TOUCH} ${WRKSRC}/NetBSD/.depend diff --git a/games/xarchon/Makefile b/games/xarchon/Makefile index 69caaaa9ffe..e1bf8b39f97 100644 --- a/games/xarchon/Makefile +++ b/games/xarchon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2005/05/22 20:08:03 jlam Exp $ +# $NetBSD: Makefile,v 1.33 2005/06/01 18:02:52 jlam Exp $ # DISTNAME= xarchon-0.60 @@ -13,7 +13,6 @@ COMMENT= Chess-like strategy game with battle options USE_TOOLS+= gmake GNU_CONFIGURE= YES -USE_X11= YES USE_LANGUAGES= c c++ .include "../../mk/bsd.prefs.mk" diff --git a/games/xboard/Makefile b/games/xboard/Makefile index fc7a9c411ca..f976607a71d 100644 --- a/games/xboard/Makefile +++ b/games/xboard/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2005/04/11 21:45:58 tv Exp $ +# $NetBSD: Makefile,v 1.27 2005/06/01 18:02:52 jlam Exp $ DISTNAME= xboard-4.2.6 PKGREVISION= 1 @@ -12,7 +12,6 @@ COMMENT= Graphical frontend for chess engines and servers CONFIGURE_ARGS+= --enable-xpm CONFIGURE_ARGS+= --enable-zippy # interface to ICS GNU_CONFIGURE= # defined -USE_X11= # defined INFO_FILES= xboard.info diff --git a/games/xbomb/Makefile b/games/xbomb/Makefile index b87cbfc06ad..214d3c13565 100644 --- a/games/xbomb/Makefile +++ b/games/xbomb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:03 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2005/06/01 18:02:52 jlam Exp $ DISTNAME= xbomb-2.1a CATEGORIES= games x11 @@ -12,7 +12,6 @@ HOMEPAGE= http://www.gedanken.demon.co.uk/xbomb/ COMMENT= Square, hexagonal, and triangual minesweeper clone USE_TOOLS+= gmake -USE_X11= yes BUILD_TARGET= xbomb MAKE_ENV+= SCORE_PATH="${SCORE_PATH}" @@ -25,6 +24,8 @@ PKG_GROUPS= ${SCORE_GROUP} PLIST_SUBST+= SCORE_PATH=${SCORE_PATH} PLIST_SUBST+= GAME_DIR="${INSTALL} -d -o ${SCORE_USER} -g ${SCORE_GROUP} -m 775" +.include "../../mk/x11.buildlink3.mk" + post-install: ${INSTALL_DATA_DIR} ${SCORE_PATH} .for score in . xbomb3.hi xbomb4.hi xbomb6.hi diff --git a/games/xbomber/Makefile b/games/xbomber/Makefile index f446cf5542f..c504bea6880 100644 --- a/games/xbomber/Makefile +++ b/games/xbomber/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2004/01/20 12:15:41 agc Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/01 18:02:52 jlam Exp $ # DISTNAME= xbomber.0.8 @@ -13,7 +13,8 @@ COMMENT= Colorful game where you blow other people/robots up WRKSRC= ${WRKDIR}/xbomber MAKEFILE= makefile -USE_X11= yes + +.include "../../mk/x11.buildlink3.mk" pre-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xbomber diff --git a/games/xbreaky/Makefile b/games/xbreaky/Makefile index 1f42be1b5ea..cb39df357af 100644 --- a/games/xbreaky/Makefile +++ b/games/xbreaky/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/04/11 21:45:58 tv Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/01 18:02:52 jlam Exp $ # DISTNAME= xbreaky-0.0.5 @@ -11,7 +11,6 @@ HOMEPAGE= http://xbreaky.sourceforge.net/ COMMENT= Breakout game for X11 USE_DIRS+= xdg-1.1 -USE_X11= YES .include "../../graphics/xpm/buildlink3.mk" .include "../../mk/ossaudio.buildlink3.mk" diff --git a/games/xdoom/Makefile b/games/xdoom/Makefile index 0e0f20ffbc9..f02bcaeaebf 100644 --- a/games/xdoom/Makefile +++ b/games/xdoom/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2005/05/22 20:08:03 jlam Exp $ +# $NetBSD: Makefile,v 1.29 2005/06/01 18:02:52 jlam Exp $ DISTNAME= linuxdoom-1.10 PKGNAME= xdoom-1.10 @@ -38,6 +38,7 @@ CFLAGS+= -D__BIG_ENDIAN__=1 .endif .include "../../mk/ossaudio.buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" post-extract: (cd ${WRKDIR}; ${GTAR} xzf linuxdoom-1.10.src.tgz) diff --git a/games/xevil/Makefile b/games/xevil/Makefile index 06021b89d09..24b7a05dab7 100644 --- a/games/xevil/Makefile +++ b/games/xevil/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/04/11 21:45:58 tv Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 18:02:52 jlam Exp $ DISTNAME= xevilsrc2.02r2 PKGNAME= xevil-2.02 @@ -12,7 +12,6 @@ COMMENT= Side scrolling, bloody action game MAKEFILE= makefile -USE_X11= yes BUILD_TARGET= pkgsrc WRKSRC= ${WRKDIR} diff --git a/games/xfreecell/Makefile b/games/xfreecell/Makefile index 568695d4e89..c76219253bc 100644 --- a/games/xfreecell/Makefile +++ b/games/xfreecell/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:03 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/06/01 18:02:53 jlam Exp $ DISTNAME= xfreecell-1.0.5b CATEGORIES= games @@ -18,4 +18,5 @@ NO_CONFIGURE= YES MAKE_ENV+= GMAKE=${GMAKE:Q} +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/xfrisk/Makefile b/games/xfrisk/Makefile index 0467497e3fa..167e9b845bc 100644 --- a/games/xfrisk/Makefile +++ b/games/xfrisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:03 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 18:02:53 jlam Exp $ # DISTNAME= xfrisk-1.2 @@ -12,7 +12,6 @@ COMMENT= X11 version of the classic Risk board game WRKSRC= ${WRKDIR}/XFrisk USE_TOOLS+= gmake -USE_X11= yes RESTRICTED= "Possible trademark infringement" NO_SRC_ON_CDROM=${RESTRICTED} diff --git a/games/xgalaga/Makefile b/games/xgalaga/Makefile index 906f6c04350..445a9f9c77c 100644 --- a/games/xgalaga/Makefile +++ b/games/xgalaga/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/04/11 21:45:58 tv Exp $ +# $NetBSD: Makefile,v 1.21 2005/06/01 18:02:53 jlam Exp $ DISTNAME= xgalaga-2.0.34 PKGREVISION= 2 @@ -10,7 +10,6 @@ COMMENT= Very fast true-to-the-original port of galaga for X11 NO_SRC_ON_FTP= "already in MASTER_SITE_LOCAL" -USE_X11= YES GNU_CONFIGURE= YES GNU_CONFIGURE_PREFIX= ${PREFIX}/share/xgalaga CONFIGURE_ARGS+= --exec-prefix=${PREFIX}/bin diff --git a/games/xgospel/Makefile b/games/xgospel/Makefile index e54229e6f9b..26f90c8af97 100644 --- a/games/xgospel/Makefile +++ b/games/xgospel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/04/11 21:45:58 tv Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:53 jlam Exp $ # DISTNAME= xgospel-1.12d @@ -11,7 +11,6 @@ HOMEPAGE= http://gailly.net/xgospel/ COMMENT= X11 based IGS client for online "go" playing GNU_CONFIGURE= yes -USE_X11= yes XAW_TYPE= 3d .include "../../mk/bsd.prefs.mk" diff --git a/games/xjump/Makefile b/games/xjump/Makefile index 66cd3615d99..5882cca6ec0 100644 --- a/games/xjump/Makefile +++ b/games/xjump/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/04/11 21:45:58 tv Exp $ +# $NetBSD: Makefile,v 1.6 2005/06/01 18:02:53 jlam Exp $ DISTNAME= xjump_2.7.5.orig PKGNAME= xjump-2.7.5 @@ -13,7 +13,6 @@ COMMENT= Jumping game for X WRKSRC= ${WRKDIR}/xjump-2.7.5.orig BUILD_TARGET= xjump -USE_X11= YES do-install: ${INSTALL} -g games -m 2755 ${WRKSRC}/xjump ${PREFIX}/bin/xjump diff --git a/games/xmahjongg/Makefile b/games/xmahjongg/Makefile index af95f1b269d..d82dd2e2294 100644 --- a/games/xmahjongg/Makefile +++ b/games/xmahjongg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/04/11 21:45:58 tv Exp $ +# $NetBSD: Makefile,v 1.21 2005/06/01 18:02:53 jlam Exp $ # DISTNAME= xmahjongg-3.6.1 @@ -9,8 +9,8 @@ MAINTAINER= salo@NetBSD.org HOMEPAGE= http://www.lcdf.org/~eddietwo/xmahjongg/ COMMENT= The Chinese game of Mah Jongg for X11 -USE_X11= YES GNU_CONFIGURE= YES USE_LANGUAGES= c c++ +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/xnibbles/Makefile b/games/xnibbles/Makefile index 0a4dc3c01f5..26ee00110e2 100644 --- a/games/xnibbles/Makefile +++ b/games/xnibbles/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:03 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2005/06/01 18:02:53 jlam Exp $ # DISTNAME= xnibbles-1.0BETA4 @@ -14,7 +14,6 @@ COMMENT= Winding snakes game for X11 WRKSRC= ${WRKDIR}/xnibbles USE_TOOLS+= gmake USE_LANGUAGES= c c++ -USE_X11= YES SUBST_CLASSES+= audio SUBST_STAGE.audio= pre-build diff --git a/games/xracer/Makefile b/games/xracer/Makefile index ed79821a0f2..0e8d04a3d10 100644 --- a/games/xracer/Makefile +++ b/games/xracer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2005/05/22 20:08:04 jlam Exp $ +# $NetBSD: Makefile,v 1.33 2005/06/01 18:02:53 jlam Exp $ # DISTNAME= xracer-0.96.9 @@ -12,7 +12,6 @@ COMMENT= XRacer is a clone of the popular Psygnosis game Wipeout BUILD_USES_MSGFMT= # defined -USE_X11= # defined USE_TOOLS+= gmake USE_PERL5= # defined PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/XRacer/.packlist @@ -41,5 +40,6 @@ pre-patch: .include "../../devel/gettext-lib/buildlink3.mk" .include "../../graphics/Mesa/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/automake.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/xrick/Makefile b/games/xrick/Makefile index 06521f11379..866a70599bc 100644 --- a/games/xrick/Makefile +++ b/games/xrick/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:04 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2005/06/01 18:02:53 jlam Exp $ # DISTNAME= xrick-021212 @@ -19,7 +19,6 @@ NO_SRC_ON_FTP= ${RESTRICTED} USE_TOOLS+= gmake PKGSRC_USE_TOOLS+= gunzip -USE_X11= YES SUBST_CLASSES+= data SUBST_STAGE.data= post-patch diff --git a/games/xroach/Makefile b/games/xroach/Makefile index 1b3c68b89c2..bee740436a4 100644 --- a/games/xroach/Makefile +++ b/games/xroach/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/03/27 17:13:40 kristerw Exp $ +# $NetBSD: Makefile,v 1.6 2005/06/01 18:02:53 jlam Exp $ # DISTNAME= xroach @@ -13,6 +13,6 @@ COMMENT= Cockroaches hide under your windows DIST_SUBDIR= xroach-4.4 DECOMPRESS_CMD= ${CAT} MANCOMPRESSED_IF_MANZ= yes -USE_X11= YES +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/xroads/Makefile b/games/xroads/Makefile index a048a4ae6dd..02c89eee68f 100644 --- a/games/xroads/Makefile +++ b/games/xroads/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/02/21 20:26:11 hubertf Exp $ +# $NetBSD: Makefile,v 1.8 2005/06/01 18:02:53 jlam Exp $ # DISTNAME= xroads-v0.5 @@ -11,6 +11,6 @@ HOMEPAGE= http://apps.freshmeat.net/homepage/898367442/ COMMENT= Overhead view maze-based shoot 'em up game WRKSRC= ${WRKDIR}/xroads-v0.5 -USE_X11= YES +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/xsc/Makefile b/games/xsc/Makefile index 98be52e6437..02fa824f6c0 100644 --- a/games/xsc/Makefile +++ b/games/xsc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/04/11 21:45:58 tv Exp $ +# $NetBSD: Makefile,v 1.3 2005/06/01 18:02:53 jlam Exp $ # DISTNAME= xsc-1.5 @@ -9,10 +9,11 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.panix.com/~mbh/xsc/ COMMENT= Star Castle clone -USE_X11= yes GNU_CONFIGURE= yes USE_LANGUAGES= c++ +.include "../../mk/x11.buildlink3.mk" + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xsc ${PREFIX}/bin/xsc ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xsc diff --git a/games/xtris/Makefile b/games/xtris/Makefile index e2b77a59f24..76a9deea272 100644 --- a/games/xtris/Makefile +++ b/games/xtris/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/05/31 21:47:34 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2005/06/01 18:02:53 jlam Exp $ # DISTNAME= xtris-1.15 @@ -14,6 +14,8 @@ USE_X11BASE= yes .include "options.mk" +.include "../../mk/x11.buildlink3.mk" + do-install: ${INSTALL} -o bin -g games -m 2755 ${WRKSRC}/xtris ${PREFIX}/bin/xtris ${INSTALL} -o bin -g games -m 2755 ${WRKSRC}/xtbot ${PREFIX}/bin/xtbot diff --git a/games/xtux/Makefile b/games/xtux/Makefile index e14288caaf8..2e5f1ff67f6 100644 --- a/games/xtux/Makefile +++ b/games/xtux/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/04/11 21:45:59 tv Exp $ +# $NetBSD: Makefile,v 1.16 2005/06/01 18:02:53 jlam Exp $ DISTNAME= xtux-arena-src-nov-15 PKGNAME= xtux-0.2000.11.15 @@ -11,7 +11,6 @@ HOMEPAGE= http://xtux.sourceforge.net/ COMMENT= 2D multi-player shootout using images from the Open Software scene WRKSRC= ${WRKDIR}/xtux -USE_X11= YES do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/xtux diff --git a/games/xworm/Makefile b/games/xworm/Makefile index 64d19232ae2..5b304f3c918 100644 --- a/games/xworm/Makefile +++ b/games/xworm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/03/24 21:12:54 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 18:02:53 jlam Exp $ DISTNAME= xworm102 PKGNAME= xworm-1.02 @@ -10,7 +10,8 @@ COMMENT= Classic game with apples and hungry worm WRKSRC= ${WRKDIR}/XWorm BUILD_TARGET= bsd -USE_X11= yes + +.include "../../mk/x11.buildlink3.mk" do-install: @ ${INSTALL_PROGRAM} ${WRKSRC}/xworm ${PREFIX}/bin diff --git a/games/xzip/Makefile b/games/xzip/Makefile index f67ec27aba1..1313ebf19d7 100644 --- a/games/xzip/Makefile +++ b/games/xzip/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/04/11 21:45:59 tv Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:53 jlam Exp $ DISTNAME= xzip180 PKGNAME= xzip-1.8 @@ -14,4 +14,5 @@ WRKSRC= ${WRKDIR}/xzip USE_X11BASE= yes BUILD_TARGET= xzip +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/zoom/Makefile b/games/zoom/Makefile index a2755deb97c..927fb5baff1 100644 --- a/games/zoom/Makefile +++ b/games/zoom/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/05/22 20:08:04 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/01 18:02:53 jlam Exp $ # DISTNAME= zoom-1.0.1 @@ -18,7 +18,6 @@ COMMENT= Plays Infocom-compatible games, with graphics support USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes -USE_X11= yes USE_TOOLS+= gmake USE_PERL5= build diff --git a/geography/mapserver/Makefile b/geography/mapserver/Makefile index 43196efe03b..cf270260cf8 100644 --- a/geography/mapserver/Makefile +++ b/geography/mapserver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/04/11 21:45:59 tv Exp $ +# $NetBSD: Makefile,v 1.9 2005/06/01 18:02:53 jlam Exp $ # DISTNAME= mapserver-4.0 @@ -11,7 +11,6 @@ HOMEPAGE= http://mapserver.gis.umn.edu/ COMMENT= Environment for building spatially enabled Internet apps USE_PKGLOCALEDIR= yes -USE_X11= yes GNU_CONFIGURE= yes USE_LANGUAGES= c c++ diff --git a/geography/vis5d+/Makefile b/geography/vis5d+/Makefile index c36b832afd5..7976578cb25 100644 --- a/geography/vis5d+/Makefile +++ b/geography/vis5d+/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/04/11 21:45:59 tv Exp $ +# $NetBSD: Makefile,v 1.6 2005/06/01 18:02:53 jlam Exp $ # DISTNAME= vis5d+-1.2.1 @@ -12,9 +12,9 @@ COMMENT= Volumetric Visualization program for scientific datasets USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes -USE_X11= yes GNU_CONFIGURE= yes .include "../../graphics/Mesa/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/3DKit/Makefile.common b/graphics/3DKit/Makefile.common index 2f48048ce1f..8bb477e9b3f 100644 --- a/graphics/3DKit/Makefile.common +++ b/graphics/3DKit/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.8 2005/05/22 20:08:04 jlam Exp $ +# $NetBSD: Makefile.common,v 1.9 2005/06/01 18:02:53 jlam Exp $ # DISTNAME= 3DKit-0.3.1r2 @@ -15,5 +15,6 @@ DESCR_SRC?= ${.CURDIR}/../../graphics/3DKit/DESCR NO_CONFIGURE= YES USE_TOOLS+= gmake -USE_X11= YES MAKEFILE= GNUmakefile + +.include "../../mk/x11.buildlink3.mk" diff --git a/graphics/Cenon/Makefile b/graphics/Cenon/Makefile index 995479945b8..591fec957e4 100644 --- a/graphics/Cenon/Makefile +++ b/graphics/Cenon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/05/05 05:59:17 rh Exp $ +# $NetBSD: Makefile,v 1.3 2005/06/01 18:02:53 jlam Exp $ # DISTNAME= Cenon-3.67 @@ -11,7 +11,6 @@ HOMEPAGE= http://www.cenon.info/ COMMENT= Vector graphics / CAD / DTP program WRKSRC= ${WRKDIR}/Cenon -USE_X11= yes NO_CONFIGURE= yes post-install: diff --git a/graphics/ImageMagick/options.mk b/graphics/ImageMagick/options.mk index 87765944f7f..3cb56dce257 100644 --- a/graphics/ImageMagick/options.mk +++ b/graphics/ImageMagick/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2005/05/31 10:01:36 dillo Exp $ +# $NetBSD: options.mk,v 1.3 2005/06/01 18:02:53 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.ImageMagick PKG_SUPPORTED_OPTIONS= x11 @@ -9,10 +9,10 @@ PKG_SUGGESTED_OPTIONS= x11 .if !empty(PKG_OPTIONS:Mx11) BUILDLINK_DEPENDS.jasper+= jasper>=1.701.0 DEPENDS+= mpeg2codec-1.2:../../graphics/mpeg2codec -USE_X11= YES .include "../../graphics/jasper/buildlink3.mk" .include "../../graphics/libwmf/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .else CONFIGURE_ARGS+= --without-x .endif diff --git a/graphics/ImageViewer/Makefile b/graphics/ImageViewer/Makefile index 00cf8da0881..f9e559472a3 100644 --- a/graphics/ImageViewer/Makefile +++ b/graphics/ImageViewer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/04/11 21:46:00 tv Exp $ +# $NetBSD: Makefile,v 1.16 2005/06/01 18:02:54 jlam Exp $ DISTNAME= ImageViewer-0.6.3 CATEGORIES= graphics gnustep @@ -9,7 +9,6 @@ HOMEPAGE= http://www.nice.ch/~phip/softcorner.html COMMENT= GNUstep image display application NO_CONFIGURE= yes -USE_X11= yes .include "../../x11/gnustep-back/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/graphics/Mesa/Makefile.common b/graphics/Mesa/Makefile.common index 71312cc03f6..d261b562f9f 100644 --- a/graphics/Mesa/Makefile.common +++ b/graphics/Mesa/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.41 2005/04/11 21:46:00 tv Exp $ +# $NetBSD: Makefile.common,v 1.42 2005/06/01 18:02:54 jlam Exp $ DISTNAME= MesaLib-${MESA_VERSION} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -16,7 +16,6 @@ HOMEPAGE= http://www.mesa3d.org/ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_LIBTOOL= yes -USE_X11= yes BUILDING_MESA= yes NO_CONFIGURE= yes @@ -28,6 +27,7 @@ INSTALLATION_DIRS+= lib .include "../../mk/compiler.mk" .include "../../mk/bsd.prefs.mk" +.include "../../mk/x11.buildlink3.mk" # Mesa has proper support for Solaris and SunPro, use it. .if ${OPSYS} == "SunOS" diff --git a/graphics/Mesa/version.mk b/graphics/Mesa/version.mk index ee9c85049e2..4ec62dfb63a 100644 --- a/graphics/Mesa/version.mk +++ b/graphics/Mesa/version.mk @@ -1,31 +1,16 @@ -# $NetBSD: version.mk,v 1.10 2005/04/30 02:16:12 jlam Exp $ +# $NetBSD: version.mk,v 1.11 2005/06/01 18:02:54 jlam Exp $ # # This file computes the version number of the Mesa distributed with -# XFree86 and stores it in ${_MESA_VERSION}. +# XFree86 and stores it in ${BUILTIN_VERSION.Mesa}. # # NOTE: This file should only be used by the Mesa-related builtin.mk files. # -.if !defined(MESA_VERSION_MK) -MESA_VERSION_MK= # defined -.include "../../mk/bsd.prefs.mk" +BUILTIN_FILES_VAR:= H_MESA +BUILTIN_FILES.H_MESA= ${X11BASE}/include/GL/gl.h +.include "../../mk/buildlink3/find-files.mk" -_GL_GL_H= ${X11BASE}/include/GL/gl.h -_MESA_GL_VERSIONS= 1.2 1.3 1.4 1.5 -.for _glvers_ in ${_MESA_GL_VERSIONS} -. if !defined(_MESA_GL_VERSION_${_glvers_}) -_MESA_GL_VERSION_${_glvers_}?= no -. if exists(${_GL_GL_H}) -_MESA_GL_VERSION_${_glvers_}!= \ - if ${GREP} "\#define[ ]*GL_VERSION_${_glvers_:S/./_/}[ ]*1" ${_GL_GL_H} >/dev/null 2>&1; then \ - ${ECHO} "yes"; \ - else \ - ${ECHO} "no"; \ - fi -. endif -MAKEFLAGS+= _MESA_GL_VERSION_${_glvers_}=${_MESA_GL_VERSION_${_glvers_}} -. endif -.endfor +.if !defined(BUILTIN_VERSION.Mesa) && exists(${H_MESA}) # # According to the Mesa documentation, for stable releases: # @@ -34,44 +19,12 @@ MAKEFLAGS+= _MESA_GL_VERSION_${_glvers_}=${_MESA_GL_VERSION_${_glvers_}} # Mesa-4.0.4 implements OpenGL 1.3, # Mesa-3.4.2 implements OpenGL 1.2. # -.if !empty(_MESA_GL_VERSION_1.5:M[yY][eE][sS]) -_MESA_VERSION?= 6.0 -.elif !empty(_MESA_GL_VERSION_1.4:M[yY][eE][sS]) -_MESA_VERSION?= 5.0 -.elif !empty(_MESA_GL_VERSION_1.3:M[yY][eE][sS]) -_MESA_VERSION?= 4.0.4 -.elif !empty(_MESA_GL_VERSION_1.2:M[yY][eE][sS]) -_MESA_VERSION?= 3.4.2 -.else -_MESA_VERSION?= 0 +BUILTIN_VERSION.Mesa!= \ + ${AWK} '/\#define[ ]*GL_VERSION_1_2/ { v = "3.4.2" } \ + /\#define[ ]*GL_VERSION_1_3/ { v = "4.0.4" } \ + /\#define[ ]*GL_VERSION_1_4/ { v = "5.0" } \ + /\#define[ ]*GL_VERSION_1_5/ { v = "6.0" } \ + END { printf "%s\n", v }' \ + ${H_MESA} .endif - -MESA_REQD?= 3.4.2 - -# Distill the MESA_REQD list into a single _MESA_REQD value that is the -# highest version of Mesa required. -# -_MESA_STRICTEST_REQD?= none -. for _version_ in ${MESA_REQD} -. for _pkg_ in Mesa-${_version_} -. if ${_MESA_STRICTEST_REQD} == "none" -_MESA_PKG_SATISFIES_DEP= yes -. for _vers_ in ${MESA_REQD} -. if !empty(_MESA_PKG_SATISFIES_DEP:M[yY][eE][sS]) -_MESA_PKG_SATISFIES_DEP!= \ - if ${PKG_ADMIN} pmatch 'Mesa>=${_vers_}' ${_pkg_}; then \ - ${ECHO} "yes"; \ - else \ - ${ECHO} "no"; \ - fi -. endif -. endfor -. if !empty(_MESA_PKG_SATISFIES_DEP:M[yY][eE][sS]) -_MESA_STRICTEST_REQD= ${_version_} -. endif -. endif -. endfor -. endfor -_MESA_REQD= ${_MESA_STRICTEST_REQD} - -.endif # MESA_VERSION_MK +MAKEVARS+= BUILTIN_VERSION.Mesa diff --git a/graphics/MesaLib/builtin-imake.mk b/graphics/MesaLib/builtin-imake.mk new file mode 100644 index 00000000000..43855010f0a --- /dev/null +++ b/graphics/MesaLib/builtin-imake.mk @@ -0,0 +1,12 @@ +XCOMM $NetBSD: builtin-imake.mk,v 1.1 2005/06/01 18:02:54 jlam Exp $ + +/* + * Check the value of BuildGLXLibrary for the presence of + * MesaLib in the X11 distribution. + */ +builtin-test: +#if BuildGLXLibrary + @echo yes +#else + @echo no +#endif diff --git a/graphics/MesaLib/builtin.mk b/graphics/MesaLib/builtin.mk index 1ed8a68b14a..75cd1ec51bf 100644 --- a/graphics/MesaLib/builtin.mk +++ b/graphics/MesaLib/builtin.mk @@ -1,61 +1,88 @@ -# $NetBSD: builtin.mk,v 1.4 2004/03/29 05:43:30 jlam Exp $ +# $NetBSD: builtin.mk,v 1.5 2005/06/01 18:02:54 jlam Exp $ -_GL_GLX_H= ${X11BASE}/include/GL/glx.h -_X11_TMPL= ${X11BASE}/lib/X11/config/X11.tmpl +BUILTIN_PKG:= MesaLib -.include "../../graphics/Mesa/version.mk" -BUILDLINK_DEPENDS.MesaLib+= MesaLib>=${_MESA_REQD} +BUILTIN_FIND_FILES_VAR:= H_MESALIB +BUILTIN_FIND_FILES.H_MESALIB= ${X11BASE}/include/GL/glx.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.MesaLib) IS_BUILTIN.MesaLib= no -. if exists(${_GL_GLX_H}) && exists(${_X11_TMPL}) +. if exists(${H_MESALIB}) +PKGSRC_USE_TOOLS+= imake # XXX +IMAKE?= ${X11BASE}/bin/imake # XXX +. if defined(IMAKE) && exists(${IMAKE}) IS_BUILTIN.MesaLib!= \ - if ${GREP} -q BuildGLXLibrary ${_X11_TMPL}; then \ - ${ECHO} "yes"; \ - else \ - ${ECHO} "no"; \ - fi -. if !empty(IS_BUILTIN.MesaLib:M[yY][eE][sS]) -# -# _MESA_VERSION is defined by Mesa/version.mk to be the version of the -# Mesa software distributed with the built-in XFree86. -# -BUILTIN_PKG.MesaLib= MesaLib-${_MESA_VERSION} -BUILDLINK_VARS+= BUILTIN_PKG.MesaLib + ${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config \ + -f ${BUILDLINK_PKGSRCDIR.MesaLib}/builtin-imake.mk \ + -s - | \ + ${MAKE} -f - builtin-test . endif . endif -BUILDLINK_VARS+= IS_BUILTIN.MesaLib -.endif # IS_BUILTIN.MesaLib +.endif +MAKEVARS+= IS_BUILTIN.MesaLib +### +### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to +### a package name to represent the built-in package. +### +.if !defined(BUILTIN_PKG.MesaLib) && \ + !empty(IS_BUILTIN.MesaLib:M[yY][eE][sS]) && \ + exists(${H_MESALIB}) +. include "../../graphics/Mesa/version.mk" +BUILTIN_PKG.MesaLib= MesaLib-${BUILTIN_VERSION.Mesa} +.endif +MAKEVARS+= BUILTIN_PKG.MesaLib + +### +### 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.MesaLib) -USE_BUILTIN.MesaLib?= ${IS_BUILTIN.MesaLib} - -. if defined(BUILTIN_PKG.MesaLib) -USE_BUILTIN.MesaLib= yes -. for _depend_ in ${BUILDLINK_DEPENDS.MesaLib} -. if !empty(USE_BUILTIN.MesaLib:M[yY][eE][sS]) -USE_BUILTIN.MesaLib!= \ - if ${PKG_ADMIN} pmatch '${_depend_}' ${BUILTIN_PKG.MesaLib}; then \ - ${ECHO} "yes"; \ +. if ${PREFER.MesaLib} == "pkgsrc" +USE_BUILTIN.MesaLib= no +. else +USE_BUILTIN.MesaLib= ${IS_BUILTIN.MesaLib} +. if defined(BUILTIN_PKG.MesaLib) && \ + !empty(IS_BUILTIN.MesaLib:M[yY][eE][sS]) +USE_BUILTIN.MesaLib= yes +. for _dep_ in ${BUILDLINK_DEPENDS.MesaLib} +. if !empty(USE_BUILTIN.MesaLib:M[yY][eE][sS]) +USE_BUILTIN.MesaLib!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.MesaLib:Q}; then \ + ${ECHO} yes; \ else \ - ${ECHO} "no"; \ + ${ECHO} no; \ fi -. endif -. endfor -. endif -.endif # USE_BUILTIN.MesaLib +. endif +. endfor +. endif +. endif # PREFER.MesaLib +.endif +MAKEVARS+= USE_BUILTIN.MesaLib +### +### The section below only applies if we are not including this file +### solely to determine whether a built-in implementation exists. +### CHECK_BUILTIN.MesaLib?= no .if !empty(CHECK_BUILTIN.MesaLib:M[nN][oO]) -.if !empty(USE_BUILTIN.MesaLib:M[nN][oO]) +. if !empty(USE_BUILTIN.MesaLib:M[nN][oO]) BUILDLINK_DEPENDS.MesaLib+= MesaLib>=6.0 -.endif +. endif -.if !empty(USE_BUILTIN.MesaLib:M[yY][eE][sS]) +. if !empty(USE_BUILTIN.MesaLib:M[yY][eE][sS]) BUILDLINK_PREFIX.MesaLib= ${X11BASE} -USE_X11= yes -_MESA_REQD= ${_MESA_VERSION} -.endif +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +. include "../../mk/x11.buildlink3.mk" +. include "../../mk/x11.builtin.mk" +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +. endif .endif # CHECK_BUILTIN.MesaLib diff --git a/graphics/Ngraph/Makefile b/graphics/Ngraph/Makefile index f49cae88380..c531819bef4 100644 --- a/graphics/Ngraph/Makefile +++ b/graphics/Ngraph/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/05/22 20:08:04 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2005/06/01 18:02:54 jlam Exp $ # DISTNAME= Ngraph-6.3.30-src @@ -15,7 +15,6 @@ COMMENT= The 2D graph and data analysis program EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} -USE_X11= yes USE_TOOLS+= gmake PKGSRC_USE_TOOLS+= gtar diff --git a/graphics/OpenRM/Makefile b/graphics/OpenRM/Makefile index a47fac6cc56..8e4fe503d84 100644 --- a/graphics/OpenRM/Makefile +++ b/graphics/OpenRM/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/04/11 21:46:00 tv Exp $ +# $NetBSD: Makefile,v 1.8 2005/06/01 18:02:54 jlam Exp $ # DISTNAME= openrm-devel-1.5.2 @@ -11,7 +11,6 @@ MAINTAINER= root@garbled.net HOMEPAGE= http://www.openrm.org/ COMMENT= The OpenRM Scene Graph API -USE_X11= yes WRKSRC= ${WRKDIR}/rm152 BUILD_TARGET= freebsd docs MAKE_ENV+= AR=${AR} RM=${RM} CP=${CP} LN=${LN} ECHO_CMD=${ECHO} \ @@ -55,6 +54,7 @@ do-install: .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/Mesa/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../lang/perl5/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/PanoTools/Makefile b/graphics/PanoTools/Makefile index 594aa4b0924..8f3b976ac52 100644 --- a/graphics/PanoTools/Makefile +++ b/graphics/PanoTools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/04/11 21:46:00 tv Exp $ +# $NetBSD: Makefile,v 1.14 2005/06/01 18:02:54 jlam Exp $ # DISTNAME= PanoTools @@ -15,7 +15,6 @@ ONLY_FOR_PLATFORM= Linux-*-i[3-6]86 NetBSD-*-i386 WRKSRC= ${WRKDIR}/PTLinux USE_JAVA= run -USE_X11= YES NO_BUILD= YES .include "../../mk/bsd.prefs.mk" @@ -23,6 +22,8 @@ NO_BUILD= YES PKG_JVM?= sun-jdk PLIST_SUBST+= JAVA_HOME="${PKG_JAVA_HOME:C/^${PREFIX}\///}" +.include "../../mk/x11.buildlink3.mk" + do-install: ${INSTALL_DATA} ${WRKSRC}/libpano12.so ${EMULDIR}/lib ${LN} -s ${EMULDIR}/lib/libpano12.so \ diff --git a/graphics/SDL_image/Makefile b/graphics/SDL_image/Makefile index 63258ae80e9..c1266bd41f2 100644 --- a/graphics/SDL_image/Makefile +++ b/graphics/SDL_image/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/04/11 21:46:00 tv Exp $ +# $NetBSD: Makefile,v 1.21 2005/06/01 18:02:54 jlam Exp $ DISTNAME= SDL_image-1.2.4 PKGREVISION= 1 @@ -14,7 +14,6 @@ CONFLICTS= SDL-image-[0-9]* PKG_INSTALLATION_TYPES= overwrite pkgviews USE_LIBTOOL= YES -USE_X11= YES GNU_CONFIGURE= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig CONFIGURE_ARGS+= --enable-tif diff --git a/graphics/aalib-x11/Makefile b/graphics/aalib-x11/Makefile index 6ef9c564119..1d2e0b924b9 100644 --- a/graphics/aalib-x11/Makefile +++ b/graphics/aalib-x11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/04/11 21:46:00 tv Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/01 18:02:54 jlam Exp $ PKGNAME= aalib-x11-${BASE_VERS} CATEGORIES+= x11 @@ -7,7 +7,6 @@ COMMENT= ASCII Art library with X11 support PKG_INSTALLATION_TYPES= overwrite pkgviews -USE_X11= # defined BUILD_TARGET= libaa-x11.la INSTALL_TARGET= install-libLTLIBRARIES @@ -19,6 +18,8 @@ INSTALLATION_DIRS= bin include lib # BUILDLINK_TRANSFORM+= l:aa:aa-x11 +.include "../../mk/x11.buildlink3.mk" + post-patch: for file in ${WRKSRC}/src/Makefile.in; do \ ${SED} -e "s,libaa\.la,libaa-x11.la,g" \ diff --git a/graphics/aalib-x11/buildlink3.mk b/graphics/aalib-x11/buildlink3.mk index 0cdc02e5e2f..2c9b100ffb5 100644 --- a/graphics/aalib-x11/buildlink3.mk +++ b/graphics/aalib-x11/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:12 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2005/06/01 18:02:54 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ AALIB_X11_BUILDLINK3_MK:= ${AALIB_X11_BUILDLINK3_MK}+ @@ -21,7 +21,8 @@ BUILDLINK_TRANSFORM+= l:aa:aa-x11 AALIB_CONFIG= ${BUILDLINK_PREFIX.aalib-x11}/bin/aalib-x11-config CONFIGURE_ENV+= AALIB_CONFIG="${AALIB_CONFIG}" MAKE_ENV+= AALIB_CONFIG="${AALIB_CONFIG}" - .endif # AALIB_X11_BUILDLINK3_MK +.include "../../mk/x11.buildlink3.mk" + BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/graphics/aqsis/Makefile b/graphics/aqsis/Makefile index 78cdec18de8..ef4485a2255 100644 --- a/graphics/aqsis/Makefile +++ b/graphics/aqsis/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/05/22 20:08:04 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2005/06/01 18:02:54 jlam Exp $ # DISTNAME= aqsis-0.6.4 @@ -14,7 +14,6 @@ GNU_CONFIGURE= yes USE_LIBTOOL= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig USE_TOOLS+= gmake -USE_X11= yes GCC_REQD+= 2.95.3 USE_LANGUAGES+= c c++ @@ -22,5 +21,6 @@ USE_LANGUAGES+= c c++ .include "../../devel/libargparse/buildlink3.mk" .include "../../graphics/Mesa/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/autotrace/Makefile b/graphics/autotrace/Makefile index fb870185979..e8103e73dd4 100644 --- a/graphics/autotrace/Makefile +++ b/graphics/autotrace/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/04/11 21:46:00 tv Exp $ +# $NetBSD: Makefile,v 1.24 2005/06/01 18:02:54 jlam Exp $ # DISTNAME= autotrace-0.31.1 @@ -10,11 +10,11 @@ MAINTAINER= rh@NetBSD.org HOMEPAGE= http://autotrace.sourceforge.net/ COMMENT= Convert bitmap to vector graphics -USE_X11= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES PKGCONFIG_OVERRIDE= autotrace.pc.in .include "../../graphics/ImageMagick/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/aview-x11/Makefile b/graphics/aview-x11/Makefile index ce03731d137..ee17d73fd73 100644 --- a/graphics/aview-x11/Makefile +++ b/graphics/aview-x11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/04/11 21:46:00 tv Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/01 18:02:54 jlam Exp $ # DISTNAME= aview-1.3.0rc1 @@ -19,7 +19,6 @@ WRKSRC= ${WRKDIR}/aview-1.3.0 GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_PKGINSTALL= yes -USE_X11= yes .include "../../mk/bsd.prefs.mk" diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile index 13ca63d9e75..2ed1e057880 100644 --- a/graphics/blender/Makefile +++ b/graphics/blender/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2005/05/22 20:08:04 jlam Exp $ +# $NetBSD: Makefile,v 1.43 2005/06/01 18:02:54 jlam Exp $ # DISTNAME= blender-2.36 @@ -15,7 +15,6 @@ BUILD_DEPENDS+= scons>=0.96:../../devel/scons WRKSRC= ${WRKDIR}/blender -USE_X11= YES USE_TOOLS+= gmake USE_LIBTOOL= YES diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile index f7affd303a8..e240104c560 100644 --- a/graphics/cairo/Makefile +++ b/graphics/cairo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/04/11 21:46:00 tv Exp $ +# $NetBSD: Makefile,v 1.17 2005/06/01 18:02:54 jlam Exp $ DISTNAME= cairo-0.4.0 CATEGORIES= graphics @@ -10,7 +10,6 @@ COMMENT= Vector graphics library with cross-device output support USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes -USE_X11= yes GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE+= cairo.pc.in CONFIGURE_ARGS+= --disable-atsui diff --git a/graphics/cal3d-examples/Makefile b/graphics/cal3d-examples/Makefile index fcddfde5cb1..a35e8000722 100644 --- a/graphics/cal3d-examples/Makefile +++ b/graphics/cal3d-examples/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:00 tv Exp $ +# $NetBSD: Makefile,v 1.6 2005/06/01 18:02:54 jlam Exp $ # PKGNAME= cal3d-examples-${CAL3D_VERSION} @@ -11,7 +11,6 @@ DISTFILES= TheCallyDemo-0.9.1b.zip \ COMMENT= Tools and demos for cal3d library -USE_X11= YES CONFIGURE_ARGS+= --with-cal3d=${PREFIX} CONFIGURE_ARGS+= --with-glut=${PREFIX} CONFIGURE_DIRS= ${WRKSRC}/examples/cally \ @@ -49,6 +48,7 @@ post-install: .include "../../graphics/cal3d/buildlink3.mk" .include "../../graphics/Mesa/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/automake.mk" .include "../../mk/autoconf.mk" diff --git a/graphics/claraocr/Makefile b/graphics/claraocr/Makefile index 2cc9cd37ff8..1f1c8c6e2fb 100644 --- a/graphics/claraocr/Makefile +++ b/graphics/claraocr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:01 tv Exp $ +# $NetBSD: Makefile,v 1.6 2005/06/01 18:02:54 jlam Exp $ # DISTNAME= clara-0.9.9 @@ -15,7 +15,6 @@ COMMENT= Optical Character Recognition (OCR) program for books DEPENDS+= netpbm-[0-9]*:../../graphics/netpbm -USE_X11= YES REPLACE_PERL= clara.pl mkdoc.pl selthresh.pl # install a example input file @@ -23,4 +22,5 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/imre.pbm ${PREFIX}/share/doc/clara .include "../../lang/perl5/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/cqcam/Makefile b/graphics/cqcam/Makefile index 7834ac9e8e7..25bda779d8c 100644 --- a/graphics/cqcam/Makefile +++ b/graphics/cqcam/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/04/11 21:46:01 tv Exp $ +# $NetBSD: Makefile,v 1.24 2005/06/01 18:02:54 jlam Exp $ # DISTNAME= cqcam-0.45a @@ -17,7 +17,6 @@ LICENSE= no-profit HAS_CONFIGURE= YES USE_LANGUAGES= c c++ -USE_X11= YES CONFIGURE_ENV+= CAT=${CAT:Q} ECHO=${ECHO:Q} \ TCLCONFIG_SH=${TCLCONFIG_SH:Q} diff --git a/graphics/dia/Makefile.common b/graphics/dia/Makefile.common index 9334362ffe3..7721a928d31 100644 --- a/graphics/dia/Makefile.common +++ b/graphics/dia/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.5 2005/05/22 20:08:04 jlam Exp $ +# $NetBSD: Makefile.common,v 1.6 2005/06/01 18:02:54 jlam Exp $ # DISTNAME= dia-0.94 @@ -17,7 +17,6 @@ GNU_CONFIGURE= YES USE_TOOLS+= gmake USE_LIBTOOL= YES USE_PKGLOCALEDIR= YES -USE_X11= YES CONFIGURE_ARGS+= --without-python diff --git a/graphics/dvdview/Makefile b/graphics/dvdview/Makefile index 02b23609333..bc5b057d25e 100644 --- a/graphics/dvdview/Makefile +++ b/graphics/dvdview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:04 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2005/06/01 18:02:54 jlam Exp $ DISTNAME= dvdview-1.2.2 PKGREVISION= 2 @@ -11,7 +11,6 @@ COMMENT= Software only MPEG-1/2 video decoder GNU_CONFIGURE= YES USE_TOOLS+= gmake -USE_X11= YES .include "../../mk/bsd.prefs.mk" @@ -27,4 +26,5 @@ post-install: .include "../../graphics/libvideogfx/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/dxsamples/Makefile b/graphics/dxsamples/Makefile index 1e3ac8fe592..0befc9316c7 100644 --- a/graphics/dxsamples/Makefile +++ b/graphics/dxsamples/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/05/22 20:08:04 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2005/06/01 18:02:54 jlam Exp $ DISTNAME= dxsamples-4.3.2 CATEGORIES= graphics @@ -14,4 +14,5 @@ GNU_CONFIGURE= yes USE_TOOLS+= gmake USE_X11BASE= yes +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile index 9fae5073de7..409aaeae935 100644 --- a/graphics/eog2/Makefile +++ b/graphics/eog2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2005/05/22 20:08:04 jlam Exp $ +# $NetBSD: Makefile,v 1.42 2005/06/01 18:02:55 jlam Exp $ # DISTNAME= eog-2.10.0 @@ -13,7 +13,6 @@ COMMENT= Eye of GNOME: an image viewing and cataloging program BUILD_USES_MSGFMT= YES GNU_CONFIGURE= YES -USE_X11= YES USE_TOOLS+= gmake USE_DIRS+= gnome2-1.5 USE_PKGLOCALEDIR= YES diff --git a/graphics/feh/Makefile b/graphics/feh/Makefile index 18ca076ad91..5059b20bec6 100644 --- a/graphics/feh/Makefile +++ b/graphics/feh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/05/13 13:43:33 drochner Exp $ +# $NetBSD: Makefile,v 1.24 2005/06/01 18:02:55 jlam Exp $ # DISTNAME= feh-1.3.2 @@ -12,7 +12,6 @@ COMMENT= Advanced image viewer DEPENDS+= wget-[0-9]*:../../net/wget GNU_CONFIGURE= YES -USE_X11= YES CONFIGURE_ARGS+= --program-transform-name=s,cam,feh_cam, REPLACE_PERL= cam/cam @@ -21,4 +20,5 @@ BUILDLINK_DEPENDS.giblib+= giblib>=1.2.4 BUILDLINK_DEPENDS.jpeg+= jpeg>=6bnb3 # includes jpegint.h .include "../../devel/giblib/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/flphoto/Makefile b/graphics/flphoto/Makefile index 2be197c672a..08190dd523c 100644 --- a/graphics/flphoto/Makefile +++ b/graphics/flphoto/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:02 tv Exp $ +# $NetBSD: Makefile,v 1.3 2005/06/01 18:02:55 jlam Exp $ # DISTNAME= flphoto-1.2-source @@ -14,7 +14,6 @@ COMMENT= Image management and display program WRKSRC= ${WRKDIR}/flphoto-1.2 USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes -USE_X11= yes .include "../../x11/fltk/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" diff --git a/graphics/fly/Makefile b/graphics/fly/Makefile index 30a2f1a11df..974650c7420 100644 --- a/graphics/fly/Makefile +++ b/graphics/fly/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2005/04/11 21:46:02 tv Exp $ +# $NetBSD: Makefile,v 1.28 2005/06/01 18:02:55 jlam Exp $ DISTNAME= fly-1.6.5 PKGREVISION= 6 @@ -12,7 +12,6 @@ COMMENT= Command-file interface for creating and modifying PNG images BUILD_DEPENDS+= gif2png>=2.4.2:../../graphics/gif2png USE_PERL5= YES -USE_X11= YES REPLACE_PERL= examples/cgi-perl-example.pl \ examples/fly-tester.pl \ diff --git a/graphics/fnlib/Makefile b/graphics/fnlib/Makefile index af4dfde24b5..e41d7911489 100644 --- a/graphics/fnlib/Makefile +++ b/graphics/fnlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2005/04/11 21:46:02 tv Exp $ +# $NetBSD: Makefile,v 1.30 2005/06/01 18:02:55 jlam Exp $ # DISTNAME= fnlib-0.5 @@ -15,7 +15,6 @@ COMMENT= Color font rendering library for X11R6 DIST_SUBDIR= fnlib USE_PKGINSTALL= YES -USE_X11= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES diff --git a/graphics/freeglut/Makefile b/graphics/freeglut/Makefile index 5b54bb41696..8faae31aee6 100644 --- a/graphics/freeglut/Makefile +++ b/graphics/freeglut/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:02 tv Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:02:55 jlam Exp $ # DISTNAME= freeglut-2.2.0 @@ -15,8 +15,8 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_LIBTOOL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-replace-glut -USE_X11= yes .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/freetype-utils/Makefile b/graphics/freetype-utils/Makefile index 73bc196fe99..f75f54b6b6d 100644 --- a/graphics/freetype-utils/Makefile +++ b/graphics/freetype-utils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2004/12/03 15:14:59 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2005/06/01 18:02:55 jlam Exp $ .include "../freetype-lib/Makefile.common" @@ -8,12 +8,12 @@ COMMENT= Utilities for manipulating TrueType fonts BUILDLINK_DEPENDS.freetype= freetype-lib>=${FT_VERS} -USE_X11= # defined CONFIGURE_ARGS+= --with-x BUILD_TARGET= tttest INSTALL_TARGET= install-tttest .include "../../graphics/freetype-lib/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/freetype2/builtin-imake.mk b/graphics/freetype2/builtin-imake.mk new file mode 100644 index 00000000000..cf72049efe4 --- /dev/null +++ b/graphics/freetype2/builtin-imake.mk @@ -0,0 +1,12 @@ +XCOMM $NetBSD: builtin-imake.mk,v 1.1 2005/06/01 18:02:55 jlam Exp $ + +/* + * Check the value of BuildFreetype2Library for the presence of + * freetype2 in the X11 distribution. + */ +builtin-test: +#if BuildFreetype2Library + @echo yes +#else + @echo no +#endif diff --git a/graphics/freetype2/builtin.mk b/graphics/freetype2/builtin.mk index dca9a8947c7..05736c9b7bd 100644 --- a/graphics/freetype2/builtin.mk +++ b/graphics/freetype2/builtin.mk @@ -1,66 +1,92 @@ -# $NetBSD: builtin.mk,v 1.2 2004/03/29 05:43:31 jlam Exp $ +# $NetBSD: builtin.mk,v 1.3 2005/06/01 18:02:55 jlam Exp $ -_FREETYPE2_FREETYPE_H= ${X11BASE}/include/freetype2/freetype/freetype.h -_X11_TMPL= ${X11BASE}/lib/X11/config/X11.tmpl +BUILTIN_PKG:= freetype2 +BUILTIN_FIND_FILES_VAR:= H_FREETYPE2 +BUILTIN_FIND_FILES.H_FREETYPE2= ${X11BASE}/include/freetype2/freetype/freetype.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.freetype2) IS_BUILTIN.freetype2= no -. if exists(${_FREETYPE2_FREETYPE_H}) && exists(${_X11_TMPL}) +. if exists(${H_FREETYPE2}) +PKGSRC_USE_TOOLS+= imake # XXX +IMAKE?= ${X11BASE}/bin/imake # XXX +. if defined(IMAKE) && exists(${IMAKE}) IS_BUILTIN.freetype2!= \ - if ${GREP} -q BuildFreetype2Library ${_X11_TMPL}; then \ - ${ECHO} "yes"; \ - else \ - ${ECHO} "no"; \ - fi -. if !empty(IS_BUILTIN.freetype2:M[yY][eE][sS]) -# -# Create an appropriate package name for the built-in freetype2 distributed -# with the system. This package name can be used to check against -# BUILDLINK_DEPENDS.<pkg> to see if we need to install the pkgsrc version -# or if the built-in one is sufficient. -# -_FREETYPE2_MAJOR!= \ - ${AWK} '/\#define[ ]*FREETYPE_MAJOR/ { print $$3 }' ${_FREETYPE2_FREETYPE_H} -_FREETYPE2_MINOR!= \ - ${AWK} '/\#define[ ]*FREETYPE_MINOR/ { print "."$$3 }' ${_FREETYPE2_FREETYPE_H} -_FREETYPE2_PATCH!= \ - ${AWK} 'BEGIN { patch=0; } /\#define[ ]*FREETYPE_PATCH/ { patch=$$3; } END { print "."patch; }' ${_FREETYPE2_FREETYPE_H} -_FREETYPE2_VERSION= ${_FREETYPE2_MAJOR}${_FREETYPE2_MINOR}${_FREETYPE2_PATCH} -BUILTIN_PKG.freetype2= freetype2-${_FREETYPE2_VERSION} -BUILDLINK_VARS+= BUILTIN_PKG.freetype2 + ${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config \ + -f ${BUILDLINK_PKGSRCDIR.freetype2}/builtin-imake.mk \ + -s - | \ + ${MAKE} -f - builtin-test . endif . endif -BUILDLINK_VARS+= IS_BUILTIN.freetype2 -.endif # IS_BUILTIN.freetype2 +.endif +MAKEVARS+= IS_BUILTIN.freetype2 -.if !defined(USE_BUILTIN.freetype2) -USE_BUILTIN.freetype2?= ${IS_BUILTIN.freetype2} +### +### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to +### a package name to represent the built-in package. +### +.if !defined(BUILTIN_PKG.freetype2) && \ + !empty(IS_BUILTIN.freetype2:M[yY][eE][sS]) && \ + exists(${H_FREETYPE2}) +BUILTIN_VERSION.freetype2!= \ + ${AWK} 'BEGIN { p = ".0" } \ + /\#define[ ]*FREETYPE_MAJOR/ { M = $$3 } \ + /\#define[ ]*FREETYPE_MINOR/ { m = "."$$3 } \ + /\#define[ ]*FREETYPE_PATCH/ { p = "."$$3 } \ + END { printf "%s%s%s\n", M, m, p }' \ + ${H_FREETYPE2} +BUILTIN_PKG.freetype2= freetype2-${BUILTIN_VERSION.freetype2} +.endif +MAKEVARS+= BUILTIN_PKG.freetype2 -. if defined(BUILTIN_PKG.freetype2) +### +### 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.freetype2) +. if ${PREFER.freetype2} == "pkgsrc" +USE_BUILTIN.freetype2= no +. else +USE_BUILTIN.freetype2= ${IS_BUILTIN.freetype2} +. if defined(BUILTIN_PKG.freetype2) && \ + !empty(IS_BUILTIN.freetype2:M[yY][eE][sS]) USE_BUILTIN.freetype2= yes -. for _depend_ in ${BUILDLINK_DEPENDS.freetype2} -. if !empty(USE_BUILTIN.freetype2:M[yY][eE][sS]) -USE_BUILTIN.freetype2!= \ - if ${PKG_ADMIN} pmatch '${_depend_}' ${BUILTIN_PKG.freetype2}; then \ - ${ECHO} "yes"; \ +. for _dep_ in ${BUILDLINK_DEPENDS.freetype2} +. if !empty(USE_BUILTIN.freetype2:M[yY][eE][sS]) +USE_BUILTIN.freetype2!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.freetype2:Q}; then \ + ${ECHO} yes; \ else \ - ${ECHO} "no"; \ + ${ECHO} no; \ fi -. endif -. endfor -. endif -.endif # USE_BUILTIN.freetype2 +. endif +. endfor +. endif +. endif # PREFER.freetype2 +.endif +MAKEVARS+= USE_BUILTIN.freetype2 +### +### The section below only applies if we are not including this file +### solely to determine whether a built-in implementation exists. +### CHECK_BUILTIN.freetype2?= no .if !empty(CHECK_BUILTIN.freetype2:M[nN][oO]) -.if !empty(USE_BUILTIN.freetype2:M[nN][oO]) +. if !empty(USE_BUILTIN.freetype2:M[nN][oO]) BUILDLINK_DEPENDS.freetype2+= freetype2>=2.1.3 -.endif +. endif -.if !empty(USE_BUILTIN.freetype2:M[yY][eE][sS]) +. if !empty(USE_BUILTIN.freetype2:M[yY][eE][sS]) BUILDLINK_PREFIX.freetype2= ${X11BASE} -USE_X11= yes -.endif +. include "../../mk/x11.buildlink3.mk" +. include "../../mk/x11.builtin.mk" +. endif .endif # CHECK_BUILTIN.freetype2 diff --git a/graphics/g2/Makefile b/graphics/g2/Makefile index 7d16ae3952a..8812812a6c2 100644 --- a/graphics/g2/Makefile +++ b/graphics/g2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/04/11 21:46:02 tv Exp $ +# $NetBSD: Makefile,v 1.18 2005/06/01 18:02:55 jlam Exp $ DISTNAME= g2-0.49a PKGREVISION= 3 @@ -10,7 +10,6 @@ HOMEPAGE= http://g2.sourceforge.net/ COMMENT= Powerful, easy to use 2D graphics library GNU_CONFIGURE= yes -USE_X11= yes USE_LIBTOOL= yes PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/G2/.packlist @@ -29,5 +28,6 @@ post-install: ${PREFIX}/share/examples/g2 .include "../../graphics/gd/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/gdk-pixbuf/Makefile.common b/graphics/gdk-pixbuf/Makefile.common index e7ad5e636c3..4e535115acc 100644 --- a/graphics/gdk-pixbuf/Makefile.common +++ b/graphics/gdk-pixbuf/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.42 2005/05/22 20:51:45 jlam Exp $ +# $NetBSD: Makefile.common,v 1.43 2005/06/01 18:02:55 jlam Exp $ DISTNAME= gdk-pixbuf-${VER}.0 CATEGORIES= graphics devel @@ -13,7 +13,6 @@ VER= 0.22 PKG_INSTALLATION_TYPES= overwrite pkgviews USE_TOOLS+= gmake -USE_X11= YES USE_LIBTOOL= YES GNU_CONFIGURE= YES diff --git a/graphics/gfract/Makefile b/graphics/gfract/Makefile index a424485c49d..9e188992cea 100644 --- a/graphics/gfract/Makefile +++ b/graphics/gfract/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/05/22 20:08:05 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2005/06/01 18:02:55 jlam Exp $ # DISTNAME= gfract-0.30 @@ -10,7 +10,6 @@ MAINTAINER= ben@NetBSD.org HOMEPAGE= http://www.cs.Helsinki.FI/u/salerma/gfract/ COMMENT= Gtk-based fractal program -USE_X11= yes USE_TOOLS+= gmake BUILD_TARGET= gfract diff --git a/graphics/gifsicle/Makefile b/graphics/gifsicle/Makefile index a7c7f3bc200..91badade060 100644 --- a/graphics/gifsicle/Makefile +++ b/graphics/gifsicle/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/04/11 21:46:03 tv Exp $ +# $NetBSD: Makefile,v 1.10 2005/06/01 18:02:55 jlam Exp $ # DISTNAME= gifsicle-1.41 @@ -9,7 +9,7 @@ MAINTAINER= ben@wongs.net HOMEPAGE= http://www.lcdf.org/~eddietwo/gifsicle/ COMMENT= Create, edit, and inspect GIFs from shell -USE_X11= YES GNU_CONFIGURE= YES +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/gimageview/Makefile b/graphics/gimageview/Makefile index 1bb4c0a99ba..8cdccf2e1f8 100644 --- a/graphics/gimageview/Makefile +++ b/graphics/gimageview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2005/05/22 20:08:05 jlam Exp $ +# $NetBSD: Makefile,v 1.38 2005/06/01 18:02:55 jlam Exp $ DISTNAME= gimageview-0.2.27 CATEGORIES= graphics @@ -14,7 +14,6 @@ USE_PKGLOCALEDIR= YES USE_LIBTOOL= YES GNU_CONFIGURE= YES USE_TOOLS+= gmake -USE_X11= YES CONFIGURE_ARGS+= --disable-xinetest CONFIGURE_ARGS+= --with-gtk2 diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile index 692f1442671..d18b2372785 100644 --- a/graphics/gimp/Makefile +++ b/graphics/gimp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.119 2005/05/22 20:08:05 jlam Exp $ +# $NetBSD: Makefile,v 1.120 2005/06/01 18:02:55 jlam Exp $ DISTNAME= gimp-2.2.7 CATEGORIES= graphics @@ -21,7 +21,6 @@ USE_TOOLS+= gmake USE_LIBTOOL= yes USE_PKGINSTALL= yes USE_PKGLOCALEDIR= yes -USE_X11= yes PKG_SYSCONFSUBDIR= gimp/2.0 diff --git a/graphics/gimp1-base/Makefile b/graphics/gimp1-base/Makefile index 54904d50eda..d6bd4bc138c 100644 --- a/graphics/gimp1-base/Makefile +++ b/graphics/gimp1-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/05/31 22:26:10 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:55 jlam Exp $ # DISTNAME= gimp-1.2.5 @@ -20,7 +20,6 @@ CONFLICTS+= gimp<=1.2.3 gimp>=2.0.0 USE_PKGINSTALL= YES USE_PKGLOCALEDIR= YES -USE_X11= YES USE_TOOLS+= gmake USE_LIBTOOL= YES diff --git a/graphics/gimp1-data/Makefile b/graphics/gimp1-data/Makefile index a213743b43f..1f07204facc 100644 --- a/graphics/gimp1-data/Makefile +++ b/graphics/gimp1-data/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/04/11 21:46:03 tv Exp $ +# $NetBSD: Makefile,v 1.8 2005/06/01 18:02:55 jlam Exp $ # DISTNAME= gimp-data-extras-1.2.0 @@ -16,7 +16,6 @@ COMMENT= GNU Image Manipulation Program (extra brushes and patterns) CONFLICTS+= gimp<=1.2.3 gimp>=2.0.0 -USE_X11= YES GNU_CONFIGURE= YES .include "../../graphics/gimp1-base/buildlink3.mk" diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile index 45b40535a30..f6c1b3fd1a1 100644 --- a/graphics/giram/Makefile +++ b/graphics/giram/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2005/05/22 20:08:05 jlam Exp $ +# $NetBSD: Makefile,v 1.42 2005/06/01 18:02:55 jlam Exp $ # DISTNAME= giram-0.3.5 @@ -15,7 +15,6 @@ BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison USE_PKGLOCALEDIR= YES USE_PKGINSTALL= YES -USE_X11= YES USE_TOOLS+= gmake USE_LIBTOOL= YES GNU_CONFIGURE= YES diff --git a/graphics/gle/Makefile b/graphics/gle/Makefile index 60378652585..68980f7229d 100644 --- a/graphics/gle/Makefile +++ b/graphics/gle/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/04/11 21:46:03 tv Exp $ +# $NetBSD: Makefile,v 1.22 2005/06/01 18:02:55 jlam Exp $ # DISTNAME= gle-3.1.0 @@ -15,10 +15,10 @@ COMMENT= GL subroutines for drawing tubing and extrusions PKG_INSTALLATION_TYPES= overwrite pkgviews -USE_X11= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES LIBS+= -lXext .include "../../graphics/Mesa/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/glitz/Makefile b/graphics/glitz/Makefile index 43e0be99bc9..b01a223f658 100644 --- a/graphics/glitz/Makefile +++ b/graphics/glitz/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/04/11 21:46:03 tv Exp $ +# $NetBSD: Makefile,v 1.9 2005/06/01 18:02:55 jlam Exp $ DISTNAME= glitz-0.4.0 CATEGORIES= graphics @@ -11,11 +11,11 @@ COMMENT= OpenGL 2D graphics library and a backend for gl output in cairo USE_LIBTOOL= yes GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE= glitz-agl.pc.in glitz-glx.pc.in glitz.pc.in -USE_X11= yes LIBS.Darwin+= -lXext .include "../../graphics/MesaLib/buildlink3.mk" .include "../../x11/xextensions/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/gliv/Makefile b/graphics/gliv/Makefile index cc03f08de18..c5028344b16 100644 --- a/graphics/gliv/Makefile +++ b/graphics/gliv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:05 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/06/01 18:02:56 jlam Exp $ DISTNAME= gliv-1.9.1 CATEGORIES= graphics @@ -13,7 +13,6 @@ BUILD_USES_MSGFMT= yes USE_TOOLS+= gmake USE_PKGLOCALEDIR= yes -USE_X11= yes GNU_CONFIGURE= yes .include "../../converters/libiconv/buildlink3.mk" diff --git a/graphics/glu/Makefile b/graphics/glu/Makefile index 7d59d0594be..d8ea057d9a1 100644 --- a/graphics/glu/Makefile +++ b/graphics/glu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2005/02/23 13:04:47 grant Exp $ +# $NetBSD: Makefile,v 1.39 2005/06/01 18:02:56 jlam Exp $ PKGNAME= ${DISTNAME:C/MesaLib/glu/} COMMENT= GLU polygon tessellation facility for Mesa @@ -9,10 +9,12 @@ CONFLICTS+= Mesa<3.2.1 .include "../Mesa/Makefile.common" USE_LANGUAGES= c c++ -MESA_REQD+= ${MESA_VERSION} INSTLIBS= ${WRKSRC}/src/glu/sgi/libGLU.la +BUILDLINK_DEPENDS.MesaLib+= MesaLib>=${MESA_VERSION} +.include "../../graphics/MesaLib/buildlink3.mk" + pre-build: cd ${WRKSRC} && ${RM} -fr src/mesa src/glut src/glw progs @@ -24,5 +26,4 @@ do-install: ${INSTALL_DATA} $${hdr} ${PREFIX}/include/GL; \ done -.include "../../graphics/MesaLib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/glu/builtin-imake.mk b/graphics/glu/builtin-imake.mk new file mode 100644 index 00000000000..d4a66cae37c --- /dev/null +++ b/graphics/glu/builtin-imake.mk @@ -0,0 +1,12 @@ +XCOMM $NetBSD: builtin-imake.mk,v 1.1 2005/06/01 18:02:56 jlam Exp $ + +/* + * Check the value of BuildGLULibrary for the presence of + * glu in the X11 distribution. + */ +builtin-test: +#if BuildGLULibrary + @echo yes +#else + @echo no +#endif diff --git a/graphics/glu/builtin.mk b/graphics/glu/builtin.mk index dd085aaf529..21bf86c4be4 100644 --- a/graphics/glu/builtin.mk +++ b/graphics/glu/builtin.mk @@ -1,65 +1,86 @@ -# $NetBSD: builtin.mk,v 1.3 2004/03/29 05:43:31 jlam Exp $ +# $NetBSD: builtin.mk,v 1.4 2005/06/01 18:02:56 jlam Exp $ -_GL_GLU_H= ${X11BASE}/include/GL/glu.h -_X11_TMPL= ${X11BASE}/lib/X11/config/X11.tmpl +BUILTIN_PKG:= glu -.include "../../graphics/Mesa/version.mk" -BUILDLINK_DEPENDS.glu+= glu>=${_MESA_REQD} +BUILTIN_FIND_FILES_VAR:= H_GLU +BUILTIN_FIND_FILES.H_GLU= ${X11BASE}/include/GL/glu.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.glu) IS_BUILTIN.glu= no -. if exists(${_GL_GLU_H}) && exists(${_X11_TMPL}) +. if exists(${H_GLU}) +PKGSRC_USE_TOOLS+= imake # XXX +IMAKE?= ${X11BASE}/bin/imake # XXX +. if defined(IMAKE) && exists(${IMAKE}) IS_BUILTIN.glu!= \ - if ${GREP} -q BuildGLULibrary ${_X11_TMPL}; then \ - ${ECHO} "yes"; \ - else \ - ${ECHO} "no"; \ - fi -. if !empty(IS_BUILTIN.glu:M[yY][eE][sS]) -# -# _MESA_VERSION is defined by Mesa/version.mk to be the version of the -# Mesa software distributed with the built-in XFree86. -# -BUILTIN_PKG.glu= glu-${_MESA_VERSION} -BUILDLINK_VARS+= BUILTIN_PKG.glu + ${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config \ + -f ${BUILDLINK_PKGSRCDIR.glu}/builtin-imake.mk \ + -s - | \ + ${MAKE} -f - builtin-test . endif . endif -BUILDLINK_VARS+= IS_BUILTIN.glu -.endif # IS_BUILTIN.glu +.endif +MAKEVARS+= IS_BUILTIN.glu -.if defined(USE_BUILTIN.MesaLib) && !empty(USE_BUILTIN.MesaLib:M[nN][oO]) -USE_BUILTIN.glu= no +### +### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to +### a package name to represent the built-in package. +### +.if !defined(BUILTIN_PKG.glu) && \ + !empty(IS_BUILTIN.glu:M[yY][eE][sS]) && \ + exists(${H_GLU}) +. include "../../graphics/Mesa/version.mk" +BUILTIN_PKG.glu= glu-${BUILTIN_VERSION.Mesa} .endif +MAKEVARS+= BUILTIN_PKG.glu +### +### 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.glu) -USE_BUILTIN.glu?= ${IS_BUILTIN.glu} - -. if defined(BUILTIN_PKG.glu) +. if ${PREFER.glu} == "pkgsrc" +USE_BUILTIN.glu= no +. else +USE_BUILTIN.glu= ${IS_BUILTIN.glu} +. if defined(BUILTIN_PKG.glu) && \ + !empty(IS_BUILTIN.glu:M[yY][eE][sS]) USE_BUILTIN.glu= yes -. for _depend_ in ${BUILDLINK_DEPENDS.glu} -. if !empty(USE_BUILTIN.glu:M[yY][eE][sS]) -USE_BUILTIN.glu!= \ - if ${PKG_ADMIN} pmatch '${_depend_}' ${BUILTIN_PKG.glu}; then \ - ${ECHO} "yes"; \ +. for _dep_ in ${BUILDLINK_DEPENDS.glu} +. if !empty(USE_BUILTIN.glu:M[yY][eE][sS]) +USE_BUILTIN.glu!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.glu:Q}; then \ + ${ECHO} yes; \ else \ - ${ECHO} "no"; \ + ${ECHO} no; \ fi -. endif -. endfor -. endif -.endif # USE_BUILTIN.glu +. endif +. endfor +. endif +. endif # PREFER.glu +.endif +MAKEVARS+= USE_BUILTIN.glu +### +### The section below only applies if we are not including this file +### solely to determine whether a built-in implementation exists. +### CHECK_BUILTIN.glu?= no .if !empty(CHECK_BUILTIN.glu:M[nN][oO]) -.if !empty(USE_BUILTIN.glu:M[nN][oO]) +. if !empty(USE_BUILTIN.glu:M[nN][oO]) BUILDLINK_DEPENDS.glu+= glu>=6.0 -.endif +. endif -.if !empty(USE_BUILTIN.glu:M[yY][eE][sS]) +. if !empty(USE_BUILTIN.glu:M[yY][eE][sS]) BUILDLINK_PREFIX.glu= ${X11BASE} -USE_X11= yes -_MESA_REQD= ${_MESA_VERSION} -.endif +. include "../../mk/x11.buildlink3.mk" +. include "../../mk/x11.builtin.mk" +. endif .endif # CHECK_BUILTIN.glu diff --git a/graphics/glut/Makefile b/graphics/glut/Makefile index 4f4d72601a9..db10ca59f36 100644 --- a/graphics/glut/Makefile +++ b/graphics/glut/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2005/02/24 06:36:18 veego Exp $ +# $NetBSD: Makefile,v 1.38 2005/06/01 18:02:56 jlam Exp $ PKGNAME= ${DISTNAME:S/MesaLib/glut/} PKGREVISION= 2 @@ -9,10 +9,14 @@ CONFLICTS+= Mesa<3.2.1 .include "../Mesa/Makefile.common" -MESA_REQD+= ${MESA_VERSION} +BUILDLINK_DEPENDS.MesaLib+= MesaLib>=${MESA_VERSION} +BUILDLINK_DEPENDS.glu+= glu>=${MESA_VERSION} INSTLIBS= ${WRKSRC}/src/glut/glx/libglut.la +.include "../../graphics/MesaLib/buildlink3.mk" +.include "../../graphics/glu/buildlink3.mk" + pre-build: cd ${WRKSRC} && ${RM} -fr src/mesa src/glu src/glw progs @@ -24,6 +28,4 @@ do-install: ${INSTALL_DATA} $${hdr} ${PREFIX}/include/GL; \ done -.include "../../graphics/MesaLib/buildlink3.mk" -.include "../../graphics/glu/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/glut/buildlink3.mk b/graphics/glut/buildlink3.mk index 5ead1230395..0080e158dd3 100644 --- a/graphics/glut/buildlink3.mk +++ b/graphics/glut/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2004/10/03 00:14:51 tv Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2005/06/01 18:02:56 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GLUT_BUILDLINK3_MK:= ${GLUT_BUILDLINK3_MK}+ @@ -11,13 +11,11 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nglut} BUILDLINK_PACKAGES+= glut .if !empty(GLUT_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.glut+= glut>=${_MESA_REQD} +BUILDLINK_DEPENDS.glut+= glut>=3.4.2 BUILDLINK_RECOMMENDED.glut+= glut>=6.0.1nb1 BUILDLINK_PKGSRCDIR.glut?= ../../graphics/glut .endif # GLUT_BUILDLINK3_MK -MESA_REQD+= 6.0 - .include "../../graphics/MesaLib/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/graphics/gnome2-pixmaps/Makefile b/graphics/gnome2-pixmaps/Makefile index dbebd46c324..45d8f74b93c 100644 --- a/graphics/gnome2-pixmaps/Makefile +++ b/graphics/gnome2-pixmaps/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/05/18 16:43:33 jmmv Exp $ +# $NetBSD: Makefile,v 1.26 2005/06/01 18:02:56 jlam Exp $ # DISTNAME= gnome-desktop-2.10.1 @@ -21,12 +21,13 @@ CONFLICTS+= gnome-pixmaps-2.0.8 .endif USE_DIRS+= xdg-1.1 -USE_X11= YES NO_CONFIGURE= YES NO_BUILD= YES DSTDIR= ${PREFIX}/share/pixmaps +.include "../../mk/x11.buildlink3.mk" + do-install: cd ${WRKSRC}/pixmaps && \ for i in *.png *.xpm ; do \ diff --git a/graphics/gnuplot/Makefile b/graphics/gnuplot/Makefile index ee4fc03acd7..0fdf697a36a 100644 --- a/graphics/gnuplot/Makefile +++ b/graphics/gnuplot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2004/12/28 23:18:16 reed Exp $ +# $NetBSD: Makefile,v 1.32 2005/06/01 18:02:56 jlam Exp $ # PKGREVISION= 2 @@ -7,9 +7,9 @@ CATEGORIES+= x11 CONFLICTS+= gnuplot-nox11-[0-9]* -USE_X11= YES .include "../../graphics/gnuplot/Makefile.common" .include "../../graphics/plotutils/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile index e18babe7b56..9f61001f3e6 100644 --- a/graphics/graphviz/Makefile +++ b/graphics/graphviz/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2005/04/28 14:58:06 wiz Exp $ +# $NetBSD: Makefile,v 1.34 2005/06/01 18:02:56 jlam Exp $ # DISTNAME= graphviz-2.2.1 @@ -17,7 +17,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews GNU_CONFIGURE= yes USE_LIBTOOL= yes -USE_X11= yes XAW_TYPE= standard PKGCONFIG_OVERRIDE= */*.pc */*/*.pc PKGCONFIG_OVERRIDE_STAGE= post-build diff --git a/graphics/gri/Makefile b/graphics/gri/Makefile index 9fbb5a3383f..a8859c16731 100644 --- a/graphics/gri/Makefile +++ b/graphics/gri/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/05/22 20:08:06 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2005/06/01 18:02:56 jlam Exp $ DISTNAME= gri-2.12.5 PKGREVISION= 1 @@ -13,7 +13,6 @@ COMMENT= Language for scientific graphics applications BUILD_DEPENDS+= ImageMagick-[0-9]*:../../graphics/ImageMagick GNU_CONFIGURE= yes -USE_X11= yes USE_TOOLS+= gmake USE_PERL5= build REPLACE_PERL= gri_merge gri_unpage @@ -23,4 +22,5 @@ INFO_FILES= gri.info .include "../../devel/netcdf/buildlink3.mk" .include "../../mk/ghostscript.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/gtkglext/Makefile b/graphics/gtkglext/Makefile index 97e6d1938f0..0a8745f81a4 100644 --- a/graphics/gtkglext/Makefile +++ b/graphics/gtkglext/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/05/22 20:08:06 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2005/06/01 18:02:56 jlam Exp $ DISTNAME= gtkglext-1.0.6 CATEGORIES= graphics @@ -13,7 +13,6 @@ GNU_CONFIGURE= yes USE_TOOLS+= gmake USE_LIBTOOL= yes USE_PERL5= build -USE_X11= yes PKGCONFIG_OVERRIDE= gdkglext.pc.in PKGCONFIG_OVERRIDE+= gtkglext.pc.in diff --git a/graphics/gtksee/Makefile b/graphics/gtksee/Makefile index 5c0af15277c..8d65791fe00 100644 --- a/graphics/gtksee/Makefile +++ b/graphics/gtksee/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:06 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:56 jlam Exp $ # DISTNAME= gtksee-0.5.6 @@ -13,7 +13,6 @@ COMMENT= Gtk-based image viewing and cataloging program BUILD_USES_MSGFMT= YES GNU_CONFIGURE= YES -USE_X11= YES USE_TOOLS+= gmake USE_PKGLOCALEDIR= YES diff --git a/graphics/hp2xx/Makefile b/graphics/hp2xx/Makefile index e5becb6321e..4b0bf67f538 100644 --- a/graphics/hp2xx/Makefile +++ b/graphics/hp2xx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2005/04/11 21:46:04 tv Exp $ +# $NetBSD: Makefile,v 1.29 2005/06/01 18:02:56 jlam Exp $ # DISTNAME= hp2xx-3.4.4 @@ -11,7 +11,6 @@ HOMEPAGE= http://www.gnu.org/software/hp2xx/hp2xx.html COMMENT= HPGL converter and previewer WRKSRC= ${WRKDIR}/${DISTNAME}/sources -USE_X11= yes USE_MAKEINFO= YES INFO_FILES= hp2xx.info @@ -21,4 +20,5 @@ post-extract: .include "../../graphics/tiff/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../print/pdflib/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/iGMT/Makefile b/graphics/iGMT/Makefile index 74269e8546d..e6bbfb9c950 100644 --- a/graphics/iGMT/Makefile +++ b/graphics/iGMT/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/01/08 19:15:47 minskim Exp $ +# $NetBSD: Makefile,v 1.22 2005/06/01 18:02:56 jlam Exp $ DISTNAME= igmt_v1.2 PKGNAME= iGMT-1.2 @@ -18,12 +18,13 @@ DEPENDS+= ImageMagick>=5.3.9nb1:../../graphics/ImageMagick WRKSRC= ${WRKDIR}/igmt_1.2 NO_BUILD= yes -USE_X11= yes GMT_PREFIX_DEFAULT= ${LOCALBASE} EVAL_PREFIX+= GMT_PREFIX=GMT EVAL_PREFIX+= TK_PREFIX=tk +.include "../../mk/x11.buildlink3.mk" + do-configure: for i in ${WRKSRC}/igmt ${WRKSRC}/igmt_configure.tcl; do \ ${SED} -e 's:@PREFIX@:'${PREFIX}':g' \ diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile index 8001e51213b..16cd2687901 100644 --- a/graphics/imlib/Makefile +++ b/graphics/imlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.93 2005/05/22 20:08:06 jlam Exp $ +# $NetBSD: Makefile,v 1.94 2005/06/01 18:02:56 jlam Exp $ DISTNAME= imlib-1.9.15 PKGREVISION= 2 @@ -14,7 +14,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_TOOLS+= gmake USE_LIBTOOL= yes -USE_X11= yes GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE= imlib.pc.in UNLIMIT_RESOURCES= datasize diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile index 7b6e2fd127e..7dd0d40631d 100644 --- a/graphics/imlib2/Makefile +++ b/graphics/imlib2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2005/05/31 21:36:36 wiz Exp $ +# $NetBSD: Makefile,v 1.33 2005/06/01 18:02:56 jlam Exp $ DISTNAME= imlib2-1.2.0 PKGREVISION= 3 @@ -10,7 +10,6 @@ HOMEPAGE= http://www.enlightenment.org/pages/imlib2.html COMMENT= Image manipulation library USE_LIBTOOL= YES -USE_X11= YES GNU_CONFIGURE= YES PKGCONFIG_OVERRIDE= imlib2.pc.in @@ -27,5 +26,6 @@ LIBS.SunOS= -lm .include "../../graphics/libungif/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/ivtools/Makefile b/graphics/ivtools/Makefile index f14ffdc4a8a..fe5610a6bbf 100644 --- a/graphics/ivtools/Makefile +++ b/graphics/ivtools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/03/01 20:49:47 markd Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:56 jlam Exp $ DISTNAME= ivtools-1.2.2 CATEGORIES= graphics @@ -13,7 +13,8 @@ CONFLICTS+= dclock-* WRKSRC= ${WRKDIR}/${PKGNAME:C/\.[0-9]$//} GNU_CONFIGURE= YES -USE_X11= YES + +.include "../../mk/x11.buildlink3.mk" post-patch: ${RM} -f ${WRKSRC}/src/include/ivstd/strstream.h diff --git a/graphics/lib3ds/Makefile b/graphics/lib3ds/Makefile index 6511154dbdc..2732c5e15fa 100644 --- a/graphics/lib3ds/Makefile +++ b/graphics/lib3ds/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/04/11 21:46:05 tv Exp $ +# $NetBSD: Makefile,v 1.10 2005/06/01 18:02:56 jlam Exp $ # DISTNAME= lib3ds-1.2.0 @@ -11,10 +11,10 @@ HOMEPAGE= http://lib3ds.sourceforge.net/ COMMENT= 3D Studio File Format Library GNU_CONFIGURE= YES -USE_X11= YES LDFLAGS+= -lm .include "../../graphics/Mesa/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/libart2/Makefile b/graphics/libart2/Makefile index 93b00ab97ad..311523a762f 100644 --- a/graphics/libart2/Makefile +++ b/graphics/libart2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/04/11 21:46:05 tv Exp $ +# $NetBSD: Makefile,v 1.19 2005/06/01 18:02:56 jlam Exp $ DISTNAME= libart_lgpl-2.3.17 PKGNAME= ${DISTNAME:S/_lgpl/2/} @@ -13,8 +13,8 @@ COMMENT= High-performance 2D graphics library PKG_INSTALLATION_TYPES= overwrite pkgviews GNU_CONFIGURE= YES -USE_X11= YES USE_LIBTOOL= YES PKGCONFIG_OVERRIDE= libart-2.0.pc.in +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/libgdiplus/Makefile b/graphics/libgdiplus/Makefile index 6d6e680ddbb..5a20fb40968 100644 --- a/graphics/libgdiplus/Makefile +++ b/graphics/libgdiplus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/05/22 20:08:06 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2005/06/01 18:02:56 jlam Exp $ # DISTNAME= libgdiplus-1.1.5 @@ -9,7 +9,6 @@ MAINTAINER= recht@NetBSD.org HOMEPAGE= http://www.mono-project.com/ COMMENT= Implementation of the GDI+ API -USE_X11= yes USE_PKGLOCALEDIR= yes USE_TOOLS+= gmake USE_LIBTOOL= yes diff --git a/graphics/libggi/Makefile b/graphics/libggi/Makefile index 4831ce6d158..5031d41d32c 100644 --- a/graphics/libggi/Makefile +++ b/graphics/libggi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2005/04/18 15:54:18 wiz Exp $ +# $NetBSD: Makefile,v 1.36 2005/06/01 18:02:56 jlam Exp $ # DISTNAME= libggi-2.1.1.src @@ -15,7 +15,6 @@ COMMENT= General Graphics Interface library is a flexible drawing library WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} USE_PKGINSTALL= yes -USE_X11= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes diff --git a/graphics/libggi/buildlink3.mk b/graphics/libggi/buildlink3.mk index d98dfdbf9ec..d478dd1b5a8 100644 --- a/graphics/libggi/buildlink3.mk +++ b/graphics/libggi/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2005/03/25 02:47:31 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2005/06/01 18:02:56 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBGGI_BUILDLINK3_MK:= ${LIBGGI_BUILDLINK3_MK}+ @@ -15,8 +15,6 @@ BUILDLINK_DEPENDS.libggi+= libggi>=2.1.0 BUILDLINK_PKGSRCDIR.libggi?= ../../graphics/libggi .endif # LIBGGI_BUILDLINK3_MK -USE_X11= yes - .include "../../devel/ncurses/buildlink3.mk" .include "../../graphics/libgii/buildlink3.mk" diff --git a/graphics/libgii/Makefile b/graphics/libgii/Makefile index 8df1647d008..59f04fed764 100644 --- a/graphics/libgii/Makefile +++ b/graphics/libgii/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/04/18 15:53:35 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2005/06/01 18:02:56 jlam Exp $ DISTNAME= libgii-0.9.1.src PKGNAME= ${DISTNAME:S/.src//} @@ -14,7 +14,6 @@ COMMENT= General Input Interface - API for all possible input sources WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} USE_PKGINSTALL= yes -USE_X11= yes USE_LIBTOOL= yes TEST_TARGET= check @@ -32,6 +31,7 @@ CONF_FILES+= ${EGDIR}/filter/mouse ${PKG_SYSCONFDIR}/filter/mouse PTHREAD_OPTS+= native .include "../../mk/pthread.buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .if empty(PTHREAD_TYPE:Mnative) PLIST_SUBST+= GGTICK="" diff --git a/graphics/libgii/buildlink3.mk b/graphics/libgii/buildlink3.mk index 1f83f881e05..1df5fadd538 100644 --- a/graphics/libgii/buildlink3.mk +++ b/graphics/libgii/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2005/03/25 02:46:49 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2005/06/01 18:02:56 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBGII_BUILDLINK3_MK:= ${LIBGII_BUILDLINK3_MK}+ @@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= libgii .if !empty(LIBGII_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libgii+= libgii>=0.9.0 BUILDLINK_PKGSRCDIR.libgii?= ../../graphics/libgii - -USE_X11= yes - .endif # LIBGII_BUILDLINK3_MK +.include "../../mk/x11.buildlink3.mk" + BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile index 32d9fa3aa87..d4c1d9e68ad 100644 --- a/graphics/libgnomecanvas/Makefile +++ b/graphics/libgnomecanvas/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2005/05/22 20:08:06 jlam Exp $ +# $NetBSD: Makefile,v 1.33 2005/06/01 18:02:56 jlam Exp $ # DISTNAME= libgnomecanvas-2.10.0 @@ -15,7 +15,6 @@ BUILD_USES_MSGFMT= yes GNU_CONFIGURE= yes USE_PKGLOCALEDIR= yes USE_TOOLS+= gmake -USE_X11= yes USE_LIBTOOL= yes PKGCONFIG_OVERRIDE= libgnomecanvas/libgnomecanvas-2.0.pc.in diff --git a/graphics/librsvg/Makefile b/graphics/librsvg/Makefile index 379039dfa0c..b2e9077515e 100644 --- a/graphics/librsvg/Makefile +++ b/graphics/librsvg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/04/11 21:46:06 tv Exp $ +# $NetBSD: Makefile,v 1.20 2005/06/01 18:02:56 jlam Exp $ DISTNAME= librsvg-1.0.3 CATEGORIES= graphics gnome @@ -10,7 +10,6 @@ HOMEPAGE= http://www.levien.com/svg/ COMMENT= Raph's SVG library USE_LIBTOOL= yes -USE_X11= yes GNU_CONFIGURE= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig diff --git a/graphics/librsvg2/Makefile.common b/graphics/librsvg2/Makefile.common index ed1e08517f2..c00de5d7e11 100644 --- a/graphics/librsvg2/Makefile.common +++ b/graphics/librsvg2/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.10 2005/04/11 21:46:06 tv Exp $ +# $NetBSD: Makefile.common,v 1.11 2005/06/01 18:02:56 jlam Exp $ # DISTNAME= librsvg-2.9.5 @@ -13,7 +13,6 @@ COMMENT= SVG library for GNOME2 DISTINFO_FILE= ${.CURDIR}/../../graphics/librsvg2/distinfo PATCHDIR= ${.CURDIR}/../../graphics/librsvg2/patches -USE_X11= YES USE_LIBTOOL= YES GNU_CONFIGURE= YES PKGCONFIG_OVERRIDE= librsvg-2.0.pc.in diff --git a/graphics/libvideogfx/Makefile b/graphics/libvideogfx/Makefile index 2a7dd0d640f..e4ac8850e4d 100644 --- a/graphics/libvideogfx/Makefile +++ b/graphics/libvideogfx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/04/11 21:46:06 tv Exp $ +# $NetBSD: Makefile,v 1.9 2005/06/01 18:02:56 jlam Exp $ # DISTNAME= libvideogfx-1.0.3 @@ -15,8 +15,8 @@ COMMENT= C++ library for low-level video processing USE_LANGUAGES= c++ USE_LIBTOOL= YES GNU_CONFIGURE= YES -USE_X11= yes .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile index f14e690929f..a6dca29f5c0 100644 --- a/graphics/libwmf/Makefile +++ b/graphics/libwmf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.54 2005/04/20 15:42:11 drochner Exp $ +# $NetBSD: Makefile,v 1.55 2005/06/01 18:02:57 jlam Exp $ # DISTNAME= libwmf-0.2.8.3 @@ -13,7 +13,6 @@ COMMENT= Library for reading and converting WMF (Windows Meta Files) PKG_INSTALLATION_TYPES= overwrite pkgviews GNU_CONFIGURE= YES -USE_X11= YES USE_LIBTOOL= YES CONFIGURE_ARGS+= --disable-gd CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/html/libwmf @@ -28,4 +27,5 @@ post-install: .include "../../textproc/libxml2/buildlink3.mk" #.include "../../fonts/fontconfig/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/mgl/Makefile b/graphics/mgl/Makefile index 7d84eced5af..a27b344a08d 100644 --- a/graphics/mgl/Makefile +++ b/graphics/mgl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/05/22 20:08:06 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2005/06/01 18:02:57 jlam Exp $ # DISTNAME= mgl2-alpha-020 @@ -14,7 +14,6 @@ COMMENT= Graphics library for NEC Mobilegear/PocketBSD, NetBSD/hpcmips DEPENDS+= mglfonts>=0.1:../../fonts/mglfonts USE_TOOLS+= gmake -USE_X11= yes MGLDOCS= im.doc mgl1.doc shlib.doc MGL2DOCS= AppConvert.doc Build.doc CALIBRATE.doc CHANGES.doc \ @@ -108,4 +107,5 @@ post-install: .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/libungif/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/mpeg2codec/Makefile b/graphics/mpeg2codec/Makefile index 8cf51b3b9e9..0c09d0484db 100644 --- a/graphics/mpeg2codec/Makefile +++ b/graphics/mpeg2codec/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/04/11 21:46:06 tv Exp $ +# $NetBSD: Makefile,v 1.16 2005/06/01 18:02:57 jlam Exp $ DISTNAME= mpeg2vidcodec_v12 PKGNAME= mpeg2codec-1.2 @@ -16,6 +16,8 @@ USE_X11BASE= # defined INSTALLATION_DIRS= bin +.include "../../mk/x11.buildlink3.mk" + do-install: ${INSTALL_PROGRAM} \ ${WRKSRC}/src/mpeg2dec/mpeg2decode \ diff --git a/graphics/openexr/Makefile b/graphics/openexr/Makefile index 7e8e0d6799c..e2ca575942b 100644 --- a/graphics/openexr/Makefile +++ b/graphics/openexr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:07 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2005/06/01 18:02:57 jlam Exp $ DISTNAME= OpenEXR-1.2.2 PKGNAME= openexr-1.2.2 @@ -11,7 +11,6 @@ COMMENT= High dynamic-range (HDR) image file format library and tools USE_TOOLS+= gmake USE_LIBTOOL= yes -USE_X11= yes # for exrdisplay FLTK application GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE= ${WRKSRC}/OpenExr.pc.in TEST_TARGET= check diff --git a/graphics/p5-Image-Imlib2/Makefile b/graphics/p5-Image-Imlib2/Makefile index 4b06577e75d..827db979bf6 100644 --- a/graphics/p5-Image-Imlib2/Makefile +++ b/graphics/p5-Image-Imlib2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/04/11 21:46:07 tv Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 18:02:57 jlam Exp $ # DISTNAME= Image-Imlib2-1.04 @@ -12,7 +12,6 @@ HOMEPAGE= http://theory.uwinnipeg.ca/CPAN/data/Image-Imlib2/ COMMENT= Interface to the Imlib2 image library USE_PERL5= run -USE_X11= YES # versions before that contained a broken imlib2-config BUILDLINK_DEPENDS.imlib2+= imlib2>=1.2.0nb2 @@ -22,5 +21,6 @@ PERL5_MODULE_TYPE= Module::Build PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Image/Imlib2/.packlist .include "../../graphics/imlib2/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/p5-PerlMagick/Makefile b/graphics/p5-PerlMagick/Makefile index 4822f83ce7a..064c7892600 100644 --- a/graphics/p5-PerlMagick/Makefile +++ b/graphics/p5-PerlMagick/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2005/04/11 21:46:07 tv Exp $ +# $NetBSD: Makefile,v 1.40 2005/06/01 18:02:57 jlam Exp $ .include "../../graphics/ImageMagick/Makefile.common" @@ -23,7 +23,6 @@ PERL5_CONFIGURE= NO PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Image/Magick/.packlist GNU_CONFIGURE= YES -USE_X11= YES PERL5_CONFIGURE_DIRS= ${WRKSRC}/PerlMagick BUILD_DIRS= ${PERL5_CONFIGURE_DIRS} @@ -34,5 +33,6 @@ CONFIGURE_ARGS+= --with-perl=${PERL5} post-configure: perl5-configure .include "../../graphics/ImageMagick/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/pgraf/Makefile b/graphics/pgraf/Makefile index a9588432614..6a1ca31d553 100644 --- a/graphics/pgraf/Makefile +++ b/graphics/pgraf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/04/11 21:46:07 tv Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/01 18:02:57 jlam Exp $ DISTNAME= pgraf-20010131 CATEGORIES= graphics @@ -8,11 +8,12 @@ MAINTAINER= tech-pkg@NetBSD.org COMMENT= Portable graphics system NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL -USE_X11= YES INSTALLATION_DIRS= bin include lib man/man1 man/man3 man/man5 CONFLICTS= pgp5-[0-9]* # Both have a `pgps' executable +.include "../../mk/x11.buildlink3.mk" + post-install: ${INSTALL_DATA} ${WRKSRC}/include/pgraf.h ${PREFIX}/include ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pgraf diff --git a/graphics/ploticus-examples/Makefile b/graphics/ploticus-examples/Makefile index a9312c4d64c..2eff3acbbb2 100644 --- a/graphics/ploticus-examples/Makefile +++ b/graphics/ploticus-examples/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2003/07/21 16:51:49 martti Exp $ +# $NetBSD: Makefile,v 1.4 2005/06/01 18:02:57 jlam Exp $ # DISTNAME= plnode141 @@ -14,10 +14,11 @@ COMMENT= Examples for the ploticus data plotting suite NO_CONFIGURE= YES NO_BUILD= YES -USE_X11= YES DIST_SUBDIR= ${PKGNAME:S/-examples//} EXDIR= ${PREFIX}/share/examples/ploticus +.include "../../mk/x11.buildlink3.mk" + do-install: ${INSTALL_DATA_DIR} ${EXDIR} .for dir in doc gallery tabgallery thumbnails thumbpng diff --git a/graphics/ploticus/Makefile b/graphics/ploticus/Makefile index 4ba610b4e0d..9f00a822c37 100644 --- a/graphics/ploticus/Makefile +++ b/graphics/ploticus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2005/05/02 17:58:00 drochner Exp $ +# $NetBSD: Makefile,v 1.30 2005/06/01 18:02:57 jlam Exp $ DISTNAME= pl231src PKGNAME= ploticus-2.31pl4 @@ -10,7 +10,6 @@ HOMEPAGE= http://ploticus.sourceforge.net/ COMMENT= Versatile data visualization engine WRKSRC= ${WRKDIR}/${DISTNAME}/src -USE_X11= yes NO_CONFIGURE= yes BUILD_TARGET= ploticus @@ -38,5 +37,6 @@ do-install: .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/plotutils/Makefile b/graphics/plotutils/Makefile index e15ec14466f..ee5ea980de0 100644 --- a/graphics/plotutils/Makefile +++ b/graphics/plotutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2005/04/11 21:46:08 tv Exp $ +# $NetBSD: Makefile,v 1.35 2005/06/01 18:02:57 jlam Exp $ # DISTNAME= plotutils-2.4.1 @@ -15,7 +15,6 @@ CONFLICTS+= plotutils-nox11-[0-9]* PKG_INSTALLATION_TYPES= overwrite pkgviews USE_LANGUAGES= c c++ -USE_X11= YES INFO_FILES= plotutils.info @@ -26,4 +25,5 @@ USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig ${WRKSRC}/libxmi/ltconfig .include "../../graphics/png/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/povray/Makefile b/graphics/povray/Makefile index ceeeeb72f28..196eefd1fe5 100644 --- a/graphics/povray/Makefile +++ b/graphics/povray/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2005/04/11 21:46:08 tv Exp $ +# $NetBSD: Makefile,v 1.27 2005/06/01 18:02:57 jlam Exp $ DISTNAME= povray-3.6.1 PKGREVISION= 1 @@ -15,7 +15,6 @@ LICENSE= povray-license USE_LANGUAGES= c c++ USE_PKGINSTALL= YES -USE_X11= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --enable-strip @@ -39,5 +38,6 @@ pre-install: .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile index ef191e82fac..70a6a99aae9 100644 --- a/graphics/pstoedit/Makefile +++ b/graphics/pstoedit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2005/05/22 05:35:32 jlam Exp $ +# $NetBSD: Makefile,v 1.28 2005/06/01 18:02:57 jlam Exp $ DISTNAME= pstoedit_3_31 PKGNAME= pstoedit-3.31 @@ -16,7 +16,6 @@ NO_SRC_ON_CDROM= ${RESTRICTED} NO_BIN_ON_CDROM= ${RESTRICTED} WRKSRC= ${WRKDIR}/pstoedit_3.31/src -USE_X11= yes USE_LIBTOOL= yes USE_LANGUAGES= c++ GNU_CONFIGURE= yes @@ -46,5 +45,6 @@ post-install: ${INSTALL_DATA} ${DOCSRC}/readme.txt ${DOCDIR} .include "../../graphics/plotutils/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/ghostscript.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/py-biggles/Makefile b/graphics/py-biggles/Makefile index e6ac2524d01..423346bebb9 100644 --- a/graphics/py-biggles/Makefile +++ b/graphics/py-biggles/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:08 tv Exp $ +# $NetBSD: Makefile,v 1.5 2005/06/01 18:02:57 jlam Exp $ # DISTNAME= python-biggles-1.6.3 @@ -11,11 +11,11 @@ MAINTAINER= Kai.Puolamaki@iki.fi HOMEPAGE= http://biggles.sourceforge.net/ COMMENT= Python module for creating 2D scientific plots -USE_X11= yes PYDISTUTILSPKG= yes PYBINMODULE= yes .include "../../lang/python/extension.mk" .include "../../math/py-Numeric/buildlink3.mk" .include "../../graphics/plotutils/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/py-imagingtk/Makefile b/graphics/py-imagingtk/Makefile index 0edfb4b9cd2..f7237690832 100644 --- a/graphics/py-imagingtk/Makefile +++ b/graphics/py-imagingtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/04/11 21:46:08 tv Exp $ +# $NetBSD: Makefile,v 1.15 2005/06/01 18:02:57 jlam Exp $ # DISTNAME= Imaging-1.1.4 @@ -15,7 +15,6 @@ DIST_SUBDIR= python PYDISTUTILSPKG= yes BUILDLINK_DEPENDS.python20= python20>=2.0.1nb4 GNU_CONFIGURE= yes -USE_X11= yes PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX} diff --git a/graphics/radiance/Makefile b/graphics/radiance/Makefile index 3b0cb2d2bf8..1b3c0027d69 100644 --- a/graphics/radiance/Makefile +++ b/graphics/radiance/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/04/11 21:46:09 tv Exp $ +# $NetBSD: Makefile,v 1.8 2005/06/01 18:02:57 jlam Exp $ # DISTNAME= rad3R6P1 @@ -14,7 +14,6 @@ HOMEPAGE= http://www.radiance-online.org/ COMMENT= Physically-based, image-generating, backward raytracer WRKSRC= ${WRKDIR}/ray -USE_X11= YES LICENSE= radiance-license diff --git a/graphics/ruby-RMagick/Makefile b/graphics/ruby-RMagick/Makefile index f612bdde009..6a445d9421e 100644 --- a/graphics/ruby-RMagick/Makefile +++ b/graphics/ruby-RMagick/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/05/28 03:01:20 taca Exp $ +# $NetBSD: Makefile,v 1.5 2005/06/01 18:02:57 jlam Exp $ DISTNAME= RMagick-1.8.1 PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME} @@ -13,7 +13,6 @@ RUBY_VERSION_SUPPORTED= 18 # build error with Ruby 1.6.8 RUBY_HAS_ARCHLIB= yes GNU_CONFIGURE= yes USE_GHOSTSCRIPT= build -USE_X11= yes CONFIGURE_ARGS+= --with-doc-dir=${RUBY_DOCDIR}/RMagick CONFIGURE_ARGS+= --without-graphics-magick @@ -24,6 +23,7 @@ post-install: ${PAX} -rw -pp -pm . ${RUBY_EXAMPLESDIR}/RMagick .include "../../graphics/ImageMagick/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../lang/ruby/modules.mk" .include "../../mk/ghostscript.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/ruby-imlib2/Makefile b/graphics/ruby-imlib2/Makefile index 63b511f9b8a..08cf323e16e 100644 --- a/graphics/ruby-imlib2/Makefile +++ b/graphics/ruby-imlib2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/06/01 03:36:47 taca Exp $ +# $NetBSD: Makefile,v 1.4 2005/06/01 18:02:57 jlam Exp $ DISTNAME= imlib2-ruby-${VER} PKGNAME= ${RUBY_PKGPREFIX}-imlib2-${VER} @@ -16,7 +16,6 @@ REPLACE_RUBY_DIRS= ${WRKSRC}/examples RUBY_HAS_ARCHLIB= yes RUBY_REQD= 1.8.0 USE_RUBY_EXTCONF= yes -USE_X11= yes INSTALL_TARGET= site-install @@ -27,6 +26,8 @@ BUILDLINK_DEPENDS.imlib2+= imlib2>=1.2.0nb2 DOCS= AUTHORS COPYING ChangeLog README TODO +.include "../../mk/x11.buildlink3.mk" + post-install: ${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/imlib2 cd ${WRKSRC}/examples && ${PAX} -rw -pp -pm . ${RUBY_EXAMPLESDIR}/imlib2 diff --git a/graphics/ruby-opengl/Makefile b/graphics/ruby-opengl/Makefile index 8cc07cf09e5..2d590e45eac 100644 --- a/graphics/ruby-opengl/Makefile +++ b/graphics/ruby-opengl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/04/11 21:46:09 tv Exp $ +# $NetBSD: Makefile,v 1.21 2005/06/01 18:02:57 jlam Exp $ DISTNAME= rbogl-${VERSION} PKGNAME= ${RUBY_PKGPREFIX}-opengl-${VERSION} @@ -12,7 +12,6 @@ COMMENT= OpenGL/GLU/GLUT interface modules for Ruby RUBY_HAS_ARCHLIB= yes USE_RUBY_EXTCONF= yes -USE_X11= yes WRKSRC= ${WRKDIR}/opengl-${VERSION} VERSION= 0.32f INSTALL_TARGET= site-install @@ -27,5 +26,6 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/README.EUC ${RUBY_DOCDIR}/opengl/README.ja .include "../../graphics/Mesa/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../lang/ruby/modules.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/scigraphica/Makefile b/graphics/scigraphica/Makefile index 62653efc092..9929cbcc520 100644 --- a/graphics/scigraphica/Makefile +++ b/graphics/scigraphica/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2005/05/22 20:08:07 jlam Exp $ +# $NetBSD: Makefile,v 1.31 2005/06/01 18:02:57 jlam Exp $ # DISTNAME= scigraphica-0.8.0 @@ -11,7 +11,6 @@ HOMEPAGE= http://scigraphica.sourceforge.net/ COMMENT= Data analysis and technical graphics USE_DIRS+= gnome1-1.5 -USE_X11= YES USE_TOOLS+= gmake USE_GNU_READLINE= YES diff --git a/graphics/scrot/Makefile b/graphics/scrot/Makefile index 172273c4752..b8a8fd85650 100644 --- a/graphics/scrot/Makefile +++ b/graphics/scrot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/04/11 21:46:09 tv Exp $ +# $NetBSD: Makefile,v 1.16 2005/06/01 18:02:57 jlam Exp $ DISTNAME= scrot-0.8 PKGREVISION= 6 @@ -10,8 +10,8 @@ HOMEPAGE= http://linuxbrit.co.uk/scrot/ COMMENT= Commandline screen capture util like "import", but using imlib2 GNU_CONFIGURE= YES -USE_X11= YES .include "../../devel/giblib/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/skencil/Makefile b/graphics/skencil/Makefile index 084be70ecac..32b10609591 100644 --- a/graphics/skencil/Makefile +++ b/graphics/skencil/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/05/26 02:52:47 markd Exp $ +# $NetBSD: Makefile,v 1.6 2005/06/01 18:02:57 jlam Exp $ # DISTNAME= skencil-0.6.16 @@ -10,8 +10,6 @@ MAINTAINER= uebayasi@NetBSD.org HOMEPAGE= http://sketch.sourceforge.net/ COMMENT= Interactive drawing program -USE_X11= YES - PYTHON_PATCH_SCRIPTS= sk2ppm.py sk2ps.py skconvert.py skencil.py skshow.py SK_CONF_ARGS= --imaging-include=${BUILDLINK_PREFIX.pyimaging}/${PYINC}/PIL SK_TKFLAGS= -L${BUILDLINK_PREFIX.tk}/lib -R${BUILDLINK_PREFIX.tk}/lib -ltk -ltcl diff --git a/graphics/sodipodi/Makefile b/graphics/sodipodi/Makefile index e7f9a6d0842..09df2ebfbba 100644 --- a/graphics/sodipodi/Makefile +++ b/graphics/sodipodi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2005/05/22 20:08:07 jlam Exp $ +# $NetBSD: Makefile,v 1.30 2005/06/01 18:02:57 jlam Exp $ # DISTNAME= sodipodi-0.34 @@ -15,7 +15,6 @@ USE_DIRS+= gnome2-1.5 USE_PKGLOCALEDIR= YES USE_TOOLS+= gmake USE_LIBTOOL= YES -USE_X11= YES REPLACE_PERL= extensions/*.pl diff --git a/graphics/tuxpaint-config/Makefile b/graphics/tuxpaint-config/Makefile index 5525aa62e2b..c3fb5320c71 100644 --- a/graphics/tuxpaint-config/Makefile +++ b/graphics/tuxpaint-config/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:07 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2005/06/01 18:02:57 jlam Exp $ # DISTNAME= tuxpaint-config-0.0.5 @@ -10,7 +10,6 @@ HOMEPAGE= ftp://ftp.sonic.net/pub/users/nbs/unix/x/tuxpaint/config/ COMMENT= Configuration program for tuxpaint USE_TOOLS+= gmake -USE_X11= YES post-install: -${FIND} ${PREFIX}/share/tuxpaint-config -name CVS -exec ${RM} -r {} \; 2>/dev/null diff --git a/graphics/urt/Makefile b/graphics/urt/Makefile index 34299ad56fa..8d6f1823c8a 100644 --- a/graphics/urt/Makefile +++ b/graphics/urt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2005/04/11 21:46:10 tv Exp $ +# $NetBSD: Makefile,v 1.39 2005/06/01 18:02:58 jlam Exp $ DISTNAME= urt PKGNAME= urt-3.1b1 @@ -18,7 +18,6 @@ EXTRACT_ONLY= urt-3.1b.tar.Z WRKSRC= ${WRKDIR} USE_LIBTOOL= yes -USE_X11= yes CONFIGURE_SCRIPT=./Configure CONFIGURE_ARGS= config/urt HAS_CONFIGURE= yes @@ -39,4 +38,5 @@ post-install: ${FIND} . -type f -exec ${CHMOD} 644 '{}' \;) .include "../../graphics/netpbm/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/vcg/Makefile b/graphics/vcg/Makefile index 3874c3e9168..d726593f023 100644 --- a/graphics/vcg/Makefile +++ b/graphics/vcg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/03/24 21:12:55 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2005/06/01 18:02:58 jlam Exp $ DISTNAME= vcg.1.30.r3.17 PKGNAME= vcg-1.30 @@ -12,6 +12,8 @@ COMMENT= Visualization Tool for compiler graphs WRKSRC= ${WRKDIR}/vcg.1.30 USE_X11BASE= yes +.include "../../mk/x11.buildlink3.mk" + pre-patch: @${MKDIR} ${WRKSRC}/preconf/X11ccNetBSD @${CP} ${FILESDIR}/conf ${WRKSRC}/preconf/X11ccNetBSD diff --git a/graphics/vtk/Makefile b/graphics/vtk/Makefile index e987cf17ecf..882759c7f15 100644 --- a/graphics/vtk/Makefile +++ b/graphics/vtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2004/10/03 00:14:58 tv Exp $ +# $NetBSD: Makefile,v 1.4 2005/06/01 18:02:58 jlam Exp $ # PKGNAME= vtk-${VTKDIST_VERSION} @@ -6,9 +6,8 @@ PKGREVISION= 1 COMMENT= Visualization toolkit -USE_X11= yes - .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../graphics/vtk/Makefile.vtkdist" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/x11rec/Makefile b/graphics/x11rec/Makefile index 889204d554e..9a2a6830734 100644 --- a/graphics/x11rec/Makefile +++ b/graphics/x11rec/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2005/05/05 20:03:55 xtraeme Exp $ +# $NetBSD: Makefile,v 1.2 2005/06/01 18:02:58 jlam Exp $ # DISTNAME= x11rec-0.3 @@ -11,7 +11,6 @@ COMMENT= Very ad hoc X11 recorder which create a movie DEPENDS+= gifsicle-[0-9]*:../../graphics/gifsicle -USE_X11= yes NO_BUILD= yes REPLACE_RUBY= x11rec @@ -25,6 +24,7 @@ do-install: ${PREFIX}/share/doc/html/x11rec/index.html.ja .include "../../graphics/ImageMagick/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../lang/ruby/modules.mk" SUBST_CLASSES+= toolpath diff --git a/graphics/xplot/Makefile b/graphics/xplot/Makefile index 84baed32ece..bf98424096f 100644 --- a/graphics/xplot/Makefile +++ b/graphics/xplot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2003/10/18 13:08:49 cjep Exp $ +# $NetBSD: Makefile,v 1.19 2005/06/01 18:02:58 jlam Exp $ DISTNAME= xplot-0.90.7.1 PKGREVISION= 1 @@ -16,6 +16,8 @@ DOCFILES= ANNOUNCE README README.tcp_plots # demo.? removed from interim .7.1 version # demo.0 demo.1 demo.2 demo.3 demo.4 demo.5 demo.6 demo.7 +.include "../../mk/x11.buildlink3.mk" + post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xplot .for file in ${DOCFILES} diff --git a/graphics/xpm/Makefile b/graphics/xpm/Makefile index a471fcbb103..3d7ea9a63d2 100644 --- a/graphics/xpm/Makefile +++ b/graphics/xpm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2005/04/11 21:46:10 tv Exp $ +# $NetBSD: Makefile,v 1.41 2005/06/01 18:02:58 jlam Exp $ DISTNAME= xpm-3.4k PKGREVISION= 3 @@ -14,13 +14,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_IMAKE= # defined -CHECK_BUILTIN.xpm= yes -.include "builtin.mk" - -.if !empty(IS_BUILTIN.xpm:M[yY][eE][sS]) -PKG_SKIP_REASON= "${PKGBASE} is part of your X11 distribution" -.endif - .if ${OPSYS} == "SunOS" post-install: cd ${PREFIX}/lib && \ diff --git a/graphics/xpm/buildlink3.mk b/graphics/xpm/buildlink3.mk index a65009e8ee6..10cbdc9ebb2 100644 --- a/graphics/xpm/buildlink3.mk +++ b/graphics/xpm/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.16 2004/09/16 15:09:01 minskim Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2005/06/01 18:02:58 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XPM_BUILDLINK3_MK:= ${XPM_BUILDLINK3_MK}+ @@ -14,9 +14,8 @@ BUILDLINK_PACKAGES+= xpm BUILDLINK_DEPENDS.xpm+= xpm>=3.4k BUILDLINK_RECOMMENDED.xpm?= xpm>=3.4knb2 BUILDLINK_PKGSRCDIR.xpm?= ../../graphics/xpm - -USE_X11= yes - .endif # XPM_BUILDLINK3_MK +.include "../../mk/x11.buildlink3.mk" + BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/graphics/xpm/builtin-imake.mk b/graphics/xpm/builtin-imake.mk new file mode 100644 index 00000000000..b4ac4fdec4c --- /dev/null +++ b/graphics/xpm/builtin-imake.mk @@ -0,0 +1,12 @@ +XCOMM $NetBSD: builtin-imake.mk,v 1.1 2005/06/01 18:02:58 jlam Exp $ + +/* + * Check the value of NormalLibXpm for the presence of Xpm + * in the X11 distribution. + */ +builtin-test: +#if NormalLibXpm + @echo yes +#else + @echo no +#endif diff --git a/graphics/xpm/builtin.mk b/graphics/xpm/builtin.mk index e6d3f83bc6c..5f81e3a1621 100644 --- a/graphics/xpm/builtin.mk +++ b/graphics/xpm/builtin.mk @@ -1,69 +1,100 @@ -# $NetBSD: builtin.mk,v 1.4 2004/05/20 11:25:57 grant Exp $ +# $NetBSD: builtin.mk,v 1.5 2005/06/01 18:02:58 jlam Exp $ -.include "../../mk/bsd.prefs.mk" +BUILTIN_PKG:= xpm -_X11_XPM_H= ${X11BASE}/include/X11/xpm.h -_X11_TMPL= ${X11BASE}/lib/X11/config/X11.tmpl +BUILTIN_FIND_FILES_VAR:= H_XPM +BUILTIN_FIND_FILES.H_XPM= ${X11BASE}/include/X11/xpm.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.xpm) -IS_BUILTIN.xpm= no -. if exists(${_X11_XPM_H}) -. if !empty(X11BASE:M*openwin) +IS_BUILTIN.xpm= no +. if exists(${H_XPM}) +. if !empty(X11BASE:M*openwin) && exists(/usr/sbin/pkgchk) IS_BUILTIN.xpm!= \ if /usr/sbin/pkgchk -l SUNWxwinc | ${GREP} -q xpm.h; then \ - ${ECHO} "yes"; \ + ${ECHO} yes; \ else \ - ${ECHO} "no"; \ + ${ECHO} no; \ fi . elif ${OPSYS} == "IRIX" -IS_BUILTIN.xpm= yes -. elif exists(${_X11_TMPL}) -IS_BUILTIN.xpm!= \ - if ${GREP} -q NormalLibXpm ${_X11_TMPL}; then \ - ${ECHO} "yes"; \ - else \ - ${ECHO} "no"; \ - fi +IS_BUILTIN.xpm= yes . else -IS_BUILTIN.xpm= no +PKGSRC_USE_TOOLS+= imake # XXX +IMAKE?= ${X11BASE}/bin/imake # XXX +. if defined(IMAKE) && exists(${IMAKE}) +IS_BUILTIN.xpm!= \ + ${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config \ + -f ${BUILDLINK_PKGSRCDIR.xpm}/builtin-imake.mk \ + -s - | \ + ${MAKE} -f - builtin-test +. endif . endif . endif -. if !empty(IS_BUILTIN.xpm:M[yY][eE][sS]) -# -# Create an appropriate package name for the built-in xpm distributed -# with the system. This package name can be used to check against -# BUILDLINK_DEPENDS.<pkg> to see if we need to install the pkgsrc version -# or if the built-in one is sufficient. -# -_XPM_MAJOR!= \ - ${AWK} '/\#define[ ]*XpmFormat/ { print $$3 }' ${_X11_XPM_H} -_XPM_MINOR!= \ - ${AWK} '/\#define[ ]*XpmVersion/ { print "."$$3 }' ${_X11_XPM_H} -_XPM_PATCH!= \ - ${AWK} 'BEGIN { split("abcdefghijklmnopqrstuvwxyz", alpha, "") } /\#define[ ]*XpmRevision/ { print alpha[$$3] }' ${_X11_XPM_H} -_XPM_VERSION= ${_XPM_MAJOR}${_XPM_MINOR}${_XPM_PATCH} -BUILTIN_PKG.xpm= xpm-${_XPM_VERSION} -BUILDLINK_VARS+= BUILTIN_PKG.xpm -. endif -BUILDLINK_VARS+= IS_BUILTIN.xpm -.endif # IS_BUILTIN.xpm +.endif +MAKEVARS+= IS_BUILTIN.xpm -.if !defined(USE_BUILTIN.xpm) -USE_BUILTIN.xpm?= ${IS_BUILTIN.xpm} +### +### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to +### a package name to represent the built-in package. +### +.if !defined(BUILTIN_PKG.xpm) && \ + !empty(IS_BUILTIN.xpm:M[yY][eE][sS]) && \ + exists(${H_XPM}) +BUILTIN_VERSION.xpm!= \ + ${AWK} 'BEGIN { split("abcdefghijklmnopqrstuvwxyz", alpha, ""); \ + p = ".0" } \ + /\#define[ ]*XpmFormat/ { M = $$3 } \ + /\#define[ ]*XpmVersion/ { m = "."$$3 } \ + /\#define[ ]*XpmRevision/ { p = alpha[$$3] } \ + END { printf "%s%s%s\n", M, m, p }' \ + ${H_XPM} +BUILTIN_PKG.xpm= xpm-${BUILTIN_VERSION.xpm} +.endif +MAKEVARS+= BUILTIN_PKG.xpm -. if defined(BUILTIN_PKG.xpm) +### +### 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.xpm) +. if ${PREFER.xpm} == "pkgsrc" +USE_BUILTIN.xpm= no +. else +USE_BUILTIN.xpm= ${IS_BUILTIN.xpm} +. if defined(BUILTIN_PKG.xpm) && \ + !empty(IS_BUILTIN.xpm:M[yY][eE][sS]) USE_BUILTIN.xpm= yes -. if !empty(USE_BUILTIN.xpm:M[yY][eE][sS]) +. for _dep_ in ${BUILDLINK_DEPENDS.xpm} +. if !empty(USE_BUILTIN.xpm:M[yY][eE][sS]) USE_BUILTIN.xpm!= \ - if ${PKG_ADMIN} pmatch 'xpm>=3.4' ${BUILTIN_PKG.xpm}; then \ - ${ECHO} "yes"; \ - else \ - ${ECHO} "no"; \ - fi + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.xpm:Q}; then \ + ${ECHO} yes; \ + else \ + ${ECHO} no; \ + fi +. endif +. endfor . endif -. endif -.endif # USE_BUILTIN.xpm +. endif # PREFER.xpm +.endif +MAKEVARS+= USE_BUILTIN.xpm -.if !empty(USE_BUILTIN.xpm:M[yY][eE][sS]) +### +### The section below only applies if we are not including this file +### solely to determine whether a built-in implementation exists. +### +CHECK_BUILTIN.xpm?= no +.if !empty(CHECK_BUILTIN.xpm:M[nN][oO]) + +. if !empty(USE_BUILTIN.xpm:M[yY][eE][sS]) BUILDLINK_PREFIX.xpm= ${X11BASE} -.endif +. include "../../mk/x11.buildlink3.mk" +. include "../../mk/x11.builtin.mk" +. endif + +.endif # CHECK_BUILTIN.xpm diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile index 2ef2620c31d..761681f3368 100644 --- a/graphics/xsane/Makefile +++ b/graphics/xsane/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2005/05/22 20:08:08 jlam Exp $ +# $NetBSD: Makefile,v 1.52 2005/06/01 18:02:58 jlam Exp $ DISTNAME= xsane-0.96 PKGREVISION= 1 @@ -21,7 +21,6 @@ BUILD_USES_MSGFMT= yes USE_TOOLS+= gmake USE_PKGLOCALEDIR= YES -USE_X11= YES GNU_CONFIGURE= YES .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/inputmethod/Chinput/Makefile b/inputmethod/Chinput/Makefile index 0283dcee3d8..59b2118473d 100644 --- a/inputmethod/Chinput/Makefile +++ b/inputmethod/Chinput/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/04/11 21:46:11 tv Exp $ +# $NetBSD: Makefile,v 1.10 2005/06/01 18:02:58 jlam Exp $ DISTNAME= Chinput-3.0 PKGREVISION= 2 @@ -32,4 +32,5 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/Chinput .include "../../inputmethod/unicon-im/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/inputmethod/libtabe/Makefile b/inputmethod/libtabe/Makefile index 25f7e3c8136..b5ee7129bbc 100644 --- a/inputmethod/libtabe/Makefile +++ b/inputmethod/libtabe/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/04/11 21:46:11 tv Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 18:02:58 jlam Exp $ # DISTNAME= libtabe-0.2.5 @@ -11,7 +11,6 @@ HOMEPAGE= http://libtabe.sourceforge.net/ COMMENT= Library for Chinese language processing WRKSRC= ${WRKDIR}/libtabe -USE_X11= # defined USE_LIBTOOL= # defined GNU_CONFIGURE= # defined @@ -27,4 +26,5 @@ post-install: ${PREFIX}/share/doc/tabe/README.tsi .include "../../databases/db3/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/inputmethod/nabi/Makefile b/inputmethod/nabi/Makefile index c048d6059b7..bcaf80c8c0d 100644 --- a/inputmethod/nabi/Makefile +++ b/inputmethod/nabi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/04/11 21:46:11 tv Exp $ +# $NetBSD: Makefile,v 1.18 2005/06/01 18:02:58 jlam Exp $ # DISTNAME= nabi-0.15 @@ -9,7 +9,6 @@ MAINTAINER= minskim@NetBSD.org HOMEPAGE= http://nabi.kldp.net/ COMMENT= X Input Method for Korean -USE_X11= YES GNU_CONFIGURE= YES USE_PKGLOCALEDIR= YES diff --git a/inputmethod/uim/Makefile b/inputmethod/uim/Makefile index b8df405a376..1d44e8265ba 100644 --- a/inputmethod/uim/Makefile +++ b/inputmethod/uim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:08 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/06/01 18:02:58 jlam Exp $ # DISTNAME= uim-0.4.6 @@ -15,7 +15,6 @@ USE_NCURSES= # clear_screen, clr_eos USE_TOOLS+= gmake PKGCONFIG_OVERRIDE+= ${WRKSRC}/uim.pc.in GNU_CONFIGURE= YES -USE_X11= YES GTK2_IMMODULES= YES .include "options.mk" diff --git a/inputmethod/unicon-im/Makefile b/inputmethod/unicon-im/Makefile index 3ed959fc3bc..ce3b594fae3 100644 --- a/inputmethod/unicon-im/Makefile +++ b/inputmethod/unicon-im/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/04/11 21:46:11 tv Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 18:02:58 jlam Exp $ DISTNAME= unicon-1.2 PKGNAME= unicon-im-1.2 @@ -10,9 +10,9 @@ MAINTAINER= rxg@NetBSD.org HOMEPAGE= http://www.opencjk.org/~yumj/project-chinput.html COMMENT= Libraries and modules of Unicon -USE_X11= YES USE_LIBTOOL= YES GNU_CONFIGURE= YES .include "../../devel/pth/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/inputmethod/xcin/Makefile b/inputmethod/xcin/Makefile index 11095ce399b..6668714d07d 100644 --- a/inputmethod/xcin/Makefile +++ b/inputmethod/xcin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/04/11 21:46:12 tv Exp $ +# $NetBSD: Makefile,v 1.15 2005/06/01 18:02:58 jlam Exp $ # DISTNAME= xcin-2.5.3.pre2 @@ -32,5 +32,6 @@ post-install: .include "../../devel/gettext-lib/buildlink3.mk" .include "../../inputmethod/libtabe/buildlink3.mk" .include "../../lang/perl5/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/STk/Makefile b/lang/STk/Makefile index 5985e67a2f4..b8e03b87b39 100644 --- a/lang/STk/Makefile +++ b/lang/STk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/04/11 21:46:12 tv Exp $ +# $NetBSD: Makefile,v 1.14 2005/06/01 18:02:58 jlam Exp $ DISTNAME= STk-4.0.1 CATEGORIES= lang @@ -10,6 +10,6 @@ COMMENT= Scheme interpreter with full access to the Tk graphical package OSVERSION_SPECIFIC= yes GNU_CONFIGURE= yes -USE_X11= yes +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/drscheme/Makefile b/lang/drscheme/Makefile index 16064ee890d..d8edf28b66a 100644 --- a/lang/drscheme/Makefile +++ b/lang/drscheme/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2005/05/26 19:17:37 jschauma Exp $ +# $NetBSD: Makefile,v 1.28 2005/06/01 18:02:58 jlam Exp $ # DISTNAME= plt-${DRSCHEME_VERSION}-src-unix @@ -23,7 +23,6 @@ COMMENT= R4RS-compliant and nearly R5RS-compliant scheme tailored for teaching CONFLICTS+= mzscheme-[0-9]*:../../lang/mzscheme WRKSRC= ${WRKDIR}/plt/src -USE_X11= yes USE_TOOLS+= gmake USE_PERL5= yes GNU_CONFIGURE= yes @@ -70,6 +69,7 @@ post-install: .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" # See comment above. diff --git a/lang/eag/Makefile b/lang/eag/Makefile index 875ed5963cd..2f6e8dca51d 100644 --- a/lang/eag/Makefile +++ b/lang/eag/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/04/11 21:46:13 tv Exp $ +# $NetBSD: Makefile,v 1.4 2005/06/01 18:02:58 jlam Exp $ DISTNAME= eag-2.3 PKGREVISION= 1 @@ -12,8 +12,8 @@ COMMENT= Transducer generator using affix grammars PKG_INSTALLATION_TYPES= overwrite pkgviews -USE_X11= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/elk/Makefile b/lang/elk/Makefile index 94ee871cb4b..b5246e68f38 100644 --- a/lang/elk/Makefile +++ b/lang/elk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2005/04/11 21:46:13 tv Exp $ +# $NetBSD: Makefile,v 1.29 2005/06/01 18:02:58 jlam Exp $ DISTNAME= elk-3.0 PKGNAME= elk-3.0.3 @@ -26,7 +26,6 @@ BUILD_DEFS+= ELK_GUI .if ${ELK_GUI} != "none" MAKE_ENV+= X11_LDFLAGS="${X11_LDFLAGS:S/-Wl,//}" . if !empty(ELK_GUI:Mxaw) -USE_X11= # defined . include "../../mk/xaw.buildlink3.mk" LIBXAW:= ${LIBXAW:S/-Wl,//} ELK_SUBDIRS+= lib/xlib lib/xt lib/xaw @@ -44,6 +43,8 @@ PLIST_SRC+= ${PKGDIR}/PLIST.Motif PLIST_SRC+= ${PKGDIR}/PLIST.base MAKE_ENV+= ELK_SUBDIRS="${ELK_SUBDIRS}" +.include "../../mk/x11.buildlink3.mk" + do-configure: ${MV} ${WRKSRC}/src/stab-elf.c ${WRKSRC}/src/stab-elf.c-dist ${CP} ${FILESDIR}/stab-elf.c ${WRKSRC}/src diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile index 2b9b3d60bd9..7c643392267 100644 --- a/lang/erlang/Makefile +++ b/lang/erlang/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/05/22 20:08:09 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2005/06/01 18:02:58 jlam Exp $ DISTNAME= otp_src_R9C-0 PKGNAME= erlang-9.2 @@ -12,7 +12,6 @@ COMMENT= Concurrent functional programming language DIST_SUBDIR= erlang -USE_X11= yes USE_PERL5= yes GNU_CONFIGURE= yes USE_TOOLS+= gmake @@ -29,4 +28,5 @@ SUBST_MESSAGE.target= "Fixing target name." .include "../../devel/ncurses/buildlink3.mk" .include "../../mk/java-vm.mk" .include "../../mk/pthread.buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/icon/Makefile b/lang/icon/Makefile index c7956be4237..fbf2760f9cf 100644 --- a/lang/icon/Makefile +++ b/lang/icon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2005/04/11 21:46:14 tv Exp $ +# $NetBSD: Makefile,v 1.35 2005/06/01 18:02:58 jlam Exp $ DISTNAME= icon.v942src PKGNAME= icon-9.4.2 @@ -10,7 +10,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.cs.arizona.edu/icon/index.htm COMMENT= The Icon programming language -USE_X11= YES CONFIGURE_TARGET= X-Configure BUILD_TARGET= All TEST_TARGET= Test @@ -49,6 +48,7 @@ PTHREAD_OPTS+= require native PKG_FAIL_REASON= "${PKGNAME} does not have the correct config name for this system" .endif +.include "../../mk/x11.buildlink3.mk" pre-build: ${MKDIR} ${WRKSRC}/lib/icon diff --git a/lang/kaffe-x11/Makefile b/lang/kaffe-x11/Makefile index 4627321e0fb..5a5dc06d3df 100644 --- a/lang/kaffe-x11/Makefile +++ b/lang/kaffe-x11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2004/10/17 15:32:57 tv Exp $ +# $NetBSD: Makefile,v 1.4 2005/06/01 18:02:58 jlam Exp $ # .include "../../lang/kaffe/Makefile.common" @@ -8,7 +8,6 @@ PKGREVISION= 1 COMMENT+= (AWT support through X11) -USE_X11= YES CONFIGURE_ARGS:= ${CONFIGURE_ARGS:S/--without-awt/--with-awt=X/} @@ -22,4 +21,5 @@ PRINT_PLIST_AWK+= /^@dirrm/ { print "@comment in kaffe: " $$0; next; } .include "../../graphics/libungif/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../lang/kaffe/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/pnetlib/Makefile b/lang/pnetlib/Makefile index 5059d40047a..34ea7a9e985 100644 --- a/lang/pnetlib/Makefile +++ b/lang/pnetlib/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.4 2004/10/03 00:15:02 tv Exp $ +# $NetBSD: Makefile,v 1.5 2005/06/01 18:02:58 jlam Exp $ # PKGREVISION= 1 .include "Makefile.common" -USE_X11= yes # Disable xft support for now, it's broken. #CONFIGURE_ARGS+= --enable-xft @@ -16,4 +15,5 @@ PLIST_SUBST+= WITH_X11= CONFLICTS= pnetlib-nox11-[0-9]* #.include "../../fonts/Xft2/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/sather/Makefile b/lang/sather/Makefile index 367c40b06a6..b364562889b 100644 --- a/lang/sather/Makefile +++ b/lang/sather/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/05/22 20:08:11 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2005/06/01 18:02:59 jlam Exp $ DISTNAME= sather-1.2.1 PKGREVISION= 5 @@ -9,7 +9,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.gnu.org/directory/devel/prog/sather.html COMMENT= Compiler for the Sather object oriented programming language -USE_X11= # defined USE_TOOLS+= gmake BUILD_TARGET= full optional diff --git a/lang/scm/Makefile b/lang/scm/Makefile index ca9967234ae..22442864598 100644 --- a/lang/scm/Makefile +++ b/lang/scm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:11 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:59 jlam Exp $ # DISTNAME= scm5d9 @@ -14,7 +14,6 @@ COMMENT= Portable scheme interpreter DEPENDS+= slib>=3.1.1:../../devel/slib USE_TOOLS+= gmake -USE_X11= # defined WRKSRC= ${WRKDIR}/scm @@ -41,4 +40,5 @@ post-install: done .include "../../devel/ncurses/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/squeak/Makefile b/lang/squeak/Makefile index 8785feb1ef6..21977cd33d4 100644 --- a/lang/squeak/Makefile +++ b/lang/squeak/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2005/04/11 21:46:16 tv Exp $ +# $NetBSD: Makefile,v 1.27 2005/06/01 18:02:59 jlam Exp $ # DISTNAME= Squeak-3.6-3 @@ -14,7 +14,6 @@ COMMENT= Full Smalltalk 80 with portability to UN*X, Mac, and Windows GNU_CONFIGURE= yes USE_LIBTOOL= yes -USE_X11= yes AUTOCONF_REQD>= 2.57 AUTOMAKE_REQD= 1.4.6 @@ -55,4 +54,5 @@ CONFIGURE_ARGS+= --enable-mpg-mmx .include "../../mk/automake.mk" .include "../../audio/nas/buildlink3.mk" .include "../../mk/ossaudio.buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/sr/Makefile b/lang/sr/Makefile index 382b565804e..622b3f4e769 100644 --- a/lang/sr/Makefile +++ b/lang/sr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/04/11 21:46:16 tv Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/01 18:02:59 jlam Exp $ # DISTNAME= sr233 @@ -16,10 +16,11 @@ WRKSRC= ${WRKDIR} ONLY_FOR_PLATFORM= NetBSD-[2-9]*-* -USE_X11= yes TEST_TARGET= verify +.include "../../mk/x11.buildlink3.mk" + pre-configure: ${MV} ${WRKSRC}/Configuration \ ${WRKSRC}/Configuration.template diff --git a/lang/stalin/Makefile b/lang/stalin/Makefile index dcf540ad62d..2f43ec4a2aa 100644 --- a/lang/stalin/Makefile +++ b/lang/stalin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/04/11 21:46:16 tv Exp $ +# $NetBSD: Makefile,v 1.23 2005/06/01 18:02:59 jlam Exp $ DISTNAME= stalin-0.9 PKGREVISION= 4 @@ -13,7 +13,6 @@ COMMENT= Aggressively optimizing Scheme compiler # Only ported to these 4 archs ONLY_FOR_PLATFORM= *-*-i386 *-*-sparc *-*-alpha *-*-mips -USE_X11= yes UNLIMIT_RESOURCES= stacksize datasize .include "../../mk/bsd.prefs.mk" @@ -41,4 +40,5 @@ do-install: .include "../../devel/boehm-gc/buildlink3.mk" .include "../../graphics/Mesa/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/swi-prolog-packages/Makefile b/lang/swi-prolog-packages/Makefile index 7c3c696bb2b..596eee12ed7 100644 --- a/lang/swi-prolog-packages/Makefile +++ b/lang/swi-prolog-packages/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:11 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:02:59 jlam Exp $ .include "../swi-prolog-lite/Makefile.common" @@ -11,7 +11,6 @@ COMMENT= Packages for SWI Prolog GNU_CONFIGURE= yes USE_GNU_READLINE= yes # uses rl_event_hook() interface USE_TOOLS+= gmake -USE_X11= yes CONFIGURE_ENV+= PL=swi-prolog CONFIGURE_ARGS+= --disable-mt diff --git a/lang/tcl-otcl/Makefile b/lang/tcl-otcl/Makefile index 3a1b2f59b98..0610a48b1dd 100644 --- a/lang/tcl-otcl/Makefile +++ b/lang/tcl-otcl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/04/11 21:46:17 tv Exp $ +# $NetBSD: Makefile,v 1.14 2005/06/01 18:02:59 jlam Exp $ DISTNAME= otcl-1.9 PKGNAME= tcl-${DISTNAME} @@ -13,7 +13,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews GNU_CONFIGURE= yes USE_LIBTOOL= yes -USE_X11= yes CONFIGURE_ARGS+= V_LIBS="`${CONFIG_SHELL} -c '. ${TCLCONFIG_SH}; echo $$TCL_LIBS'`" CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl} diff --git a/lang/ucblogo/Makefile b/lang/ucblogo/Makefile index 77322ff9707..dc2027c9522 100644 --- a/lang/ucblogo/Makefile +++ b/lang/ucblogo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/04/11 21:46:17 tv Exp $ +# $NetBSD: Makefile,v 1.14 2005/06/01 18:02:59 jlam Exp $ DISTNAME= ucblogo-5.3 PKGREVISION= 1 @@ -15,7 +15,6 @@ MAKEFILE= makefile GNU_CONFIGURE= yes # otherwise ./configure guesses -L incorrectly LIBS= -L${X11BASE}/lib -USE_X11= yes post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ucblogo @@ -24,5 +23,6 @@ post-install: ${CP} ${WRKSRC}/emacs/docs/*.html ${PREFIX}/share/doc/ucblogo/html/ .include "../../devel/ncurses/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/yabasic/Makefile b/lang/yabasic/Makefile index ca8dcae546e..ec1bbf09a7e 100644 --- a/lang/yabasic/Makefile +++ b/lang/yabasic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/05/02 23:02:06 reed Exp $ +# $NetBSD: Makefile,v 1.10 2005/06/01 18:02:59 jlam Exp $ DISTNAME= yabasic-2.722 PKGREVISION= 2 @@ -9,7 +9,6 @@ MAINTAINER= david@silicium.ath.cx HOMEPAGE= http://www.yabasic.de/ COMMENT= Yet another Basic for Unix and Windows -USE_X11= YES GNU_CONFIGURE= YES post-install: @@ -18,4 +17,5 @@ post-install: ${PREFIX}/share/doc/html/yabasic .include "../../devel/ncurses/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/GNUMail/Makefile b/mail/GNUMail/Makefile index 3cde8164134..48eaaece9ff 100644 --- a/mail/GNUMail/Makefile +++ b/mail/GNUMail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/04/11 21:46:17 tv Exp $ +# $NetBSD: Makefile,v 1.17 2005/06/01 18:02:59 jlam Exp $ # DISTNAME= GNUMail-1.1.2 @@ -11,7 +11,6 @@ HOMEPAGE= http://www.collaboration-world.com/gnumail/ COMMENT= GNUstep clone of NeXT's Mail.app application WRKSRC= ${WRKDIR}/GNUMail -USE_X11= yes NO_CONFIGURE= yes post-extract: diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile index 1f5611cbef5..6a22e546064 100644 --- a/mail/balsa2/Makefile +++ b/mail/balsa2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2005/05/22 20:08:11 jlam Exp $ +# $NetBSD: Makefile,v 1.39 2005/06/01 18:02:59 jlam Exp $ DISTNAME= balsa-2.2.6 PKGREVISION= 1 @@ -15,7 +15,6 @@ BUILD_USES_MSGFMT= yes USE_DIRS+= gnome2-1.5 USE_PERL5= build -USE_X11= yes USE_PKGINSTALL= yes USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes diff --git a/mail/bbmail/Makefile b/mail/bbmail/Makefile index ae88d780900..6388bf62f07 100644 --- a/mail/bbmail/Makefile +++ b/mail/bbmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/04/11 21:46:17 tv Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:59 jlam Exp $ # DISTNAME= bbmail-0.8.3 @@ -10,9 +10,10 @@ HOMEPAGE= http://bbtools.windsofstorm.net/ COMMENT= Mailbox monitor (not only) for the blackbox windowmanager GNU_CONFIGURE= YES -USE_X11= YES USE_LANGUAGES= c++ +.include "../../mk/x11.buildlink3.mk" + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bbmail ${PREFIX}/bin/ ${INSTALL_MAN} ${WRKSRC}/bbmail.1 ${PREFIX}/man/man1/ diff --git a/mail/coolmail/Makefile b/mail/coolmail/Makefile index 4f23ce6348b..d9d3e238c2e 100644 --- a/mail/coolmail/Makefile +++ b/mail/coolmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2003/07/21 16:56:43 martti Exp $ +# $NetBSD: Makefile,v 1.6 2005/06/01 18:02:59 jlam Exp $ DISTNAME= coolmail-1.3 CATEGORIES= mail x11 @@ -11,6 +11,8 @@ COMMENT= Xbiff replacement with 3D animation and sound MAKE_ENV+= X11BASE=${PREFIX} USE_X11BASE= yes +.include "../../mk/x11.buildlink3.mk" + post-install: ${INSTALL_DATA} ${WRKSRC}/Coolmail.ad \ ${PREFIX}/lib/X11/app-defaults/Coolmail diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile index 9c79eae7cef..d42af2aa0d4 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.82 2005/05/31 19:44:15 rillig Exp $ +# $NetBSD: Makefile,v 1.83 2005/06/01 18:02:59 jlam Exp $ DISTNAME= evolution-2.2.2 CATEGORIES= mail time gnome @@ -28,7 +28,6 @@ PKG_FAIL_REASON= "Kerberos support conflicts with SSL" GNU_CONFIGURE= YES USE_DIRS+= gnome2-1.5 USE_TOOLS+= bison gmake -USE_X11= YES USE_LIBTOOL= YES USE_PKGLOCALEDIR= YES diff --git a/mail/evolution14/Makefile b/mail/evolution14/Makefile index b945fbaf8e8..af0426a5422 100644 --- a/mail/evolution14/Makefile +++ b/mail/evolution14/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/06/01 14:47:54 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 18:02:59 jlam Exp $ DISTNAME= evolution-1.4.6 PKGNAME= ${DISTNAME:S/evolution/evolution14/} @@ -29,7 +29,6 @@ BUILDLINK_DEPENDS.db3= db3-3.11.2{,nb*} GNU_CONFIGURE= YES USE_DIRS+= gnome2-1.5 USE_TOOLS+= bison gmake -USE_X11= YES USE_LIBTOOL= YES USE_PKGLOCALEDIR= YES diff --git a/mail/exmh/Makefile b/mail/exmh/Makefile index f7be2c1ca70..f271aeab360 100644 --- a/mail/exmh/Makefile +++ b/mail/exmh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2005/03/24 21:12:55 wiz Exp $ +# $NetBSD: Makefile,v 1.38 2005/06/01 18:02:59 jlam Exp $ DISTNAME= exmh-2.6.3 CATEGORIES= mail tk @@ -15,7 +15,6 @@ DEPENDS+= metamail>=2.7:../../mail/metamail .include "../../mk/bsd.prefs.mk" DIST_SUBDIR= ${PKGNAME} -USE_X11= yes WISH= wish TCLSH= tclsh @@ -28,6 +27,8 @@ TCLSH= tclsh # mail/faces # audio/rplay +.include "../../mk/x11.buildlink3.mk" + do-build: @cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} TCLSH=${TCLSH} \ WISH=${PREFIX}/bin/${WISH} WRKSRC=${WRKSRC} \ diff --git a/mail/faces/Makefile b/mail/faces/Makefile index 434511bf6a8..0f4ac45a227 100644 --- a/mail/faces/Makefile +++ b/mail/faces/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2005/04/11 21:46:19 tv Exp $ +# $NetBSD: Makefile,v 1.43 2005/06/01 18:02:59 jlam Exp $ DISTNAME= faces-1.6.1 PKGREVISION= 3 @@ -61,4 +61,5 @@ do-configure: done .include "../../lang/perl5/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/fetchmailconf/Makefile b/mail/fetchmailconf/Makefile index 47ebd689b4e..867d45fe71c 100644 --- a/mail/fetchmailconf/Makefile +++ b/mail/fetchmailconf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.62 2005/04/11 21:46:19 tv Exp $ +# $NetBSD: Makefile,v 1.63 2005/06/01 18:02:59 jlam Exp $ DISTNAME= fetchmail-6.2.5 PKGNAME= ${DISTNAME:S/fetchmail/fetchmailconf/} @@ -14,7 +14,6 @@ COMMENT= Configuration tool for fetchmail DEPENDS+= ${DISTNAME}{,nb*}:../../mail/fetchmail NO_BUILD= YES -USE_X11= YES DISTINFO_FILE= ${.CURDIR}/../../mail/fetchmail/distinfo PATCHDIR= ${.CURDIR}/../../mail/fetchmail/patches diff --git a/mail/libmilter/builtin.mk b/mail/libmilter/builtin.mk index 57b3b9574e7..8f314ba5540 100644 --- a/mail/libmilter/builtin.mk +++ b/mail/libmilter/builtin.mk @@ -1,27 +1,49 @@ -# $NetBSD: builtin.mk,v 1.2 2004/07/18 15:41:35 tron Exp $ +# $NetBSD: builtin.mk,v 1.3 2005/06/01 18:02:59 jlam Exp $ +BUILTIN_PKG:= libmilter + +BUILTIN_FIND_LIBS:= milter +BUILTIN_FIND_FILES_VAR:= H_LIBMILTER +BUILTIN_FIND_FILES.H_LIBMILTER= /usr/include/libmilter/mfapi.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.libmilter) IS_BUILTIN.libmilter= no -. if exists(/usr/include/libmilter) && exists (/usr/lib/libmilter.a) +. if empty(H_LIBMILTER:M${LOCALBASE}/*) && exists(${H_LIBMILTER}) && \ + !empty(BUILTIN_LIB_FOUND.milter:M[yY][eE][sS]) IS_BUILTIN.libmilter= yes . endif -.endif # IS_BUILTIN.libmilter +.endif +MAKEVARS+= IS_BUILTIN.libmilter +### +### 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.libmilter) -USE_BUILTIN.libmilter?= ${IS_BUILTIN.libmilter} - -. if defined(BUILTIN_PKG.libmilter) +. if ${PREFER.libmilter} == "pkgsrc" +USE_BUILTIN.libmilter= no +. else +USE_BUILTIN.libmilter= ${IS_BUILTIN.libmilter} +. if defined(BUILTIN_PKG.libmilter) && \ + !empty(IS_BUILTIN.libmilter:M[yY][eE][sS]) USE_BUILTIN.libmilter= yes -. for _depend_ in ${BUILDLINK_DEPENDS.libmilter} -. if !empty(USE_BUILTIN.libmilter:M[yY][eE][sS]) -USE_BUILTIN.libmilter!= \ - if ${PKG_ADMIN} pmatch '${_depend_}' ${BUILTIN_PKG.libmilter}; then \ - ${ECHO} "yes"; \ +. for _dep_ in ${BUILDLINK_DEPENDS.libmilter} +. if !empty(USE_BUILTIN.libmilter:M[yY][eE][sS]) +USE_BUILTIN.libmilter!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.libmilter:Q}; then \ + ${ECHO} yes; \ else \ - ${ECHO} "no"; \ + ${ECHO} no; \ fi -. endif -. endfor -. endif -.endif # USE_BUILTIN.libmilter - +. endif +. endfor +. endif +. endif # PREFER.libmilter +.endif +MAKEVARS+= USE_BUILTIN.libmilter diff --git a/mail/libmilter812/builtin.mk b/mail/libmilter812/builtin.mk index 09de8120c04..9743d3e3766 100644 --- a/mail/libmilter812/builtin.mk +++ b/mail/libmilter812/builtin.mk @@ -1,27 +1,49 @@ -# $NetBSD: builtin.mk,v 1.1.1.1 2004/08/30 20:53:20 adrianp Exp $ +# $NetBSD: builtin.mk,v 1.2 2005/06/01 18:02:59 jlam Exp $ +BUILTIN_PKG:= libmilter + +BUILTIN_FIND_LIBS:= milter +BUILTIN_FIND_FILES_VAR:= H_LIBMILTER +BUILTIN_FIND_FILES.H_LIBMILTER= /usr/include/libmilter/mfapi.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.libmilter) IS_BUILTIN.libmilter= no -. if exists(/usr/include/libmilter) && exists (/usr/lib/libmilter.a) +. if empty(H_LIBMILTER:M${LOCALBASE}/*) && exists(${H_LIBMILTER}) && \ + !empty(BUILTIN_LIB_FOUND.milter:M[yY][eE][sS]) IS_BUILTIN.libmilter= yes . endif -.endif # IS_BUILTIN.libmilter +.endif +MAKEVARS+= IS_BUILTIN.libmilter +### +### 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.libmilter) -USE_BUILTIN.libmilter?= ${IS_BUILTIN.libmilter} - -. if defined(BUILTIN_PKG.libmilter) +. if ${PREFER.libmilter} == "pkgsrc" +USE_BUILTIN.libmilter= no +. else +USE_BUILTIN.libmilter= ${IS_BUILTIN.libmilter} +. if defined(BUILTIN_PKG.libmilter) && \ + !empty(IS_BUILTIN.libmilter:M[yY][eE][sS]) USE_BUILTIN.libmilter= yes -. for _depend_ in ${BUILDLINK_DEPENDS.libmilter} -. if !empty(USE_BUILTIN.libmilter:M[yY][eE][sS]) -USE_BUILTIN.libmilter!= \ - if ${PKG_ADMIN} pmatch '${_depend_}' ${BUILTIN_PKG.libmilter}; then \ - ${ECHO} "yes"; \ +. for _dep_ in ${BUILDLINK_DEPENDS.libmilter} +. if !empty(USE_BUILTIN.libmilter:M[yY][eE][sS]) +USE_BUILTIN.libmilter!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.libmilter:Q}; then \ + ${ECHO} yes; \ else \ - ${ECHO} "no"; \ + ${ECHO} no; \ fi -. endif -. endfor -. endif -.endif # USE_BUILTIN.libmilter - +. endif +. endfor +. endif +. endif # PREFER.libmilter +.endif +MAKEVARS+= USE_BUILTIN.libmilter diff --git a/mail/spruce/Makefile b/mail/spruce/Makefile index 4fac3aafcf5..c79fb1a2253 100644 --- a/mail/spruce/Makefile +++ b/mail/spruce/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/05/22 20:08:12 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2005/06/01 18:02:59 jlam Exp $ # DISTNAME= spruce-0.5.17 @@ -10,7 +10,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://spruce.sourceforge.net/ COMMENT= MIME-aware, GNOME-based email program -USE_X11= yes GNU_CONFIGURE= yes USE_TOOLS+= gmake USE_PKGLOCALEDIR= yes diff --git a/mail/sylpheed-claws/Makefile.common b/mail/sylpheed-claws/Makefile.common index cd5f5c30154..5f261391951 100644 --- a/mail/sylpheed-claws/Makefile.common +++ b/mail/sylpheed-claws/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.14 2005/05/22 20:08:12 jlam Exp $ +# $NetBSD: Makefile.common,v 1.15 2005/06/01 18:03:00 jlam Exp $ DISTNAME= sylpheed-claws-${SYLPHEED_VERSION} CATEGORIES= mail news x11 @@ -13,10 +13,11 @@ PATCHDIR= ${.CURDIR}/../../mail/sylpheed-claws/patches USE_TOOLS+= gmake USE_LIBTOOL= YES USE_PKGLOCALEDIR= YES -USE_X11= YES GNU_CONFIGURE= YES # Force gnome detection off to avoid installing some extra files CONFIGURE_ENV+= ac_cv_path_GNOME_CONFIG="no" SYLPHEED_VERSION= 1.0.4 + +.include "../../mk/x11.buildlink3.mk" diff --git a/mail/sylpheed-devel/Makefile b/mail/sylpheed-devel/Makefile index 94bd738bf6a..e74b89862db 100644 --- a/mail/sylpheed-devel/Makefile +++ b/mail/sylpheed-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/05/29 14:45:27 chris Exp $ +# $NetBSD: Makefile,v 1.10 2005/06/01 18:03:00 jlam Exp $ DISTNAME= sylpheed-1.9.12 CATEGORIES= mail news x11 @@ -18,7 +18,6 @@ CONFLICTS= sylpheed-claws-[0-9]* sylpheed-gtk2-[0-9]* USE_PKGINSTALL= yes USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes -USE_X11= yes USE_TOOLS+= gmake GNU_CONFIGURE= yes diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile index 34c2c4eabcd..c139a6677a8 100644 --- a/mail/sylpheed/Makefile +++ b/mail/sylpheed/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.76 2005/05/22 20:08:12 jlam Exp $ +# $NetBSD: Makefile,v 1.77 2005/06/01 18:03:00 jlam Exp $ DISTNAME= sylpheed-1.0.4 CATEGORIES= mail news x11 @@ -16,7 +16,6 @@ CONFLICTS= sylpheed-claws-[0-9]* sylpheed-gtk2-[0-9]* USE_PKGINSTALL= yes USE_PKGLOCALEDIR= yes -USE_X11= yes USE_TOOLS+= gmake GNU_CONFIGURE= yes diff --git a/mail/wmbiff/Makefile b/mail/wmbiff/Makefile index a9205a5de82..ac61704098e 100644 --- a/mail/wmbiff/Makefile +++ b/mail/wmbiff/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/05/22 20:08:13 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2005/06/01 18:03:00 jlam Exp $ DISTNAME= wmbiff-0.4.25 PKGREVISION= 1 @@ -10,7 +10,6 @@ HOMEPAGE= http://sourceforge.net/projects/wmbiff/ COMMENT= xbuffy like "mail-checker" for WindowMaker GNU_CONFIGURE= YES -USE_X11= YES USE_TOOLS+= gmake EX_DIR= ${PREFIX}/share/examples/wmbiff diff --git a/mail/wmmail/Makefile b/mail/wmmail/Makefile index 9e4c966ee7a..cfdf35e8559 100644 --- a/mail/wmmail/Makefile +++ b/mail/wmmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2005/05/22 20:08:13 jlam Exp $ +# $NetBSD: Makefile,v 1.28 2005/06/01 18:03:00 jlam Exp $ DISTNAME= WMMail.app-0.64 PKGNAME= wmmail-0.64 @@ -19,4 +19,5 @@ CONFIGURE_ARGS+= --with-PL-incs="-I${LOCALBASE}/include" \ --with-PL-libs="-L${LOCALBASE}/lib" .include "../../devel/libproplist/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/xbuffy/Makefile b/mail/xbuffy/Makefile index 9204c9b0b42..fc21957358c 100644 --- a/mail/xbuffy/Makefile +++ b/mail/xbuffy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2003/07/21 16:56:57 martti Exp $ +# $NetBSD: Makefile,v 1.8 2005/06/01 18:03:00 jlam Exp $ # DISTNAME= xbuffy-3.4 @@ -14,6 +14,8 @@ USE_X11BASE= YES CPPFLAGS+= -I${X11BASE}/include CPPFLAGS+= -Wall +.include "../../mk/x11.buildlink3.mk" + post-install: ${INSTALL_DATA} ${WRKSRC}/XBuffy.ad ${PREFIX}/lib/X11/app-defaults/XBuffy diff --git a/math/R/Makefile b/math/R/Makefile index 2c3aa55a21d..f49b4dda31f 100644 --- a/math/R/Makefile +++ b/math/R/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.67 2005/05/22 20:08:13 jlam Exp $ +# $NetBSD: Makefile,v 1.68 2005/06/01 18:03:00 jlam Exp $ DISTNAME= R-2.1.0 CATEGORIES= math @@ -15,7 +15,6 @@ NOT_FOR_PLATFORM= NetBSD-1.[0-4]*-alpha NetBSD-1.5-alpha \ PKG_INSTALLATION_TYPES= overwrite pkgviews TEST_TARGET= check -USE_X11= # defined USE_PERL5= # defined USE_TOOLS+= gmake xmkmf USE_GNU_READLINE= # uses callback interface diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile index 205b973d91c..267361e968e 100644 --- a/math/gcalctool/Makefile +++ b/math/gcalctool/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2005/05/22 20:08:13 jlam Exp $ +# $NetBSD: Makefile,v 1.37 2005/06/01 18:03:03 jlam Exp $ # DISTNAME= gcalctool-5.5.42 @@ -15,7 +15,6 @@ BUILD_USES_MSGFMT= YES GNU_CONFIGURE= YES USE_DIRS+= gnome2-1.5 USE_TOOLS+= gmake -USE_X11= YES USE_PKGLOCALEDIR= yes GCONF2_SCHEMAS= gcalctool.schemas diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile index b9d63b180d8..667480a85be 100644 --- a/math/gnumeric/Makefile +++ b/math/gnumeric/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.94 2005/05/22 20:08:13 jlam Exp $ +# $NetBSD: Makefile,v 1.95 2005/06/01 18:03:03 jlam Exp $ # DISTNAME= gnumeric-1.2.13 @@ -14,7 +14,6 @@ COMMENT= Spreadsheet program from the GNOME project BUILD_USES_MSGFMT= YES USE_DIRS+= xdg-1.1 USE_PKGLOCALEDIR= YES -USE_X11= YES USE_TOOLS+= gmake USE_PERL5= YES USE_LIBTOOL= YES diff --git a/math/gnumeric14/Makefile b/math/gnumeric14/Makefile index 83eaa5db90c..06b2ff2824a 100644 --- a/math/gnumeric14/Makefile +++ b/math/gnumeric14/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/06/01 12:55:10 markd Exp $ +# $NetBSD: Makefile,v 1.9 2005/06/01 18:03:03 jlam Exp $ # DISTNAME= gnumeric-1.4.3 @@ -13,7 +13,6 @@ COMMENT= Spreadsheet program from the GNOME project BUILD_USES_MSGFMT= YES USE_DIRS+= xdg-1.1 USE_PKGLOCALEDIR= YES -USE_X11= YES USE_TOOLS+= gmake USE_PERL5= YES USE_LIBTOOL= YES diff --git a/math/grpn/Makefile b/math/grpn/Makefile index 21e1ccba6c4..958498e2c16 100644 --- a/math/grpn/Makefile +++ b/math/grpn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/04/11 21:46:29 tv Exp $ +# $NetBSD: Makefile,v 1.17 2005/06/01 18:03:03 jlam Exp $ # DISTNAME= grpn-1.1.2 @@ -11,7 +11,6 @@ MAINTAINER= dmcmahill@NetBSD.org HOMEPAGE= http://lashwhip.com/grpn.html COMMENT= Graphical reverse polish notation (RPN) calculator -USE_X11= # defined BUILD_TARGET= grpn .include "../../x11/gtk/buildlink3.mk" diff --git a/math/guppi/Makefile b/math/guppi/Makefile index 19e73596005..444a2ba66d5 100644 --- a/math/guppi/Makefile +++ b/math/guppi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2005/05/22 20:08:13 jlam Exp $ +# $NetBSD: Makefile,v 1.48 2005/06/01 18:03:03 jlam Exp $ DISTNAME= Guppi-0.40.3 PKGNAME= ${DISTNAME:S/G/g/} @@ -20,7 +20,6 @@ CONFIGURE_ARGS= --disable-gnumeric USE_DIRS+= xdg-1.1 USE_PKGLOCALEDIR= YES -USE_X11= YES USE_TOOLS+= gmake GNU_CONFIGURE= YES USE_LIBTOOL= YES diff --git a/math/octave-forge/Makefile b/math/octave-forge/Makefile index 26fed8af060..1ffaf729e0b 100644 --- a/math/octave-forge/Makefile +++ b/math/octave-forge/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:14 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2005/06/01 18:03:03 jlam Exp $ DISTNAME= octave-forge-2004.11.16 PKGREVISION= 1 @@ -12,7 +12,6 @@ COMMENT= Extensions to Octave PKG_INSTALLATION_TYPES= overwrite pkgviews USE_TOOLS+= gmake -USE_X11= yes GNU_CONFIGURE= yes UNLIMIT_RESOURCES= datasize @@ -48,5 +47,6 @@ post-patch: .include "../../graphics/png/buildlink3.mk" .include "../../math/gsl/buildlink3.mk" .include "../../math/octave/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/pari/Makefile b/math/pari/Makefile index b2d7447d6c2..1f6b9ed36fb 100644 --- a/math/pari/Makefile +++ b/math/pari/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/04/11 21:46:30 tv Exp $ +# $NetBSD: Makefile,v 1.25 2005/06/01 18:03:03 jlam Exp $ DISTNAME= pari-2.1.5 PKGREVISION= 4 @@ -13,7 +13,6 @@ COMMENT= Software package for computer-aided number theory BUILD_DEPENDS+= teTeX-[0-9]*:../../print/teTeX USE_LIBTOOL= yes -USE_X11= yes USE_GNU_READLINE= # rl_save_prompt HAS_CONFIGURE= yes @@ -28,4 +27,5 @@ TEST_TARGET= test-compat bench .include "../../devel/ncurses/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" .include "../../lang/perl5/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/snns/Makefile b/math/snns/Makefile index fe7a48aef83..7af222786be 100644 --- a/math/snns/Makefile +++ b/math/snns/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/04/11 21:46:31 tv Exp $ +# $NetBSD: Makefile,v 1.14 2005/06/01 18:03:04 jlam Exp $ DISTNAME= SNNSv4.2 PKGNAME= snns-4.2 @@ -9,7 +9,6 @@ MAINTAINER= wulf@NetBSD.org HOMEPAGE= http://www-ra.informatik.uni-tuebingen.de/SNNS/ COMMENT= Software simulator for neural networks -USE_X11= YES GNU_CONFIGURE= YES CONFIGURE_ARGS= --enable-global diff --git a/math/tasp-vsipl/Makefile b/math/tasp-vsipl/Makefile index 80401065816..94f90e61827 100644 --- a/math/tasp-vsipl/Makefile +++ b/math/tasp-vsipl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/04/11 21:46:31 tv Exp $ +# $NetBSD: Makefile,v 1.8 2005/06/01 18:03:04 jlam Exp $ DISTNAME= tvcpp0p8 PKGNAME= tasp-vsipl-20030710 @@ -12,7 +12,8 @@ COMMENT= Vector Signal Image Processing Library WRKSRC= ${WRKDIR}/${DISTNAME}/lib DIST_SUBDIR= tasp-vsipl -USE_X11= yes + +.include "../../mk/x11.buildlink3.mk" post-extract: ${MKDIR} ${WRKSRC} diff --git a/math/vista/Makefile b/math/vista/Makefile index 717e0048d5e..a4aca67a658 100644 --- a/math/vista/Makefile +++ b/math/vista/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/05/22 20:08:14 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/01 18:03:04 jlam Exp $ # DISTNAME= vista @@ -16,4 +16,5 @@ WRKSRC= ${WRKDIR}/vista-5.0.5 USE_X11BASE= yes USE_TOOLS+= gmake +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/xgap/Makefile b/math/xgap/Makefile index 528b5384c0d..ce74309e376 100644 --- a/math/xgap/Makefile +++ b/math/xgap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/04/11 21:46:31 tv Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/01 18:03:04 jlam Exp $ # DISTNAME= xgap4r16 @@ -13,7 +13,6 @@ HOMEPAGE= http://www.gap-system.org/Share/xgap.html COMMENT= GUI for GAP WRKSRC= ${WRKDIR}/${GAP_PKG_NAME} -USE_X11= YES GNU_CONFIGURE= YES BUILD_TARGET= default @@ -35,5 +34,6 @@ do-install: cd ${WRKSRC} && ${PAX} -rw $$I ${GAP_PKG_DIRECTORY}; \ done +.include "../../mk/x11.buildlink3.mk" .include "../../math/gap/gap.package.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/xlispstat/Makefile b/math/xlispstat/Makefile index d179654fab1..13d98990a92 100644 --- a/math/xlispstat/Makefile +++ b/math/xlispstat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/03/24 21:12:56 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2005/06/01 18:03:04 jlam Exp $ DISTNAME= xlispstat-3-52-18 PKGNAME= xlispstat-3.52.18 @@ -25,4 +25,5 @@ MAKE_ENV+= CPPFLAGS= MAKE_ENV+= DISPLAY= # Prevent 'Rejected connection' +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/yacas/Makefile b/math/yacas/Makefile index bf721e96d24..c1eb703a21f 100644 --- a/math/yacas/Makefile +++ b/math/yacas/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:14 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2005/06/01 18:03:04 jlam Exp $ # DISTNAME= yacas-1.0.57 @@ -13,7 +13,6 @@ USE_LANGUAGES= c c++ GNU_CONFIGURE= YES USE_TOOLS+= gmake USE_LIBTOOL= YES -USE_X11= YES USE_PERL5= build TEST_TARGET= test @@ -37,4 +36,5 @@ post-install: .endfor .include "../../math/gsl/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/yorick/Makefile b/math/yorick/Makefile index 390e49f51b3..fa512e71042 100644 --- a/math/yorick/Makefile +++ b/math/yorick/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/05/31 21:53:26 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2005/06/01 18:03:04 jlam Exp $ DISTNAME= yorick-1.6.02 CATEGORIES= math @@ -10,7 +10,6 @@ HOMEPAGE= ftp://ftp-icf.llnl.gov/pub/Yorick/doc/index.html COMMENT= Numerical algebra system (similar to Matlab) WRKSRC= ${WRKDIR}/yorick-1.6 -USE_X11= yes BUILD_DIRS= ${WRKSRC} ${WRKSRC}/doc INSTALL_DIRS= ${WRKSRC} @@ -18,6 +17,8 @@ USE_MAKEINFO= YES INFO_FILES= yorick.info USE_TOOLS+= gmake +.include "../../mk/x11.buildlink3.mk" + post-patch: for f in ${WRKSRC}/ysite.sh; do \ ${SED} -e 's:@PREFIX@:${PREFIX}:g' $$f > $$f.tmp \ diff --git a/mbone/imm/Makefile b/mbone/imm/Makefile index a57cb0dccde..3839b652ae6 100644 --- a/mbone/imm/Makefile +++ b/mbone/imm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/04/05 11:50:25 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2005/06/01 18:03:04 jlam Exp $ DISTNAME= imm36a1 PKGNAME= imm-3.6a1 @@ -13,7 +13,6 @@ COMMENT= Internet Image(or other data) Multicaster (and receiver) DEPENDS+= xv>=3.10:../../graphics/xv WRKSRC= ${WRKDIR}/${DISTNAME}.src -USE_X11= yes BUILD_TARGET= netbsd .include "../../x11/tk83/buildlink3.mk" diff --git a/mbone/vat/Makefile b/mbone/vat/Makefile index 6a03fafca3d..513eac8053b 100644 --- a/mbone/vat/Makefile +++ b/mbone/vat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2005/04/05 10:35:13 wiz Exp $ +# $NetBSD: Makefile,v 1.49 2005/06/01 18:03:04 jlam Exp $ # DISTNAME= vatsrc-4.0b2 @@ -11,7 +11,6 @@ HOMEPAGE= http://www-nrg.ee.lbl.gov/vat/ COMMENT= The Visual Audio Tool - multicast audioconferencing WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} -USE_X11= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-tcl=${PREFIX} --with-tk=${PREFIX} diff --git a/mbone/vic/Makefile b/mbone/vic/Makefile index 189f81095d7..6052a452a3f 100644 --- a/mbone/vic/Makefile +++ b/mbone/vic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2005/04/11 21:46:32 tv Exp $ +# $NetBSD: Makefile,v 1.32 2005/06/01 18:03:04 jlam Exp $ DISTNAME= vicsrc-2.8 PKGNAME= ${DISTNAME:S/src//} @@ -19,7 +19,6 @@ COMMENT= MBONE video conferencing tool WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} GNU_CONFIGURE= yes -USE_X11= yes CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl} CONFIGURE_ARGS+= --with-tk=${BUILDLINK_PREFIX.tk} diff --git a/meta-pkgs/gnome-base/Makefile b/meta-pkgs/gnome-base/Makefile index 4b8cb55f15d..6730b3eae2c 100644 --- a/meta-pkgs/gnome-base/Makefile +++ b/meta-pkgs/gnome-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/05/19 21:13:51 jmmv Exp $ +# $NetBSD: Makefile,v 1.20 2005/06/01 18:03:04 jlam Exp $ DISTNAME= gnome-base-2.10.1 CATEGORIES= meta-pkgs x11 gnome @@ -81,7 +81,6 @@ DEPENDS+= gnome-session>=2.10.0:../../x11/gnome-session # Not really part of GNOME, but we need it. DEPENDS+= xscreensaver>=4.16:../../x11/xscreensaver -USE_X11= yes EXTRACT_ONLY= # empty NO_CHECKSUM= yes NO_CONFIGURE= yes diff --git a/meta-pkgs/gnome/Makefile b/meta-pkgs/gnome/Makefile index 39b51e652de..27370423634 100644 --- a/meta-pkgs/gnome/Makefile +++ b/meta-pkgs/gnome/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2005/05/19 21:13:51 jmmv Exp $ +# $NetBSD: Makefile,v 1.50 2005/06/01 18:03:04 jlam Exp $ DISTNAME= gnome-2.10.1 CATEGORIES= meta-pkgs x11 gnome @@ -61,7 +61,6 @@ DEPENDS+= ximian-connector>=2.2.2:../../mail/ximian-connector #DEPENDS+= gnomemeeting>=1.2.1:../../net/gnomemeeting #DEPENDS+= sound-juicer>=2.10.1:../../audio/sound-juicer -USE_X11= yes EXTRACT_ONLY= # empty NO_CHECKSUM= yes NO_CONFIGURE= yes diff --git a/meta-pkgs/gnustep/Makefile b/meta-pkgs/gnustep/Makefile index 9e84caf9071..8f77cd40379 100644 --- a/meta-pkgs/gnustep/Makefile +++ b/meta-pkgs/gnustep/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/04/11 21:46:33 tv Exp $ +# $NetBSD: Makefile,v 1.18 2005/06/01 18:03:04 jlam Exp $ # DISTNAME= gnustep-1.10.0 @@ -24,7 +24,6 @@ DEPENDS+= ProjectCenter>=0.3.6:../../devel/ProjectCenter DEPENDS+= Renaissance>=0.7.0:../../devel/Renaissance DEPENDS+= gworkspace>=0.6.3:../../sysutils/gworkspace -USE_X11= yes NO_CHECKSUM= yes NO_CONFIGURE= yes NO_BUILD= yes diff --git a/meta-pkgs/gtk2-extras/Makefile b/meta-pkgs/gtk2-extras/Makefile index 1c6c3b56f69..9051af371d6 100644 --- a/meta-pkgs/gtk2-extras/Makefile +++ b/meta-pkgs/gtk2-extras/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/04/11 21:46:33 tv Exp $ +# $NetBSD: Makefile,v 1.10 2005/06/01 18:03:04 jlam Exp $ DISTNAME= gtk2-extras-2.6.0 PKGREVISION= 1 @@ -15,7 +15,6 @@ DEPENDS+= gtk2-engines>=2.6.0:../../x11/gtk2-engines DEPENDS+= librsvg2-gtk2>=2.6.3:../../graphics/librsvg2-gtk2 DEPENDS+= swfdec-gtk2>=0.2.1nb1:../../graphics/swfdec-gtk2 -USE_X11= yes EXTRACT_ONLY= # empty NO_CHECKSUM= yes NO_CONFIGURE= yes diff --git a/meta-pkgs/kde3/kde3.mk b/meta-pkgs/kde3/kde3.mk index 70f9bedf09e..e713d74a7f3 100644 --- a/meta-pkgs/kde3/kde3.mk +++ b/meta-pkgs/kde3/kde3.mk @@ -1,4 +1,4 @@ -# $NetBSD: kde3.mk,v 1.8 2005/05/18 22:35:04 reed Exp $ +# $NetBSD: kde3.mk,v 1.9 2005/06/01 18:03:04 jlam Exp $ # # This Makefile fragment is included by packages that use the KDE3 # configure-and-build process. @@ -37,7 +37,6 @@ .if !defined(KDE3_MK) KDE3_MK= # defined -USE_X11= YES USE_PKGLOCALEDIR= YES .include "../../mk/bsd.prefs.mk" diff --git a/meta-pkgs/windowmaker-desktop/Makefile b/meta-pkgs/windowmaker-desktop/Makefile index e4e44c1ba3b..4a649cb2ca6 100644 --- a/meta-pkgs/windowmaker-desktop/Makefile +++ b/meta-pkgs/windowmaker-desktop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/01/28 00:00:14 ben Exp $ +# $NetBSD: Makefile,v 1.15 2005/06/01 18:03:04 jlam Exp $ # DISTNAME= windowmaker-desktop-1.2 @@ -25,7 +25,6 @@ DEPENDS+= wmweather-[0-9]*:../../x11/wmweather DEPENDS+= wmMoonClock-[0-9]*:../../time/wmmoonclock DEPENDS+= wmmixer-[0-9]*:../../audio/wmmixer -USE_X11= yes EXTRACT_ONLY= # empty NO_CHECKSUM= yes NO_CONFIGURE= yes diff --git a/meta-pkgs/xfce4/Makefile.common b/meta-pkgs/xfce4/Makefile.common index 48f3570bc80..950de5ab18c 100644 --- a/meta-pkgs/xfce4/Makefile.common +++ b/meta-pkgs/xfce4/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.22 2005/05/22 21:49:24 rillig Exp $ +# $NetBSD: Makefile.common,v 1.23 2005/06/01 18:03:04 jlam Exp $ MASTER_SITES= http://www.xfce.org/archive/xfce-4.2.2/src/ \ http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-4.2.2/src/ \ @@ -11,7 +11,6 @@ XFCE4_VERSION= 4.2.2 # Do NOT put a PKGREVISION statement in this file! -USE_X11= yes USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes @@ -25,6 +24,7 @@ PKG_CONFIG_PATH= ${BUILDLINK_DIR}/lib/pkgconfig .include "../../devel/glib2/buildlink3.mk" .include "../../devel/pkgconfig/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" ## # Use the latest GNU tar when the native tar is buggy ## .if !empty(MACHINE_PLATFORM:MNetBSD-1.6*) diff --git a/misc/9menu/Makefile b/misc/9menu/Makefile index 86937841202..1321e8a87b8 100644 --- a/misc/9menu/Makefile +++ b/misc/9menu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/03/24 21:12:57 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2005/06/01 18:03:04 jlam Exp $ DISTNAME= 9menu-1.8 CATEGORIES= misc plan9 @@ -10,10 +10,11 @@ COMMENT= Simple menu patterned after the plan9 user interface MAKEFILE= Makefile.noimake BUILD_TARGET= 9menu -USE_X11= yes WRKSRC= ${WRKDIR} +.include "../../mk/x11.buildlink3.mk" + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/9menu ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/9menu.1 ${PREFIX}/man/man1 diff --git a/misc/Addresses/Makefile b/misc/Addresses/Makefile index 87801e12a84..ac204ec3856 100644 --- a/misc/Addresses/Makefile +++ b/misc/Addresses/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:33 tv Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:04 jlam Exp $ # DISTNAME= Addresses-0.4.6 @@ -9,7 +9,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://giesler.biz/bjoern/en/sw_addr.html COMMENT= Address book for GNUstep -USE_X11= yes NO_CONFIGURE= yes MAKE_ENV+= Addresses_OBJCFLAGS=-I.. diff --git a/misc/astrolog/Makefile b/misc/astrolog/Makefile index c7ee9b46a77..0c6f6764584 100644 --- a/misc/astrolog/Makefile +++ b/misc/astrolog/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/04/11 21:46:33 tv Exp $ +# $NetBSD: Makefile,v 1.26 2005/06/01 18:03:04 jlam Exp $ DISTNAME= ast54unx PKGNAME= astrolog-5.40 @@ -27,6 +27,8 @@ USE_X11BASE= yes DIST_SUBDIR= astrolog BUILD_TARGET= astrolog +.include "../../mk/x11.buildlink3.mk" + do-install: @${INSTALL_DATA_DIR} ${PREFIX}/lib/astrolog cd ${DISTDIR}/${DIST_SUBDIR} && \ diff --git a/misc/bbappconf/Makefile b/misc/bbappconf/Makefile index 76845663283..5aa77619b1a 100644 --- a/misc/bbappconf/Makefile +++ b/misc/bbappconf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/04/11 21:46:33 tv Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 18:03:04 jlam Exp $ # DISTNAME= bbappconf-0.0.2 @@ -13,6 +13,8 @@ USE_LANGUAGES= c c++ USE_X11BASE= YES GNU_CONFIGURE= YES +.include "../../mk/x11.buildlink3.mk" + post-patch: ${SED} -e 's,@PREFIX@,${PREFIX},' ${WRKSRC}/data/bbappconf.1.tmp > \ ${WRKSRC}/data/bbappconf.1 diff --git a/misc/bbweather/Makefile b/misc/bbweather/Makefile index 480a65373a8..e5e03f63024 100644 --- a/misc/bbweather/Makefile +++ b/misc/bbweather/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/05/15 22:02:27 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2005/06/01 18:03:04 jlam Exp $ # DISTNAME= bbweather-0.6.2 @@ -12,12 +12,13 @@ COMMENT= Show current weather conditions DEPENDS+= wget>=1.7:../../net/wget -USE_X11= YES GNU_CONFIGURE= YES REPLACE_PERL= GrabWeather USE_PERL5= run PKGSRC_USE_TOOLS+= gunzip +.include "../../mk/x11.buildlink3.mk" + post-install: cd ${PREFIX}/man/man1 && ${GUNZIP_CMD} GrabWeather.1.gz cd ${PREFIX}/man/man1 && ${GUNZIP_CMD} bbweather.1.gz diff --git a/misc/celestia/Makefile.common b/misc/celestia/Makefile.common index 4d60666239c..64e383b97a1 100644 --- a/misc/celestia/Makefile.common +++ b/misc/celestia/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.17 2005/05/22 20:08:14 jlam Exp $ +# $NetBSD: Makefile.common,v 1.18 2005/06/01 18:03:05 jlam Exp $ DISTNAME= celestia-${CELESTIA_VERS} CATEGORIES= misc x11 @@ -15,7 +15,6 @@ CELESTIA_VERS= 1.3.2 USE_TOOLS+= gmake USE_LANGUAGES= c++ USE_LIBTOOL= yes -USE_X11= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-lua --with-glut @@ -42,3 +41,4 @@ CONFIGURE_ARGS+= --disable-threading .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../lang/lua/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" diff --git a/misc/fooseti/Makefile b/misc/fooseti/Makefile index beb110d8a87..b79f9f07d6a 100644 --- a/misc/fooseti/Makefile +++ b/misc/fooseti/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/04/11 21:46:34 tv Exp $ +# $NetBSD: Makefile,v 1.10 2005/06/01 18:03:05 jlam Exp $ # DISTNAME= fooseti-0.6.6 @@ -13,7 +13,6 @@ COMMENT= Simple GTK+ frontend for the Seti@home client DEPENDS+= setiathome>=3.00:../../misc/setiathome GNU_CONFIGURE= YES -USE_X11= YES CPPFLAGS+= -DPKG_BINDIR="\"${LOCALBASE}/bin\"" diff --git a/misc/gnome2-user-docs/Makefile b/misc/gnome2-user-docs/Makefile index f8f0b035c46..7ab20138572 100644 --- a/misc/gnome2-user-docs/Makefile +++ b/misc/gnome2-user-docs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/05/22 20:08:15 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2005/06/01 18:03:05 jlam Exp $ # DISTNAME= gnome2-user-docs-2.8.1 @@ -14,7 +14,6 @@ USE_DIRS+= gnome2-1.5 USE_TOOLS+= gmake USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes -USE_X11= yes GNU_CONFIGURE= yes .include "../../textproc/scrollkeeper/omf.mk" diff --git a/misc/gnome2-utils/Makefile b/misc/gnome2-utils/Makefile index ae4f6ebcf77..341e8a60748 100644 --- a/misc/gnome2-utils/Makefile +++ b/misc/gnome2-utils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2005/05/22 20:08:15 jlam Exp $ +# $NetBSD: Makefile,v 1.40 2005/06/01 18:03:05 jlam Exp $ # DISTNAME= gnome-utils-2.10.1 @@ -16,7 +16,6 @@ USE_PERL5= build USE_TOOLS+= gmake USE_DIRS+= gnome2-1.5 USE_PKGLOCALEDIR= yes -USE_X11= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-gtk-doc=no diff --git a/misc/gok/Makefile b/misc/gok/Makefile index 68f9f97f0cd..274564b52e2 100644 --- a/misc/gok/Makefile +++ b/misc/gok/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2005/05/22 20:08:15 jlam Exp $ +# $NetBSD: Makefile,v 1.27 2005/06/01 18:03:05 jlam Exp $ # DISTNAME= gok-1.0.3 @@ -14,7 +14,6 @@ USE_DIRS+= gnome2-1.5 USE_TOOLS+= gmake USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes -USE_X11= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc diff --git a/misc/gperiodic/Makefile b/misc/gperiodic/Makefile index 78eb9fd4403..105354e28cc 100644 --- a/misc/gperiodic/Makefile +++ b/misc/gperiodic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2005/05/22 20:08:15 jlam Exp $ +# $NetBSD: Makefile,v 1.32 2005/06/01 18:03:05 jlam Exp $ DISTNAME= gperiodic-2.0.8 CATEGORIES= misc x11 @@ -12,7 +12,6 @@ BUILD_USES_MSGFMT= # defined USE_DIRS+= gnome1-1.5 USE_PKGLOCALEDIR= # defined -USE_X11= # defined USE_TOOLS+= gmake BUILDLINK_TRANSFORM+= rm:-DG_DISABLE_DEPRECATED diff --git a/misc/gxmame/Makefile b/misc/gxmame/Makefile index 6f8bfa0b64a..bab98d0c389 100644 --- a/misc/gxmame/Makefile +++ b/misc/gxmame/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:15 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2005/06/01 18:03:05 jlam Exp $ # DISTNAME= gxmame-0.35beta1 @@ -17,7 +17,6 @@ GNU_CONFIGURE= yes USE_DIRS+= gnome2-1.5 USE_TOOLS+= gmake USE_PKGLOCALEDIR= yes -USE_X11= yes .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/pkgconfig/buildlink3.mk" diff --git a/misc/kp/Makefile b/misc/kp/Makefile index ce3fa10a561..2401c2b19fe 100644 --- a/misc/kp/Makefile +++ b/misc/kp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/03/24 21:12:57 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2005/06/01 18:03:05 jlam Exp $ DISTNAME= kp-0.96 CATEGORIES= misc tk @@ -9,7 +9,7 @@ COMMENT= The Keyboard Practicer, touch-type training program DEPENDS= tk>=8.3.2:../../x11/tk -USE_X11= yes +.include "../../mk/x11.buildlink3.mk" pre-configure: for f in `${FIND} ${WRKDIR}/. -type f -print \ diff --git a/misc/molden/Makefile b/misc/molden/Makefile index c9e9dbf5796..d17207a1a98 100644 --- a/misc/molden/Makefile +++ b/misc/molden/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/04/11 21:46:38 tv Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 18:03:05 jlam Exp $ DISTNAME= molden4.2 PKGNAME= ${DISTNAME:S/molden/&-/} @@ -15,7 +15,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews MAKEFILE= makefile BUILD_TARGET= molden -USE_X11= # defined USE_LANGUAGES= fortran INTERACTIVE_STAGE= fetch @@ -48,4 +47,5 @@ do-install: done .include "../../graphics/Mesa/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/nxtvepg/Makefile b/misc/nxtvepg/Makefile index f11a9fa8b1c..c3ac7753537 100644 --- a/misc/nxtvepg/Makefile +++ b/misc/nxtvepg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2005/05/22 20:08:17 jlam Exp $ +# $NetBSD: Makefile,v 1.46 2005/06/01 18:03:05 jlam Exp $ DISTNAME= nxtvepg-2.7.5 CATEGORIES= misc @@ -14,7 +14,6 @@ ONLY_FOR_PLATFORM= NetBSD-1.4[Y-Z]-* NetBSD-1.4Z[A-Z]-* \ USE_PERL5= yes USE_TOOLS+= gmake -USE_X11= yes PTHREAD_AUTO_VARS= yes .include "../../mk/pthread.buildlink3.mk" diff --git a/misc/openoffice/Makefile b/misc/openoffice/Makefile index bc230019e92..0b494bcd398 100644 --- a/misc/openoffice/Makefile +++ b/misc/openoffice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.64 2005/05/22 20:08:17 jlam Exp $ +# $NetBSD: Makefile,v 1.65 2005/06/01 18:03:05 jlam Exp $ DISTNAME= openoffice-1.1.4 PKGREVISION= 2 @@ -27,7 +27,6 @@ USE_LANGUAGES+= c c++ .include "../../mk/bsd.prefs.mk" -USE_X11= # defined USE_TOOLS+= gmake USE_PERL5= build PTHREAD_OPTS+= require @@ -116,4 +115,5 @@ PLIST_SRC+= PLIST.common_end .include "../../mk/pthread.buildlink3.mk" .include "../../lang/perl5/buildlink3.mk" .include "../../textproc/libxslt/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/root/Makefile b/misc/root/Makefile index f9f33cb393a..a0dba2c076e 100644 --- a/misc/root/Makefile +++ b/misc/root/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/05/22 20:08:17 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2005/06/01 18:03:05 jlam Exp $ DISTNAME= root_v2.23.08.source PKGNAME= root-2.23 @@ -13,7 +13,6 @@ BUILD_DEPENDS+= cint-5.14.40:../../lang/cint WRKSRC= ${WRKDIR} BUILDLINK_PASSTHRU_DIRS=${PREFIX}/root/lib -USE_X11= YES USE_TOOLS+= gmake BUILD_TARGET= netbsd diff --git a/misc/siag/Makefile b/misc/siag/Makefile index 6e570b66a4c..3a055350272 100644 --- a/misc/siag/Makefile +++ b/misc/siag/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2005/05/22 20:08:18 jlam Exp $ +# $NetBSD: Makefile,v 1.45 2005/06/01 18:03:05 jlam Exp $ # DISTNAME= siag-3.5.7 @@ -20,7 +20,6 @@ CONFIGURE_ARGS+=--with-guile CONFIGURE_ARGS+=--with-docdir=${PREFIX}/share/doc/siag GNU_CONFIGURE= YES USE_TOOLS+= gmake -USE_X11= YES .include "../../mk/bsd.prefs.mk" diff --git a/misc/stellarium/Makefile b/misc/stellarium/Makefile index a3fe890e4fb..d902875ac50 100644 --- a/misc/stellarium/Makefile +++ b/misc/stellarium/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:18 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2005/06/01 18:03:05 jlam Exp $ # DISTNAME= stellarium-0.6.0 @@ -11,7 +11,6 @@ HOMEPAGE= http://stellarium.free.fr/ COMMENT= Generate photorealistic skys with OpenGL USE_TOOLS+= gmake -USE_X11= yes GNU_CONFIGURE= yes .include "../../devel/SDL/buildlink3.mk" diff --git a/misc/xdg-x11-dirs/Makefile b/misc/xdg-x11-dirs/Makefile index f1ce131215f..c41d8a1abff 100644 --- a/misc/xdg-x11-dirs/Makefile +++ b/misc/xdg-x11-dirs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/04/28 23:06:01 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:05 jlam Exp $ # DISTNAME= xdg-x11-dirs-1.2 @@ -32,4 +32,5 @@ MAKE_DIRS+= ${XDG_X11_DIRS:O:S/^/${PREFIX}\//} do-install: # nothing +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/xtide/Makefile b/misc/xtide/Makefile index fa1db12d9ff..218a1c34466 100644 --- a/misc/xtide/Makefile +++ b/misc/xtide/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/04/11 21:46:40 tv Exp $ +# $NetBSD: Makefile,v 1.10 2005/06/01 18:03:05 jlam Exp $ DISTNAME= xtide-2.4 PKGNAME= ${DISTNAME} @@ -16,7 +16,6 @@ XTIDE_SRC= ${DISTNAME}${EXTRACT_SUFX} USE_PKGINSTALL= yes GNU_CONFIGURE= yes -USE_X11= yes CONFIGURE_ARGS+=--sysconfdir="${PKG_SYSCONFDIR}" EGDIR= ${PREFIX}/share/examples/xtide diff --git a/misc/yelp/Makefile b/misc/yelp/Makefile index 202818064b0..b19853b11a2 100644 --- a/misc/yelp/Makefile +++ b/misc/yelp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2005/05/31 15:54:26 drochner Exp $ +# $NetBSD: Makefile,v 1.31 2005/06/01 18:03:05 jlam Exp $ # DISTNAME= yelp-2.10.0 @@ -19,7 +19,6 @@ USE_DIRS+= gnome2-1.5 USE_TOOLS+= gmake USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes -USE_X11= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-html-widget=gtkhtml2 diff --git a/misc/zorro/Makefile b/misc/zorro/Makefile index c0cd4191b05..58acf1193e9 100644 --- a/misc/zorro/Makefile +++ b/misc/zorro/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/03/24 21:12:58 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2005/06/01 18:03:05 jlam Exp $ DISTNAME= zorro-1.1p8 PKGNAME= zorro-1.1.8 @@ -11,7 +11,8 @@ COMMENT= Simple to-do list manager DEPENDS+= tk>=8.3.2:../../x11/tk NO_BUILD= yes -USE_X11= yes + +.include "../../mk/x11.buildlink3.mk" post-patch: ( cd ${WRKSRC} ; ${SED} 's|@PREFIX@|'${PREFIX}'|g' \ diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index a9bea62fdd5..6f7a2bd883f 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1684 2005/06/01 17:27:22 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1685 2005/06/01 18:03:05 jlam Exp $ # # This file is in the public domain. # @@ -717,10 +717,6 @@ CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM} . endif CONFIGURE_ARGS+= --prefix=${GNU_CONFIGURE_PREFIX} HAS_CONFIGURE= yes -. if defined(USE_X11) -CONFIGURE_ARGS+= --x-includes=${X11BASE}/include -CONFIGURE_ARGS+= --x-libraries=${X11BASE}/lib${LIBABISUFFIX} -. endif CONFIGURE_HAS_INFODIR?= yes . if !empty(INFO_FILES) && !empty(CONFIGURE_HAS_INFODIR:M[yY][eE][sS]) CONFIGURE_ARGS+= --infodir=${PREFIX}/${INFO_DIR} diff --git a/mk/bsd.pkg.use.mk b/mk/bsd.pkg.use.mk index 65d466b7c33..837ab426dbf 100644 --- a/mk/bsd.pkg.use.mk +++ b/mk/bsd.pkg.use.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.use.mk,v 1.15 2005/05/22 19:11:12 jlam Exp $ +# $NetBSD: bsd.pkg.use.mk,v 1.16 2005/06/01 18:03:05 jlam Exp $ # # Turn USE_* macros into proper depedency logic. Included near the top of # bsd.pkg.mk, after bsd.prefs.mk. @@ -27,7 +27,7 @@ MAKE_FLAGS+= CC=${CC:Q} CXX=${CXX:Q} .if defined(USE_X11BASE) MTREE_FILE?= ${PKGSRCDIR}/mk/${OPSYS}.x11.dist -USE_X11?= implied +. include "../../mk/x11.buildlink3.mk" .endif .if ${PKG_INSTALLATION_TYPE} == "pkgviews" @@ -119,13 +119,6 @@ RMAN?= ${X11BASE}/bin/rman . endif .endif -### USE_X11 - -.if defined(USE_X11) -X11_LDFLAGS+= ${COMPILER_RPATH_FLAG}${X11BASE}/lib${LIBABISUFFIX} -X11_LDFLAGS+= -L${X11BASE}/lib${LIBABISUFFIX} -.endif - ### USE_XPKGWEDGE .if defined(USE_X11BASE) && !empty(USE_XPKGWEDGE:M[yY][eE][sS]) diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk index f5ea9fce213..3483df9212a 100644 --- a/mk/buildlink3/bsd.buildlink3.mk +++ b/mk/buildlink3/bsd.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink3.mk,v 1.170 2005/05/11 22:08:18 jlam Exp $ +# $NetBSD: bsd.buildlink3.mk,v 1.171 2005/06/01 18:03:06 jlam Exp $ # # Copyright (c) 2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -104,27 +104,10 @@ BUILDLINK_DEPENDS?= # empty # For each package we use, check whether we are using the built-in # version of the package or if we are using the pkgsrc version. # -.include "../../mk/buildlink3/bsd.builtin.mk" - -# Check whether we should include the X11 buildlink3.mk file here since -# USE_X11 may have been set indirectly by bsd.builtin.mk. -# -.if defined(USE_X11) -X11_TYPE?= native -X11_PKGSRCDIR.native= ../../pkgtools/x11-links -X11_PKGSRCDIR.XFree86= ../../x11/XFree86-libs -X11_PKGSRCDIR.xlibs= ../../x11/xlibs -X11_PKGSRCDIR.xorg= ../../x11/xorg-libs -. if exists(${X11_PKGSRCDIR.${X11_TYPE}}/buildlink3.mk) -. include "${X11_PKGSRCDIR.${X11_TYPE}}/buildlink3.mk" -. if exists(${X11_PKGSRCDIR.${X11_TYPE}}/builtin.mk) -. include "${X11_PKGSRCDIR.${X11_TYPE}}/builtin.mk" -. endif -. else -PKG_FAIL_REASON+= \ - "${PKGNAME} uses X11, but \"${X11_TYPE}\" isn't a valid X11 type." -. endif -.endif +.for _pkg_ in ${BUILDLINK_PACKAGES} +BUILDLINK_BUILTIN_MK.${_pkg_}?= ${BUILDLINK_PKGSRCDIR.${_pkg_}}/builtin.mk +. sinclude "${BUILDLINK_BUILTIN_MK.${_pkg_}}" +.endfor # Set IGNORE_PKG.<pkg> if <pkg> is the current package we're building. # We can then check for this value to avoid build loops. diff --git a/mk/buildlink3/bsd.builtin.mk b/mk/buildlink3/bsd.builtin.mk index f0144b1f81e..97893e248b3 100644 --- a/mk/buildlink3/bsd.builtin.mk +++ b/mk/buildlink3/bsd.builtin.mk @@ -1,6 +1,6 @@ -# $NetBSD: bsd.builtin.mk,v 1.4 2005/05/24 15:41:05 xtraeme Exp $ +# $NetBSD: bsd.builtin.mk,v 1.5 2005/06/01 18:03:06 jlam Exp $ # -# Copyright (c) 2004 The NetBSD Foundation, Inc. +# Copyright (c) 2004-2005 The NetBSD Foundation, Inc. # All rights reserved. # # This code is derived from software contributed to The NetBSD Foundation @@ -51,44 +51,66 @@ # An example package builtin.mk file is: # # -------------8<-------------8<-------------8<-------------8<------------- -# .if !defined(IS_BUILTIN.foo) -# # -# # IS_BUILTIN.foo is set to "yes" or "no" depending on whether "foo" -# # genuinely exists in the system or not. -# # -# IS_BUILTIN.foo?= no -# -# # BUILTIN_PKG.foo should be set here if "foo" is built-in and its package -# # version can be determined. -# # -# . if !empty(IS_BUILTIN.foo:M[yY][eE][sS]) -# BUILTIN_PKG.foo?= foo-1.0 -# . endif -# .endif # IS_BUILTIN.foo -# -# .if !defined(USE_BUILTIN.foo) -# USE_BUILTIN.foo?= ${IS_BUILTIN.foo} -# . if defined(BUILTIN_PKG.foo) -# . for _depend_ in ${BUILDLINK_DEPENDS.foo} -# . if !empty(USE_BUILTIN.foo:M[yY][eE][sS]) -# USE_BUILTIN.foo!= \ -# if ${PKG_ADMIN} pmatch '${_depend_}' ${BUILTIN_PKG.foo}; then \ +# BUILTIN_PKG:= wibble +# .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.wibble) +# IS_BUILTIN.wibble= no +# .endif +# MAKEVARS+= IS_BUILTIN.wibble +# +# ### +# ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to +# ### a package name to represent the built-in package. +# ### +# .if !defined(BUILTIN_PKG.iconv) && \ +# !empty(IS_BUILTIN.wibble:M[yY][eE][sS]) +# BUILTIN_PKG.wibble= wibble-1.0 +# .endif +# MAKEVARS+= BUILTIN_PKG.wibble +# +# ### +# ### 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.wibble) +# . if ${PREFER.wibble} == "pkgsrc" +# USE_BUILTIN.wibble= no +# . else +# USE_BUILTIN.wibble= ${IS_BUILTIN.wibble} +# . if defined(BUILTIN_PKG.wibble) && \ +# !empty(IS_BUILTIN.wibble:M[yY][eE][sS]) +# USE_BUILTIN.wibble= yes +# . for _dep_ in ${BUILDLINK_DEPENDS.wibble} +# . if !empty(USE_BUILTIN.wibble:M[yY][eE][sS]) +# USE_BUILTIN.wibble!= \ +# if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.wibble:Q}; then \ # ${ECHO} "yes"; \ # else \ # ${ECHO} "no"; \ # fi -# . endif -# . endfor +# . endif +# . endfor +# . endif # . endif -# .endif # USE_BUILTIN.foo -# -# CHECK_BUILTIN.foo?= no -# .if !empty(CHECK_BUILTIN.foo:M[nN][oO]) +# .endif +# MAKEVARS+= USE_BUILTIN.wibble +# +# ### +# ### The section below only applies if we are not including this file +# ### solely to determine whether a built-in implementation exists. +# ### +# CHECK_BUILTIN.wibble?= no +# .if !empty(CHECK_BUILTIN.wibble:M[nN][oO]) # # -# # Here we place code that depends on whether USE_BUILTIN.foo is set to -# # "yes" or "no". +# # Here we place code that depends on whether USE_BUILTIN.wibble is +# # set to "yes" or "no". # # -# .endif # CHECK_BUILTIN.foo +# .endif # CHECK_BUILTIN.wibble # -------------8<-------------8<-------------8<-------------8<------------- # # Note the structure of the builtin.mk file: first we set IS_BUILTIN.<pkg>, @@ -96,17 +118,21 @@ # USE_BUILTIN.<pkg> is "yes" or "no" in a region that is guarded by # CHECK_BUILTIN.<pkg>. Package builtin.mk files aren't protected against # multiple inclusion. +# + +.include "../../mk/bsd.prefs.mk" +.for _pkg_ in ${BUILTIN_PKG} +# # Define PREFER.<pkg> to be either "pkgsrc" or "native" depending on # whether to prefer the pkgsrc or native versions of software that's -# also part of the base system. It's value is determined from the +# also part of the base system. Its value is determined from the # user-settable values PREFER_PKGSRC and PREFER_NATIVE. Preferences are # determined by the most specific instance of the package in either # PREFER_PKGSRC or PREFER_NATIVE. If a package is specified in neither # or in both variables, then PREFER_PKGSRC has precedence over # PREFER_NATIVE. # -.for _pkg_ in ${BUILDLINK_PACKAGES} PREFER.${_pkg_}?= pkgsrc . if !empty(PREFER_NATIVE:M[yY][eE][sS]) PREFER.${_pkg_}= native @@ -122,37 +148,5 @@ PREFER.${_pkg_}= pkgsrc . endif .endfor -.for _pkg_ in ${BUILDLINK_PACKAGES} -# -# builtin.mk files default to using the built-in software if it's -# available (${PREFER.<pkg>} == "native") unless USE_BUILTIN.<pkg> has -# been previously set. -# -. if ${PREFER.${_pkg_}} == "pkgsrc" -USE_BUILTIN.${_pkg_}?= no -. endif -# -# Set the default path to the package builtin.mk file. -# -BUILDLINK_BUILTIN_MK.${_pkg_}?= ${BUILDLINK_PKGSRCDIR.${_pkg_}}/builtin.mk -. if exists(${BUILDLINK_BUILTIN_MK.${_pkg_}}) -. include "${BUILDLINK_BUILTIN_MK.${_pkg_}}" -. endif -.endfor - -# Default fall-through for packages that don't provide a builtin.mk. This -# is here to set the default for any package added to BUILDLINK_PACKAGES -# by any of the above code. -# -# BUILTIN_PACKAGES will contain the list of all builtin -# dependencies used in packages. -# - -.for _pkg_ in ${BUILDLINK_PACKAGES} -USE_BUILTIN.${_pkg_}?= no -BUILTIN_PACKAGES?= # empty -. if !empty(USE_BUILTIN.${_pkg_}:M[Yy][Ee][Ss]) -BUILTIN_PACKAGES+= ${_pkg_} -. endif -.endfor - +.include "../../mk/buildlink3/find-libs.mk" +.include "../../mk/buildlink3/find-files.mk" diff --git a/mk/buildlink3/find-files.mk b/mk/buildlink3/find-files.mk new file mode 100644 index 00000000000..cd1ff634eca --- /dev/null +++ b/mk/buildlink3/find-files.mk @@ -0,0 +1,101 @@ +# $NetBSD: find-files.mk,v 1.1 2005/06/01 18:03:06 jlam Exp $ +# +# Copyright (c) 2005 The NetBSD Foundation, Inc. +# All rights reserved. +# +# This code is derived from software contributed to The NetBSD Foundation +# by Johnny C. Lam. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# 3. All advertising materials mentioning features or use of this software +# must display the following acknowledgement: +# This product includes software developed by the NetBSD +# Foundation, Inc. and its contributors. +# 4. Neither the name of The NetBSD Foundation nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS +# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS +# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# + +# +# This is a "subroutine" that can be included to detect the presence of +# files in the base system. +# +# The following variables must be defined before including this file: +# +# BUILTIN_FIND_FILES_VAR is a list of variables to define. These +# variables take the value of the path to the file that is +# "found". +# +# BUILTIN_FIND_FILES.<var> is the list of paths to files to find, in +# order, on the filesystem. The variable <var> is set to the +# first path "found" on the filesystem. +# +# Optionally, the following variables may also be defined: +# +# BUILTIN_FIND_GREP.<var> is a regular expression that must be +# matched within a file in order for the file to be considered +# "found". If it isn't defined, then we simply check for the +# existence of the file. +# +# After including this file, the following variables are defined: +# +# <var> is the first of the files listed in ${BUILTIN_FIND_FILES.<var>} +# that is "found", or else it is "__nonexistent__". +# +# An example use is: +# +# BUILTIN_FIND_FILES_VAR:= FOO BAR +# +# BUILTIN_FIND_FILES.FOO= /path1 /path2 +# BUILTIN_FIND_GREP.FOO= \#define.*FOO +# +# BUILTIN_FIND_FILES.BAR= /path3 /path4 +# .include "../../mk/buildlink3/builtin-files.mk" +# + +.if empty(PKGSRC_USE_TOOLS:Mecho) +PKGSRC_USE_TOOLS+= echo +.endif +.if empty(PKGSRC_USE_TOOLS:Mgrep) +PKGSRC_USE_TOOLS+= grep +.endif + +.for _var_ in ${BUILTIN_FIND_FILES_VAR} +. if !defined(${_var_}) +${_var_}= __nonexistent__ +. for _file_ in ${BUILTIN_FIND_FILES.${_var_}} +. if !empty(${_var_}:M__nonexistent__) && exists(${_file_}) +. if !defined(BUILTIN_FIND_GREP.${_var_}) +${_var_}= ${_file_} +. else +${_var_}!= \ + if ${GREP} -q ${BUILTIN_FIND_GREP.${_var_}:Q} ${_file_:Q}; then \ + ${ECHO} ${_file_:Q}; \ + else \ + ${ECHO} __nonexistent__; \ + fi +. endif +. endif +. endfor +. endif +MAKEVARS+= ${_var_} +.endfor diff --git a/mk/buildlink3/find-libs.mk b/mk/buildlink3/find-libs.mk index 538e852c7f5..9cd0ce0475f 100644 --- a/mk/buildlink3/find-libs.mk +++ b/mk/buildlink3/find-libs.mk @@ -1,4 +1,4 @@ -# $NetBSD: find-libs.mk,v 1.1 2005/05/24 03:44:04 jlam Exp $ +# $NetBSD: find-libs.mk,v 1.2 2005/06/01 18:03:06 jlam Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -41,14 +41,14 @@ # # The input variable is BUILDLINK_FIND_LIBS, which is a list of library # names, e.g. ncurses, iconv, etc., that will be sought in the base -# system. BUILDLINK_LIB_FOUND.<lib> is set to "yes" or "no" depending +# system. BUILTIN_LIB_FOUND.<lib> is set to "yes" or "no" depending # on the result of the search. -# +# # An example use is: # # BUILDLINK_FIND_LIBS:= intl iconv # .include "../../mk/buildlink3/find-libs.mk" -# # ${BUILDLINK_LIB_FOUND.intl} and ${BUILDLINK_LIB_FOUND.iconv} are now +# # ${BUILTIN_LIB_FOUND.intl} and ${BUILTIN_LIB_FOUND.iconv} are now # # either "yes" or "no". # @@ -59,17 +59,16 @@ PKGSRC_USE_TOOLS+= echo PKGSRC_USE_TOOLS+= test .endif -.for _lib_ in ${BUILDLINK_FIND_LIBS} -. if !defined(BUILDLINK_LIB_FOUND.${_lib_}) -BUILDLINK_LIB_FOUND.${_lib_}!= \ - if ${TEST} "`${ECHO} /usr/lib/lib${_lib_}.*`" != "/usr/lib/lib${_lib_}.*"; then \ +.for _lib_ in ${BUILTIN_FIND_LIBS} +. if !defined(BUILTIN_LIB_FOUND.${_lib_}) +BUILTIN_LIB_FOUND.${_lib_}!= \ + if ${TEST} "`${ECHO} /usr/lib${ABI}/lib${_lib_}.*`" != "/usr/lib${ABI}/lib${_lib_}.*"; then \ ${ECHO} yes; \ - elif ${TEST} "`${ECHO} /lib/lib${_lib_}.*`" != "/lib/lib${_lib_}.*"; then \ + elif ${TEST} "`${ECHO} /lib${ABI}/lib${_lib_}.*`" != "/lib${ABI}/lib${_lib_}.*"; then \ ${ECHO} yes; \ else \ ${ECHO} no; \ fi . endif -MAKEVARS+= BUILDLINK_LIB_FOUND.${_lib_} +MAKEVARS+= BUILTIN_LIB_FOUND.${_lib_} .endfor -.undef _lib_ diff --git a/mk/db1.builtin.mk b/mk/db1.builtin.mk index c92e9984895..4aef418388c 100644 --- a/mk/db1.builtin.mk +++ b/mk/db1.builtin.mk @@ -1,90 +1,91 @@ -# $NetBSD: db1.builtin.mk,v 1.10 2004/12/23 14:27:04 jlam Exp $ +# $NetBSD: db1.builtin.mk,v 1.11 2005/06/01 18:03:06 jlam Exp $ -.for _lib_ in db db1 -. if !defined(_BLNK_LIB_FOUND.${_lib_}) -_BLNK_LIB_FOUND.${_lib_}!= \ - if ${TEST} "`${ECHO} /usr/lib/lib${_lib_}.*`" != "/usr/lib/lib${_lib_}.*"; then \ - ${ECHO} "yes"; \ - elif ${TEST} "`${ECHO} /lib/lib${_lib_}.*`" != "/lib/lib${_lib_}.*"; then \ - ${ECHO} "yes"; \ - else \ - ${ECHO} "no"; \ - fi -BUILDLINK_VARS+= _BLNK_LIB_FOUND.${_lib_} -. endif -.endfor -.undef _lib_ +BUILTIN_PKG:= db1 -_DB_H_HEADERS= /usr/include/db.h /usr/include/db1/db.h - -.if !defined(IS_BUILTIN.db1) -IS_BUILTIN.db1= no +BUILTIN_FIND_LIBS:= db db1 +BUILTIN_FIND_FILES_VAR:= H_DB +BUILTIN_FIND_FILES.H_DB= /usr/include/db.h /usr/include/db1/db.h # # The builtin Berkeley database library must support hash version 2 or # else it doesn't support db-1.85 databases. # -_BLNK_NATIVE_DB1_OK= no -. for _inc_ in ${_DB_H_HEADERS} -. if exists(${_inc_}) -_BLNK_NATIVE_DB1_OK.${_inc_}!= \ - if ${GREP} -q "^\#define.*HASHVERSION.*2$$" ${_inc_}; then \ - ${ECHO} "yes"; \ - else \ - ${ECHO} "no"; \ - fi -. endif -_BLNK_NATIVE_DB1_OK+= ${_BLNK_NATIVE_DB1_OK.${_inc_}} -. endfor -. undef _inc_ -. if !empty(_BLNK_NATIVE_DB1_OK:M[yY][eE][sS]) -IS_BUILTIN.db1= yes +BUILTIN_FIND_GREP.H_DB= ^\#define.*HASHVERSION.*2$$ + +.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.db1) +IS_BUILTIN.db1= no +. if empty(H_DB:M${LOCALBASE}/*) && exists(${H_DB}) +IS_BUILTIN.db1= yes . endif -BUILDLINK_VARS+= IS_BUILTIN.db1 -.endif # IS_BUILTIN.db1 +.endif +MAKEVARS+= IS_BUILTIN.db1 +### +### 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.db1) -USE_BUILTIN.db1?= ${IS_BUILTIN.db1} -_INCOMPAT_DB1?= # empty -. for _pattern_ in ${_INCOMPAT_DB1} ${INCOMPAT_DB1} -. if !empty(MACHINE_PLATFORM:M${_pattern_}) +. if ${PREFER.db1} == "pkgsrc" USE_BUILTIN.db1= no +. else +USE_BUILTIN.db1= ${IS_BUILTIN.db1} +. if defined(BUILTIN_PKG.db1) && \ + !empty(IS_BUILTIN.db1:M[yY][eE][sS]) +USE_BUILTIN.db1= yes +. for _dep_ in ${BUILDLINK_DEPENDS.db1} +. if !empty(USE_BUILTIN.db1:M[yY][eE][sS]) +USE_BUILTIN.db1!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.db1:Q}; then \ + ${ECHO} yes; \ + else \ + ${ECHO} no; \ + fi +. endif +. endfor . endif -. endfor -. undef _pattern_ -BUILDLINK_VARS+= USE_BUILTIN.db1 -.endif # USE_BUILTIN.db1 +. endif # PREFER.db1 +.endif +MAKEVARS+= USE_BUILTIN.db1 +### +### The section below only applies if we are not including this file +### solely to determine whether a built-in implementation exists. +### CHECK_BUILTIN.db1?= no .if !empty(CHECK_BUILTIN.db1:M[nN][oO]) + . if !empty(USE_BUILTIN.db1:M[yY][eE][sS]) BUILDLINK_PREFIX.db1= /usr -. for _inc_ in ${_DB_H_HEADERS} -. if exists(${_inc_}) -BUILDLINK_INCDIRS.db1?= ${_inc_:H:S/^${BUILDLINK_PREFIX.db1}\///} -. endif -. endfor -. if !empty(_BLNK_LIB_FOUND.db:M[yY][eE][sS]) +. if exists(${H_DB}) +BUILDLINK_INCDIRS.db1?= ${H_DB:H:S/^${BUILDLINK_PREFIX.db1}\///} +. endif +. if !empty(BUILTIN_LIB_FOUND.db:M[yY][eE][sS]) BUILDLINK_LDADD.db1= -ldb -. elif !empty(_BLNK_LIB_FOUND.db1:M[yY][eE][sS]) +. elif !empty(BUILTIN_LIB_FOUND.db1:M[yY][eE][sS]) BUILDLINK_LDADD.db1= -ldb1 BUILDLINK_TRANSFORM+= l:db:db1 . else BUILDLINK_LDADD.db1= # empty . endif BUILDLINK_LIBS.db1= ${BUILDLINK_LDADD.db1} +. endif BUILDLINK_TARGETS+= buildlink-db1-db185-h -. for _inc_ in ${_DB_H_HEADERS} -. if !target(buildlink-db1-db185-h) +. if !target(buildlink-db1-db185-h) .PHONY: buildlink-db1-db185-h buildlink-db1-db185-h: ${_PKG_SILENT}${_PKG_DEBUG} \ - if ${TEST} ! -f ${BUILDLINK_DIR}/include/db_185.h; then \ - ${MKDIR} -p ${BUILDLINK_DIR}/include; \ - ${LN} -fs ${_inc_} ${BUILDLINK_DIR}/include/db_185.h; \ + src=${H_DB:Q}; \ + dest=${BUILDLINK_DIR:Q}"/include/db_185.h"; \ + if ${TEST} -f "$$src" -a ! -f "$$dest"; then \ + ${MKDIR} `${DIRNAME} "$$dest"`; \ + ${LN} -fs "$$src" "$$dest"; \ fi -. endif -. endfor +. endif -. endif # USE_BUILTIN.db1 == yes .endif # CHECK_BUILTIN.db1 diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf index 218110b978b..40e1ec3b30d 100644 --- a/mk/defaults/mk.conf +++ b/mk/defaults/mk.conf @@ -1,4 +1,4 @@ -# $NetBSD: mk.conf,v 1.50 2005/06/01 14:45:35 wiz Exp $ +# $NetBSD: mk.conf,v 1.51 2005/06/01 18:03:06 jlam Exp $ # # A file providing defaults for pkgsrc and the packages collection. @@ -195,8 +195,6 @@ VARBASE?= /var X11ROOT_PREFIX?= XFree86 .elif defined(X11_TYPE) && !empty(X11_TYPE:Mxorg) X11ROOT_PREFIX?= xorg -USE_BUILTIN.Xfixes= yes -USE_BUILTIN.Xcomposite= yes .else X11ROOT_PREFIX?= # empty .endif diff --git a/mk/dlopen.builtin.mk b/mk/dlopen.builtin.mk index be0c1e54a81..29e6660c4c4 100644 --- a/mk/dlopen.builtin.mk +++ b/mk/dlopen.builtin.mk @@ -1,54 +1,78 @@ -# $NetBSD: dlopen.builtin.mk,v 1.10 2005/01/20 15:22:39 jlam Exp $ +# $NetBSD: dlopen.builtin.mk,v 1.11 2005/06/01 18:03:06 jlam Exp $ -.for _lib_ in dl -. if !defined(_BLNK_LIB_FOUND.${_lib_}) -_BLNK_LIB_FOUND.${_lib_}!= \ - if ${TEST} "`${ECHO} /usr/lib/lib${_lib_}.*`" != "/usr/lib/lib${_lib_}.*"; then \ - ${ECHO} "yes"; \ - elif ${TEST} "`${ECHO} /lib/lib${_lib_}.*`" != "/lib/lib${_lib_}.*"; then \ - ${ECHO} "yes"; \ - else \ - ${ECHO} "no"; \ - fi -BUILDLINK_VARS+= _BLNK_LIB_FOUND.${_lib_} -. endif -.endfor -.undef _lib_ +BUILTIN_PKG:= dl + +BUILTIN_FIND_LIBS:= dl +BUILTIN_FIND_FILES_VAR:= H_DL +BUILTIN_FIND_FILES.H_DL= /usr/include/dlfcn.h \ + /opt/gcc.3.3/include/dlfcn.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.dl) -IS_BUILTIN.dl= no -. if exists(/usr/include/dlfcn.h) || exists(/opt/gcc.3.3/include/dlfcn.h) -IS_BUILTIN.dl= yes +IS_BUILTIN.dl= no +. if empty(H_DL:M${LOCALBASE}/*) && exists(${H_DL}) +IS_BUILTIN.dl= yes . endif -BUILDLINK_VARS+= IS_BUILTIN.dl -.endif # IS_BUILTIN.pthread +.endif +MAKEVARS+= IS_BUILTIN.dl +### +### 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.dl) -USE_BUILTIN.dl= ${IS_BUILTIN.dl} -. if ${OPSYS} == "Darwin" +. if ${PREFER.dl} == "pkgsrc" +USE_BUILTIN.dl= no +. else +USE_BUILTIN.dl= ${IS_BUILTIN.dl} +. if defined(BUILTIN_PKG.dl) && \ + !empty(IS_BUILTIN.dl:M[yY][eE][sS]) +USE_BUILTIN.dl= yes +. for _dep_ in ${BUILDLINK_DEPENDS.dl} +. if !empty(USE_BUILTIN.dl:M[yY][eE][sS]) +USE_BUILTIN.dl!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.dl:Q}; then \ + ${ECHO} yes; \ + else \ + ${ECHO} no; \ + fi +. endif +. endfor +. endif +. if ${OPSYS} == "Darwin" USE_BUILTIN.dl= no # Darwin uses devel/dlcompat -. endif +. endif +. endif # PREFER.dl .endif -# +MAKEVARS+= USE_BUILTIN.dl + # The following platforms require pthreads to be linked into the # application if it uses dlopen() or else the applications will core # dump when they dlopen a shared module that _is_ linked with pthread # support. # -_DLOPEN_REQUIRE_PTHREAD_PLATFORMS= \ +_BLNK_DLOPEN_REQUIRE_PTHREAD_PLATFORMS= \ NetBSD-2.[0-9]_*-* \ NetBSD-2.[0-9]-* NetBSD-2.[0-9].[0-9]*-* \ NetBSD-2.[0-8][0-9]*-* NetBSD-2.9[0-8]*-* \ NetBSD-2.99.[0-9]-* NetBSD-2.99.10-* -_DLOPEN_REQUIRE_PTHREADS?= no -.for _pattern_ in ${_DLOPEN_REQUIRE_PTHREAD_PLATFORMS} -. if !empty(MACHINE_PLATFORM:M${_pattern_}) -. if !empty(PREFER_NATIVE_PTHREADS:M[yY][eE][sS]) -_DLOPEN_REQUIRE_PTHREADS= yes +.if !defined(_BLNK_DLOPEN_REQUIRE_PTHREADS) +_BLNK_DLOPEN_REQUIRE_PTHREADS?= no +. for _pattern_ in ${_BLNK_DLOPEN_REQUIRE_PTHREAD_PLATFORMS} +. if !empty(MACHINE_PLATFORM:M${_pattern_}) +. if !empty(PREFER_NATIVE_PTHREADS:M[yY][eE][sS]) +_BLNK_DLOPEN_REQUIRE_PTHREADS= yes +. endif . endif -. endif -.endfor +. endfor +.endif +MAKEVARS+= _BLNK_DLOPEN_REQUIRE_PTHREADS # # DLOPEN_REQUIRE_PTHREADS is a user- and package-settable yes/no variable # whose value decides whether pthread.buildlink3.mk is automatically @@ -56,24 +80,28 @@ _DLOPEN_REQUIRE_PTHREADS= yes # pthreads exist. # .if defined(DLOPEN_REQUIRE_PTHREADS) -_DLOPEN_REQUIRE_PTHREADS:= ${DLOPEN_REQUIRE_PTHREADS} +_BLNK_DLOPEN_REQUIRE_PTHREADS:= ${DLOPEN_REQUIRE_PTHREADS} .else -DLOPEN_REQUIRE_PTHREADS= ${_DLOPEN_REQUIRE_PTHREADS} +DLOPEN_REQUIRE_PTHREADS= ${_BLNK_DLOPEN_REQUIRE_PTHREADS} .endif +### +### The section below only applies if we are not including this file +### solely to determine whether a built-in implementation exists. +### CHECK_BUILTIN.dl?= no .if !empty(CHECK_BUILTIN.dl:M[nN][oO]) . if !empty(USE_BUILTIN.dl:M[yY][eE][sS]) BUILDLINK_PREFIX.dl= /usr -. if !empty(_BLNK_LIB_FOUND.dl:M[yY][eE][sS]) +. if !empty(BUILTIN_LIB_FOUND.dl:M[yY][eE][sS]) # # No need to add this to BUILDLINK_LIBS.dl since most GNU configure # scripts already check for -ldl themselves. # BUILDLINK_LDADD.dl= -ldl . endif -. if !empty(_DLOPEN_REQUIRE_PTHREADS:M[yY][eE][sS]) +. if !empty(_BLNK_DLOPEN_REQUIRE_PTHREADS:M[yY][eE][sS]) BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ . include "../../mk/pthread.buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} @@ -82,6 +110,6 @@ BUILDLINK_CFLAGS.dl+= ${PTHREAD_CFLAGS} BUILDLINK_LDFLAGS.dl+= ${PTHREAD_LDFLAGS} BUILDLINK_LIBS.dl+= ${PTHREAD_LIBS} . endif -. endif # USE_BUILTIN.dl == yes +. endif .endif # CHECK_BUILTIN.dl diff --git a/mk/motif.buildlink3.mk b/mk/motif.buildlink3.mk index 674eed4c3c4..54d3802cff3 100644 --- a/mk/motif.buildlink3.mk +++ b/mk/motif.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: motif.buildlink3.mk,v 1.7 2005/05/22 21:44:07 rillig Exp $ +# $NetBSD: motif.buildlink3.mk,v 1.8 2005/06/01 18:03:06 jlam Exp $ # # MOTIFBASE # choose the Motif-2.0 installation at the named location. @@ -79,7 +79,8 @@ MOTIF_TYPE:= ${_MOTIF_TYPE} MOTIFBASE= ${_MOTIFBASE} .endif -USE_X11?= yes +.include "../../mk/x11.buildlink3.mk" + MAKE_ENV+= MOTIFLIB="${MOTIFLIB}" MAKE_ENV+= MOTIFBASE="${_MOTIFBASE}" CPPFLAGS+= -I${_MOTIFBASE}/include diff --git a/mk/pthread.builtin.mk b/mk/pthread.builtin.mk index 87a93995fed..8d99d147fe1 100644 --- a/mk/pthread.builtin.mk +++ b/mk/pthread.builtin.mk @@ -1,28 +1,30 @@ -# $NetBSD: pthread.builtin.mk,v 1.7 2005/01/17 08:29:30 jlam Exp $ +# $NetBSD: pthread.builtin.mk,v 1.8 2005/06/01 18:03:06 jlam Exp $ -.for _lib_ in pthread c_r rt -. if !defined(_BLNK_LIB_FOUND.${_lib_}) -_BLNK_LIB_FOUND.${_lib_}!= \ - if ${TEST} "`${ECHO} /usr/lib/lib${_lib_}.*`" != "/usr/lib/lib${_lib_}.*"; then \ - ${ECHO} "yes"; \ - elif ${TEST} "`${ECHO} /lib/lib${_lib_}.*`" != "/lib/lib${_lib_}.*"; then \ - ${ECHO} "yes"; \ - else \ - ${ECHO} "no"; \ - fi -BUILDLINK_VARS+= _BLNK_LIB_FOUND.${_lib_} -. endif -.endfor -.undef _lib_ +BUILTIN_PKG:= pthread + +BUILTIN_FIND_LIBS:= pthread c_r rt +BUILTIN_FIND_FILES_VAR= H_PTHREAD +BUILTIN_FIND_FILES.H_PTHREAD= /usr/include/pthread.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.pthread) IS_BUILTIN.pthread= no -. if exists(/usr/include/pthread.h) +. if empty(H_PTHREAD:M${LOCALBASE}/*) && exists(${H_PTHREAD}) IS_BUILTIN.pthread= yes . endif -BUILDLINK_VARS+= IS_BUILTIN.pthread -.endif # IS_BUILTIN.pthread +.endif +MAKEVARS+= IS_BUILTIN.pthread +### +### Determine whether we should use the built-in implementation if it +### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no"). +### +# # We ignore the value of PREFER_PKGSRC and PREFER_NATIVE. Whether we # prefer one or the other is dependent on the value of # PREFER_NATIVE_PTHREADS, which is yes/no. @@ -33,10 +35,14 @@ USE_BUILTIN.pthread= ${IS_BUILTIN.pthread} USE_BUILTIN.pthread= no .endif +### +### The section below only applies if we are not including this file +### solely to determine whether a built-in implementation exists. +### CHECK_BUILTIN.pthread?= no .if !empty(CHECK_BUILTIN.pthread:M[nN][oO]) -.if !empty(USE_BUILTIN.pthread:M[yY][eE][sS]) +. if !empty(USE_BUILTIN.pthread:M[yY][eE][sS]) BUILDLINK_PREFIX.pthread= /usr BUILDLINK_CFLAGS.pthread= # empty BUILDLINK_LDFLAGS.pthread= # empty @@ -46,33 +52,33 @@ BUILDLINK_LDFLAGS.pthread= # empty # XXX This should really be a check for GCC! # XXX BUILDLINK_OPSYS_SUPPORT_PTHREAD= DragonFly FreeBSD Linux NetBSD -. if !empty(BUILDLINK_OPSYS_SUPPORT_PTHREAD:M${OPSYS}) +. if !empty(BUILDLINK_OPSYS_SUPPORT_PTHREAD:M${OPSYS}) BUILDLINK_CFLAGS.pthread+= -pthread BUILDLINK_LDFLAGS.pthread+= -pthread -. elif ${OPSYS} == "OSF1" +. elif ${OPSYS} == "OSF1" BUILDLINK_CFLAGS.pthread+= -pthread -. else +. else BUILDLINK_CPPFLAGS.pthread+= -D_REENTRANT -. endif -. if ${OPSYS} == "FreeBSD" +. endif +. if ${OPSYS} == "FreeBSD" BUILDLINK_CPPFLAGS.pthread+= -D_THREAD_SAFE -. endif +. endif # Handle systems which have pthreads functions in libc_r such as # FreeBSD 5.x, or fall back to libc if we don't find libc_r. # -. if ${OPSYS} == "NetBSD" +. if ${OPSYS} == "NetBSD" BUILDLINK_LIBS.pthread= # empty -. elif !empty(_BLNK_LIB_FOUND.pthread:M[yY][eE][sS]) +. elif !empty(BUILTIN_LIB_FOUND.pthread:M[yY][eE][sS]) BUILDLINK_LIBS.pthread= -lpthread -. if !empty(_BLNK_LIB_FOUND.rt:M[yY][eE][sS]) +. if !empty(BUILTIN_LIB_FOUND.rt:M[yY][eE][sS]) BUILDLINK_LIBS.pthread+= -lrt -. endif -. elif !empty(_BLNK_LIB_FOUND.c_r:M[yY][eE][sS]) +. endif +. elif !empty(BUILTIN_LIB_FOUND.c_r:M[yY][eE][sS]) BUILDLINK_LIBS.pthread= -lc_r -. else +. else BUILDLINK_LIBS.pthread= # empty +. endif . endif -.endif # USE_BUILTIN.pthread .endif # CHECK_BUILTIN.pthread diff --git a/mk/solaris-pam.builtin.mk b/mk/solaris-pam.builtin.mk index 7245ee78f88..277e9243eaa 100644 --- a/mk/solaris-pam.builtin.mk +++ b/mk/solaris-pam.builtin.mk @@ -1,28 +1,48 @@ -# $NetBSD: solaris-pam.builtin.mk,v 1.2 2005/01/14 07:54:20 jlam Exp $ +# $NetBSD: solaris-pam.builtin.mk,v 1.3 2005/06/01 18:03:06 jlam Exp $ -_SOLARIS_PAM_APPL_HEADERS= /usr/include/security/pam_appl.h -_SOLARIS_PAM_IDENT= Copyright.*Sun Microsystems +BUILTIN_PKG:= solaris-pam +BUILTIN_FIND_FILES_VAR:= H_SOLARIS_PAM +BUILTIN_FIND_FILES.H_SOLARIS_PAM= /usr/include/security/pam_appl.h +BUILTIN_FIND_GREP.H_SOLARIS_PAM= Copyright.*Sun Microsystems + +.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.solaris-pam) -IS_BUILTIN.solaris-pam= no -. for _inc_ in ${_SOLARIS_PAM_APPL_HEADERS} -. if !empty(IS_BUILTIN.solaris-pam:M[nN][oO]) && exists(${_inc_}) -IS_BUILTIN.solaris-pam!= \ - case ${_inc_} in \ - ${LOCALBASE}/*) \ - ${ECHO} "no"; \ - ;; \ - *) \ - if ${GREP} -q "${_SOLARIS_PAM_IDENT}" ${_inc_}; then \ - ${ECHO} "yes"; \ - else \ - ${ECHO} "no"; \ - fi; \ - ;; \ - esac -. endif -. endfor -BUILDLINK_VARS+= IS_BUILTIN.solaris-pam -.endif # IS_BUILTIN.solaris-pam +IS_BUILTIN.solaris-pam= no +. if empty(H_SOLARIS_PAM:M${LOCALBASE}/*) && exists(${H_SOLARIS_PAM}) +IS_BUILTIN.solaris-pam= yes +. endif +.endif +MAKEVARS+= IS_BUILTIN.solaris-pam -USE_BUILTIN.solaris-pam?= ${IS_BUILTIN.solaris-pam} +### +### 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.solaris-pam) +. if ${PREFER.solaris-pam} == "pkgsrc" +USE_BUILTIN.solaris-pam= no +. else +USE_BUILTIN.solaris-pam= ${IS_BUILTIN.solaris-pam} +. if defined(BUILTIN_PKG.solaris-pam) && \ + !empty(IS_BUILTIN.solaris-pam:M[yY][eE][sS]) +USE_BUILTIN.solaris-pam= yes +. for _dep_ in ${BUILDLINK_DEPENDS.solaris-pam} +. if !empty(USE_BUILTIN.solaris-pam:M[yY][eE][sS]) +USE_BUILTIN.solaris-pam!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.solaris-pam:Q}; then \ + ${ECHO} yes; \ + else \ + ${ECHO} no; \ + fi +. endif +. endfor +. endif +. endif # PREFER.solaris-pam +.endif +MAKEVARS+= USE_BUILTIN.solaris-pam diff --git a/mk/x11.buildlink3.mk b/mk/x11.buildlink3.mk new file mode 100644 index 00000000000..4ab3c82e865 --- /dev/null +++ b/mk/x11.buildlink3.mk @@ -0,0 +1,22 @@ +# $NetBSD: x11.buildlink3.mk,v 1.1 2005/06/01 18:03:06 jlam Exp $ +# +# This Makefile fragment is meant to be included by packages that +# require an X11 distribution. x11.buildlink3.mk will include the +# buildlink3.mk file from the appropriate X11 distribution. +# + +.include "../../mk/bsd.prefs.mk" + +USE_X11= yes + +.include "../../mk/x11.version.mk" + +.if defined(GNU_CONFIGURE) +CONFIGURE_ARGS+= --x-includes=${X11BASE:Q}/include +CONFIGURE_ARGS+= --x-libraries=${X11BASE:Q}/lib${LIBABISUFFIX:Q} +.endif + +X11_LDFLAGS+= ${COMPILER_RPATH_FLAG}${X11BASE}/lib${LIBABISUFFIX} +X11_LDFLAGS+= -L${X11BASE}/lib${LIBABISUFFIX} + +.sinclude "${X11_PKGSRCDIR.${X11_TYPE}}/buildlink3.mk" diff --git a/mk/x11.builtin.mk b/mk/x11.builtin.mk new file mode 100644 index 00000000000..732dab80503 --- /dev/null +++ b/mk/x11.builtin.mk @@ -0,0 +1,8 @@ +# $NetBSD: x11.builtin.mk,v 1.1 2005/06/01 18:03:06 jlam Exp $ +# +# x11.builtin.mk will include the builtin.mk file from the appropriate +# X11 distribution. +# + +.include "../../mk/x11.version.mk" +.sinclude "${X11_PKGSRCDIR.${X11_TYPE}}/builtin.mk" diff --git a/mk/x11.version.mk b/mk/x11.version.mk new file mode 100644 index 00000000000..883823bbb20 --- /dev/null +++ b/mk/x11.version.mk @@ -0,0 +1,31 @@ +# $NetBSD: x11.version.mk,v 1.1 2005/06/01 18:03:06 jlam Exp $ +# +# The following variables may be set in /etc/mk.conf: +# +# X11_TYPE sets the X11 distribution used when building X11 packages. +# Possible values are "xorg" (use x11/xorg-libs), "XFree86" (use +# x11/XFree86-libs), or "native" (use the native X11 distribution). +# The default X11_TYPE is "native". +# +# The following variables are provided by this file: +# +# X11_PKGSRCDIR.${X11_TYPE} sets the pkgsrc directory location for +# the package which manages/represents ${X11_TYPE}. It can be +# used to find the relevant buildlink3.mk or builtin.mk files. +# +# BUILTIN_X11_TYPE.${X11_TYPE} is the X11_TYPE of the native X11 +# distribution detected on the system. +# +# BUILTIN_X11_VERSION.${X11_TYPE} is the version number of the native +# X11 distribution detected on the system. +# + +X11_TYPE?= native +X11_PKGSRCDIR.native= ../../pkgtools/x11-links +X11_PKGSRCDIR.XFree86= ../../x11/XFree86-libs +X11_PKGSRCDIR.xorg= ../../x11/xorg-libs + +# Makefiles that include this file can access the version of the X11 +# distribution as ${BUILTIN_X11_VERSION.${X11_TYPE}}. +# +.sinclude "${X11_PKGSRCDIR.${X11_TYPE}}/version.mk" diff --git a/mk/xaw.buildlink3.mk b/mk/xaw.buildlink3.mk index 471cd55e855..1a049fcbf93 100644 --- a/mk/xaw.buildlink3.mk +++ b/mk/xaw.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: xaw.buildlink3.mk,v 1.1 2004/04/11 23:35:16 xtraeme Exp $ +# $NetBSD: xaw.buildlink3.mk,v 1.2 2005/06/01 18:03:06 jlam Exp $ .if !defined(XAW_BUILDLINK3_MK) XAW_BUILDLINK3_MK= # defined @@ -18,6 +18,7 @@ BUILDLINK_PREFIX.Xaw?= ${BUILDLINK_PREFIX.Xaw3d} . include "../../x11/neXtaw/buildlink3.mk" BUILDLINK_PREFIX.Xaw?= ${BUILDLINK_PREFIX.neXtaw} .else +. include "../../mk/x11.buildlink3.mk" BUILDLINK_PREFIX.Xaw?= ${X11BASE} .endif diff --git a/multimedia/RealPlayerGold/Makefile b/multimedia/RealPlayerGold/Makefile index bf5fbabfd9d..6cd1805ca1f 100644 --- a/multimedia/RealPlayerGold/Makefile +++ b/multimedia/RealPlayerGold/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:40 tv Exp $ +# $NetBSD: Makefile,v 1.3 2005/06/01 18:03:06 jlam Exp $ # DISTNAME= RealPlayer10GOLD @@ -29,7 +29,6 @@ DEPENDS+= suse_freetype2>=9.1:../../emulators/suse91_freetype2 DEPENDS+= suse_x11>=9.1:../../emulators/suse91_x11 DEPENDS+= suse_gtk2>=9.1:../../emulators/suse91_gtk2 .else -USE_X11= yes .endif REALPLAYER_SUBDIR= lib @@ -43,6 +42,8 @@ NO_BIN_ON_CDROM= ${RESTRICTED} ONLY_FOR_PLATFORM= *-*-i386 +.include "../../mk/x11.buildlink3.mk" + do-build: ${SED} -e 's|@REALPLAYER_HOME@|${REALPLAYER_HOME}|g' \ ${FILESDIR}/realplay.sh > ${WRKDIR}/realplayergold diff --git a/multimedia/alevt/Makefile b/multimedia/alevt/Makefile index d462dd12da8..7b0c05cc45b 100644 --- a/multimedia/alevt/Makefile +++ b/multimedia/alevt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:18 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2005/06/01 18:03:06 jlam Exp $ DISTNAME= alevt-1.6.0 PKGREVISION= 2 @@ -23,4 +23,5 @@ pre-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps .include "../../graphics/png/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/divxplayer/Makefile b/multimedia/divxplayer/Makefile index c5f57dc324d..ec49bb38620 100644 --- a/multimedia/divxplayer/Makefile +++ b/multimedia/divxplayer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/05/02 23:02:06 reed Exp $ +# $NetBSD: Makefile,v 1.3 2005/06/01 18:03:06 jlam Exp $ DISTNAME= divx-player-installer PKGNAME= divxplayer-0.2.0 @@ -36,5 +36,6 @@ do-install: ${INSTALL_SCRIPT} ${WRKDIR}/frontend.sh \ ${PREFIX}/bin/${BINARY:S/.bin$//} +.include "../../mk/x11.buildlink3.mk" .include "../../emulators/suse_linux/Makefile.application" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 41ab8af0de1..906ef56befc 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/05/31 10:01:38 dillo Exp $ +# $NetBSD: Makefile,v 1.17 2005/06/01 18:03:06 jlam Exp $ DISTNAME= ffmpeg-0.4.8 PKGREVISION= 3 @@ -17,7 +17,7 @@ USE_PKGINSTALL= YES CONF_FILES= ${PREFIX}/share/examples/ffmpeg/ffserver.conf \ ${PKG_SYSCONFDIR}/ffserver.conf -MAKE_ENV+= EXTRA_LIBS=${LIBGETOPT:Q} \ +MAKE_ENV+= EXTRA_LIBS=${BUILDLINK_LDADD.getopt:Q} \ FFSERVER_CONF=${PKG_SYSCONFDIR:Q}/ffserver.conf \ LOCALBASE=${LOCALBASE:Q} diff --git a/multimedia/gmencoder/Makefile b/multimedia/gmencoder/Makefile index ad812ec2bbf..59b1c2ec8c5 100644 --- a/multimedia/gmencoder/Makefile +++ b/multimedia/gmencoder/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:18 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2005/06/01 18:03:06 jlam Exp $ # DISTNAME= gmencoder-0.1.0 @@ -20,7 +20,6 @@ USE_DIRS+= gnome2-1.5 USE_TOOLS+= gmake USE_PKGINSTALL= yes USE_PKGLOCALEDIR= yes -USE_X11= yes CFLAGS+= -DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\"" EGDIR= ${PREFIX}/share/examples/gmencoder diff --git a/multimedia/gnome2-media/Makefile b/multimedia/gnome2-media/Makefile index ac129c532fd..36e325f0052 100644 --- a/multimedia/gnome2-media/Makefile +++ b/multimedia/gnome2-media/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:18 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2005/06/01 18:03:06 jlam Exp $ DISTNAME= gnome-media-2.10.2 CATEGORIES= multimedia gnome @@ -18,7 +18,6 @@ GNU_CONFIGURE= yes USE_DIRS+= gnome2-1.5 USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes -USE_X11= yes USE_TOOLS+= gmake USE_PERL5= build diff --git a/multimedia/gst-plugins/Makefile b/multimedia/gst-plugins/Makefile index 71448b37675..87980346425 100644 --- a/multimedia/gst-plugins/Makefile +++ b/multimedia/gst-plugins/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/03/22 16:16:33 jmmv Exp $ +# $NetBSD: Makefile,v 1.23 2005/06/01 18:03:06 jlam Exp $ # .include "Makefile.common" @@ -6,7 +6,6 @@ COMMENT+= base plugins USE_PERL5= run -USE_X11= yes PKGCONFIG_OVERRIDE+= pkgconfig/gstreamer-gconf.pc.in PKGCONFIG_OVERRIDE+= pkgconfig/gstreamer-interfaces.pc.in @@ -28,4 +27,5 @@ REPLACE_PERL+= tools/gst-launch-ext-m.m REPLACE_PERL+= tools/gst-visualise-m.m .include "../../devel/GConf2/schemas.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile index fb76e188cfa..8d88d1510d8 100644 --- a/multimedia/gstreamer/Makefile +++ b/multimedia/gstreamer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/05/22 20:08:18 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2005/06/01 18:03:06 jlam Exp $ # DISTNAME= gstreamer-0.8.10 @@ -16,7 +16,6 @@ GNU_CONFIGURE= yes USE_PKGINSTALL= yes USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes -USE_X11= yes USE_TOOLS+= gmake USE_PERL5= build @@ -51,4 +50,5 @@ _GSTREAMER_NO_DEPEND= # defined .include "../../multimedia/gstreamer/plugins.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/libxslt/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/gxine/Makefile b/multimedia/gxine/Makefile index e527b7ed601..dc2a0286611 100644 --- a/multimedia/gxine/Makefile +++ b/multimedia/gxine/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/05/27 12:09:27 salo Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 18:03:06 jlam Exp $ # DISTNAME= gxine-0.4.5 @@ -12,7 +12,6 @@ COMMENT= Gtk-based media player GNU_CONFIGURE= YES USE_LIBTOOL= YES USE_PKGLOCALEDIR= YES -USE_X11= YES USE_TOOLS+= gmake PTHREAD_OPTS+= require diff --git a/multimedia/libflash/Makefile.common b/multimedia/libflash/Makefile.common index 452dd24304b..30fa9ea65eb 100644 --- a/multimedia/libflash/Makefile.common +++ b/multimedia/libflash/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.5 2005/03/31 11:16:25 wiz Exp $ +# $NetBSD: Makefile.common,v 1.6 2005/06/01 18:03:06 jlam Exp $ # DISTNAME= flash-0.4.10 @@ -9,12 +9,13 @@ EXTRACT_SUFX= .tgz MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://gplflash.sourceforge.net/ -USE_X11= yes USE_LANGUAGES= c c++ DISTINFO_FILE= ${.CURDIR}/../libflash/distinfo PATCHDIR= ${.CURDIR}/../libflash/patches +.include "../../mk/x11.buildlink3.mk" + post-extract: remove-subpackages remove-subpackages: diff --git a/multimedia/mmg/Makefile b/multimedia/mmg/Makefile index 7ff63b8ea0f..deea67b70e8 100644 --- a/multimedia/mmg/Makefile +++ b/multimedia/mmg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:22 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 18:03:06 jlam Exp $ # .include "../../multimedia/mkvtoolnix/Makefile.dist" @@ -13,7 +13,6 @@ DEPENDS+= ${DISTNAME}:../../multimedia/mkvtoolnix GNU_CONFIGURE= yes USE_TOOLS+= gmake USE_LANGUAGES= c++ -USE_X11= yes BUILD_TARGET= src/mmg/mmg diff --git a/multimedia/moz-flash/Makefile b/multimedia/moz-flash/Makefile index 6fc75263bf2..e91665ffff5 100644 --- a/multimedia/moz-flash/Makefile +++ b/multimedia/moz-flash/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/04/11 21:46:42 tv Exp $ +# $NetBSD: Makefile,v 1.8 2005/06/01 18:03:06 jlam Exp $ # .include "../../multimedia/libflash/Makefile.common" @@ -12,7 +12,6 @@ COMMENT= Mozilla open source Flash(tm) plugin DEPENDS+= mozilla>=0.9.9:../../www/mozilla -USE_X11= YES USE_LIBTOOL= YES BUILD_DIRS= ${WRKSRC}/Plugin @@ -28,5 +27,6 @@ do-install: ${INSTALL_PROGRAM} .libs/npflash.so ${MOZ_PLUGDIR} .include "../../multimedia/libflash/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/mplayer-plugin-firefox/Makefile.common b/multimedia/mplayer-plugin-firefox/Makefile.common index f44af88baf4..5907d007acc 100644 --- a/multimedia/mplayer-plugin-firefox/Makefile.common +++ b/multimedia/mplayer-plugin-firefox/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.5 2005/05/22 20:08:22 jlam Exp $ +# $NetBSD: Makefile.common,v 1.6 2005/06/01 18:03:06 jlam Exp $ # DISTNAME= mplayerplug-in-2.70 @@ -17,7 +17,6 @@ GNU_CONFIGURE= yes USE_TOOLS+= gmake USE_LANGUAGES+= c++ USE_PKGINSTALL= yes -USE_X11= yes FILESDIR= ${.CURDIR}/../../multimedia/mplayer-plugin-firefox/files PATCHDIR= ${.CURDIR}/../../multimedia/mplayer-plugin-firefox/patches @@ -68,3 +67,4 @@ do-install: .include "../../devel/pkgconfig/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" diff --git a/multimedia/mplayer-share/Makefile.depends b/multimedia/mplayer-share/Makefile.depends index 1ad9b8ba0d4..938de5c0a05 100644 --- a/multimedia/mplayer-share/Makefile.depends +++ b/multimedia/mplayer-share/Makefile.depends @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.depends,v 1.12 2004/08/18 13:35:06 wiz Exp $ +# $NetBSD: Makefile.depends,v 1.13 2005/06/01 18:03:06 jlam Exp $ # DEPENDS+= mplayer-share>=${MPLAYER_PKG_VERSION}:../../multimedia/mplayer-share @@ -21,7 +21,6 @@ DEPENDS+= win32-codecs>=011227:../../multimedia/win32-codecs DEPENDS+= realplayer-codecs>=8nb2:../../multimedia/realplayer-codecs .endif -USE_X11= YES .for drv pkg val in ${MPLAYER_DRIVERS} . if empty(MPLAYER_DISABLE_DRIVERS:M${drv}) @@ -46,3 +45,5 @@ USE_X11= YES .if defined(USE_OSS) . include "../../mk/ossaudio.buildlink3.mk" .endif + +.include "../../mk/x11.buildlink3.mk" diff --git a/multimedia/ogle/Makefile b/multimedia/ogle/Makefile index 3ad1678bbaa..a72f376763d 100644 --- a/multimedia/ogle/Makefile +++ b/multimedia/ogle/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:22 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2005/06/01 18:03:06 jlam Exp $ DISTNAME= ogle-0.9.2 PKGREVISION= 2 @@ -21,7 +21,6 @@ ONLY_FOR_PLATFORM+= SunOS-*-* USE_TOOLS+= gmake USE_LIBTOOL= yes -USE_X11= yes GNU_CONFIGURE= yes CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" @@ -39,4 +38,5 @@ MESSAGE_SUBST+= PKGBASE=${PKGBASE} .include "../../graphics/jpeg/buildlink3.mk" .include "../../multimedia/libdvdread/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/ogle_gui/Makefile b/multimedia/ogle_gui/Makefile index 61cb3f8293a..af373c535ad 100644 --- a/multimedia/ogle_gui/Makefile +++ b/multimedia/ogle_gui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:22 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2005/06/01 18:03:06 jlam Exp $ DISTNAME= ogle_gui-0.9.2 PKGREVISION= 4 @@ -10,7 +10,6 @@ HOMEPAGE= http://www.dtek.chalmers.se/groups/dvd/ COMMENT= GUI for the Ogle DVD player USE_PKGLOCALEDIR= yes -USE_X11= yes USE_TOOLS+= gmake USE_LIBTOOL= yes diff --git a/multimedia/smpeg/Makefile b/multimedia/smpeg/Makefile index bb873351564..b4d55863dbb 100644 --- a/multimedia/smpeg/Makefile +++ b/multimedia/smpeg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:22 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/06/01 18:03:07 jlam Exp $ # DISTNAME= smpeg-0.4.4 @@ -16,7 +16,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_TOOLS+= gmake GNU_CONFIGURE= yes USE_LANGUAGES= c c++ -USE_X11= yes USE_LIBTOOL= yes .include "../../mk/compiler.mk" diff --git a/multimedia/totem/Makefile.common b/multimedia/totem/Makefile.common index 520ca1602be..7ae12403c8e 100644 --- a/multimedia/totem/Makefile.common +++ b/multimedia/totem/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.5 2005/05/22 20:08:22 jlam Exp $ +# $NetBSD: Makefile.common,v 1.6 2005/06/01 18:03:07 jlam Exp $ # DISTNAME= totem-1.0.2 @@ -18,7 +18,6 @@ USE_DIRS+= gnome2-1.5 USE_TOOLS+= gmake USE_LIBTOOL= YES USE_PKGLOCALEDIR= YES -USE_X11= YES PKGCONFIG_OVERRIDE= totem-plparser.pc.in diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index 502215ec539..f91b6a29b75 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/05/22 20:08:23 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2005/06/01 18:03:07 jlam Exp $ # DISTNAME= vlc-${VLC_VER} @@ -13,7 +13,6 @@ COMMENT= VideoLAN Client USE_TOOLS+= gmake USE_PKGLOCALEDIR= yes -USE_X11= yes GNU_CONFIGURE= yes PTHREAD_OPTS+= require diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile index 19a0ae78856..4ab8f2ebe3c 100644 --- a/multimedia/xawtv/Makefile +++ b/multimedia/xawtv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:23 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/06/01 18:03:07 jlam Exp $ # DISTNAME= xawtv_3.90 @@ -14,7 +14,6 @@ COMMENT= TV application for Brooktree 848 compatible cards WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} GNU_CONFIGURE= YES USE_TOOLS+= gmake -USE_X11= YES USE_PERL5= build CONFIGURE_ARGS+= --disable-aalib diff --git a/multimedia/xine-ui/Makefile b/multimedia/xine-ui/Makefile index 6252eb8328c..900579071b5 100644 --- a/multimedia/xine-ui/Makefile +++ b/multimedia/xine-ui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/04/11 21:46:43 tv Exp $ +# $NetBSD: Makefile,v 1.16 2005/06/01 18:03:07 jlam Exp $ # DISTNAME= xine-ui-0.99.2 @@ -16,7 +16,6 @@ BUILDLINK_DEPENDS.curl= curl>7.10.2 USE_PKGLOCALEDIR= YES USE_DIRS+= xdg-1.1 -USE_X11= YES USE_LIBTOOL= YES GNU_CONFIGURE= YES USE_GNU_READLINE= yes @@ -29,4 +28,5 @@ USE_GNU_READLINE= yes .include "../../www/curl/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/xvid4conf/Makefile b/multimedia/xvid4conf/Makefile index 31666abfded..bfe88c5e072 100644 --- a/multimedia/xvid4conf/Makefile +++ b/multimedia/xvid4conf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:43 tv Exp $ +# $NetBSD: Makefile,v 1.5 2005/06/01 18:03:07 jlam Exp $ DISTNAME= xvid4conf-1.12 PKGREVISION= 1 @@ -10,7 +10,6 @@ HOMEPAGE= http://zebra.fh-weingarten.de/~transcode/ COMMENT= XviD Configuration Panel GNU_CONFIGURE= YES -USE_X11= YES .include "../../devel/pkgconfig/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/net/IglooFTP/Makefile b/net/IglooFTP/Makefile index 882b81ac4bb..e198237f1f7 100644 --- a/net/IglooFTP/Makefile +++ b/net/IglooFTP/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/04/11 21:46:44 tv Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 18:03:07 jlam Exp $ DISTNAME= IglooFTP-0.6.1 PKGREVISION= 4 @@ -12,7 +12,6 @@ HOMEPAGE= http://www.littleigloo.org/iglooftp.php3 COMMENT= Easy to use FTP client for X Window System WRKSRC= ${WRKDIR}/${DISTNAME}/src -USE_X11= yes post-extract: ${RM} ${WRKSRC}/../share/docs/LICENSE~ diff --git a/net/amule/Makefile b/net/amule/Makefile index 2ad8cc019af..7d78a593ad0 100644 --- a/net/amule/Makefile +++ b/net/amule/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/05/22 20:08:23 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2005/06/01 18:03:07 jlam Exp $ # DISTNAME= aMule-1.2.8 @@ -20,7 +20,6 @@ USE_DIRS+= xdg-1.1 USE_TOOLS+= gmake USE_LANGUAGES= c c++ USE_PKGLOCALEDIR= yes -USE_X11= yes GNU_CONFIGURE= yes LIBS+= -lm diff --git a/net/arla/Makefile b/net/arla/Makefile index 467543fad38..e2e96444027 100644 --- a/net/arla/Makefile +++ b/net/arla/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2005/04/11 21:46:44 tv Exp $ +# $NetBSD: Makefile,v 1.45 2005/06/01 18:03:07 jlam Exp $ DISTNAME= arla-0.38 PKGREVISION= 2 @@ -15,7 +15,6 @@ CONFLICTS+= rx-[0-9]* OSVERSION_SPECIFIC= yes INFO_FILES= arla.info send-pr.info -USE_X11= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes USE_PKGINSTALL= yes @@ -57,6 +56,8 @@ OWN_DIRS_PERMS= ${ARLA_CACHE} ${ROOT_USER} ${ROOT_GROUP} 0700 INSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL DEINSTALL_EXTRA_TMPL= ${.CURDIR}/DEINSTALL +.include "../../mk/x11.buildlink3.mk" + post-install: ${RM} -f ${EGDIR}/*.default ${SED} ${FILES_SUBST_SED} \ diff --git a/net/bind9/builtin.mk b/net/bind9/builtin.mk index 94c76c2e585..d313b6508c3 100644 --- a/net/bind9/builtin.mk +++ b/net/bind9/builtin.mk @@ -1,34 +1,82 @@ -# $NetBSD: builtin.mk,v 1.6 2004/09/30 15:07:46 tron Exp $ +# $NetBSD: builtin.mk,v 1.7 2005/06/01 18:03:07 jlam Exp $ -.if !defined(IS_BUILTIN.bind) -IS_BUILTIN.bind= no +BUILTIN_PKG:= bind + +BUILTIN_FIND_LIBS:= bind + +.include "../../mk/buildlink3/bsd.builtin.mk" + +.if !defined(BUILTIN_VERSION.bind) . if exists(/usr/sbin/named) -_BIND_VERSION!=${ECHO} 'vers ' && /usr/sbin/named -v | ${SED} -n 's/^BIND //p' +BUILTIN_VERSION.bind!= \ + ${ECHO} 'vers ' && /usr/sbin/named -v | ${SED} -n 's/^BIND //p' . endif -. if defined(_BIND_VERSION) && !empty(_BIND_VERSION:Nvers) +.endif +MAKEVARS+= BUILTIN_VERSION.bind + +### +### Determine if there is a built-in implementation of the package and +### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). +### +.if !defined(IS_BUILTIN.bind) +IS_BUILTIN.bind= no +. if !empty(BUILTIN_VERSION.bind:Nvers) && \ + !empty(BUILTIN_LIB_FOUND.bind:M[yY][eE][sS]) IS_BUILTIN.bind= yes -BUILTIN_PKG.bind= bind-${_BIND_VERSION:Nvers} -BUILDLINK_VARS+= BUILTIN_PKG.bind . endif -.endif # IS_BUILTIN.bind -BUILDLINK_VARS+= IS_BUILTIN.bind +.endif +MAKEVARS+= IS_BUILTIN.bind + +### +### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to +### a package name to represent the built-in package. +### +.if !defined(BUILTIN_PKG.bind) && \ + !empty(IS_BUILTIN.bind:M[yY][eE][sS]) +BUILTIN_PKG.bind= bind-${BUILTIN_VERSION.bind:Nvers} +.endif +MAKEVARS+= BUILTIN_PKG.bind +### +### 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.bind) -USE_BUILTIN.bind?= ${IS_BUILTIN.bind} -. if defined(BUILTIN_PKG.bind) -. for _depend_ in ${BUILDLINK_DEPENDS.bind} -. if !empty(USE_BUILTIN.bind:M[yY][eE][sS]) +. if ${PREFER.bind} == "pkgsrc" +USE_BUILTIN.bind= no +. else +USE_BUILTIN.bind= ${IS_BUILTIN.bind} +. if defined(BUILTIN_PKG.bind) && \ + !empty(IS_BUILTIN.bind:M[yY][eE][sS]) +USE_BUILTIN.bind= yes +. for _dep_ in ${BUILDLINK_DEPENDS.bind} +. if !empty(USE_BUILTIN.bind:M[yY][eE][sS]) USE_BUILTIN.bind!= \ - if ${PKG_ADMIN} pmatch '${_depend_}' ${BUILTIN_PKG.bind}; then \ - ${ECHO} "yes"; \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.bind:Q}; then \ + ${ECHO} yes; \ else \ - ${ECHO} "no"; \ + ${ECHO} no; \ fi -. endif -. endfor +. endif +. endfor +. endif +. endif # PREFER.bind +.endif +MAKEVARS+= USE_BUILTIN.bind + +### +### The section below only applies if we are not including this file +### solely to determine whether a built-in implementation exists. +### +CHECK_BUILTIN.bind?= no +.if !empty(CHECK_BUILTIN.bind:M[nN][oO]) + +. if !empty(USE_BUILTIN.bind:M[yY][eE][sS]) +. if !empty(BUILTIN_LIB_FOUND.bind:M[yY][eE][sS]) +BUILDLINK_LDADD.bind?= -lbind +. endif +. elif !empty(USE_BUILTIN.bind:M[nN][oO]) +BUILDLINK_LDADD.bind?= -lbind . endif -.endif # USE_BUILTIN.bind -.if !empty(USE_BUILTIN.bind:M[nN][oO]) -BUILDLINK_LDADD.bind?= -lbind -.endif +.endif # CHECK_BUILTIN.bind diff --git a/net/bug-buddy/Makefile b/net/bug-buddy/Makefile index a2f73bceafd..062775bfb9f 100644 --- a/net/bug-buddy/Makefile +++ b/net/bug-buddy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2005/05/22 20:08:23 jlam Exp $ +# $NetBSD: Makefile,v 1.33 2005/06/01 18:03:07 jlam Exp $ # DISTNAME= bug-buddy-2.10.0 @@ -16,7 +16,6 @@ GNU_CONFIGURE= YES USE_DIRS+= gnome2-1.5 USE_PKGLOCALEDIR= YES USE_TOOLS+= gmake -USE_X11= YES USE_LIBTOOL= YES GCONF2_SCHEMAS= bug-buddy.schemas diff --git a/net/ed2k-gtk-gui/Makefile b/net/ed2k-gtk-gui/Makefile index dc97d97dd72..c8c19f277f5 100644 --- a/net/ed2k-gtk-gui/Makefile +++ b/net/ed2k-gtk-gui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/04/11 21:46:46 tv Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/01 18:03:07 jlam Exp $ DISTNAME= ed2k-gtk-gui-0.6.3 PKGREVISION= 1 @@ -10,7 +10,6 @@ HOMEPAGE= http://ed2k-gtk-gui.sourceforge.net/ COMMENT= GUI for the eDonkey2000 and Overnet USE_DIRS+= xdg-1.1 -USE_X11= yes USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes CONFIGURE_ENV+= CONFIGURE_LDFLAGS=${LDFLAGS:Q} diff --git a/net/etherape/Makefile b/net/etherape/Makefile index f618d6634e1..0f2f67dfa23 100644 --- a/net/etherape/Makefile +++ b/net/etherape/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/05/22 20:08:23 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2005/06/01 18:03:07 jlam Exp $ DISTNAME= etherape-0.9.1 PKGREVISION= 1 @@ -13,7 +13,6 @@ USE_TOOLS+= gmake USE_DIRS+= xdg-1.1 USE_PKGINSTALL= YES USE_PKGLOCALEDIR= YES -USE_X11= YES GNU_CONFIGURE= YES PKG_SYSCONFSUBDIR= etherape diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile index 9119a802102..eba1294f917 100644 --- a/net/ethereal/Makefile +++ b/net/ethereal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.108 2005/05/06 13:54:48 tron Exp $ +# $NetBSD: Makefile,v 1.109 2005/06/01 18:03:07 jlam Exp $ DISTNAME= ethereal-0.10.11 CATEGORIES= net @@ -21,7 +21,6 @@ MAINTAINER= frueauf@NetBSD.org HOMEPAGE= http://www.ethereal.com/ COMMENT= Network protocol analyzer -USE_X11= YES USE_PERL5= build USE_LIBTOOL= YES diff --git a/net/gtk-gnutella/Makefile b/net/gtk-gnutella/Makefile index 4d7fc2dd484..cd6c9f3a38b 100644 --- a/net/gtk-gnutella/Makefile +++ b/net/gtk-gnutella/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2005/05/23 07:58:09 adam Exp $ +# $NetBSD: Makefile,v 1.43 2005/06/01 18:03:07 jlam Exp $ DISTNAME= gtk-gnutella-0.95.3 CATEGORIES= net @@ -11,7 +11,6 @@ COMMENT= GTK-based gnutella client USE_PKGLOCALEDIR= yes USE_TOOLS+= gmake -USE_X11= yes HAS_CONFIGURE= yes CONFIGURE_SCRIPT= ./Configure CONFIGURE_ARGS+= -d -e -r -s \ diff --git a/net/gtk_wicontrol/Makefile b/net/gtk_wicontrol/Makefile index 939c0e5a6b6..4694d893e32 100644 --- a/net/gtk_wicontrol/Makefile +++ b/net/gtk_wicontrol/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/05/22 20:08:24 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2005/06/01 18:03:07 jlam Exp $ DISTNAME= gtk_wicontrol-0.17 PKGREVISION= 3 @@ -12,7 +12,6 @@ COMMENT= GTK+-based Wavelan status meter ONLY_FOR_PLATFORM= *BSD-*-* USE_PKGLOCALEDIR= yes -USE_X11= yes GNU_CONFIGURE= yes USE_TOOLS+= gmake diff --git a/net/icsi-finger/Makefile b/net/icsi-finger/Makefile index a0be9d07591..c831d73c6d9 100644 --- a/net/icsi-finger/Makefile +++ b/net/icsi-finger/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2004/01/20 12:22:19 agc Exp $ +# $NetBSD: Makefile,v 1.8 2005/06/01 18:03:07 jlam Exp $ # DISTNAME= icsi-finger-1.0.27 @@ -10,11 +10,12 @@ MAINTAINER= is@NetBSD.org COMMENT= Distributed finger service WRKSRC= ${WRKDIR}/finger -USE_X11= yes XMPLD= ${PREFIX}/share/examples/icsi-finger XMPLDT= ${XMPLD}/targets +.include "../../mk/x11.buildlink3.mk" + pre-configure: ${RM} -f ${WRKSRC}/config.h ${SED} -e s@/usr/local@${PREFIX}@ \ diff --git a/net/libpcap/builtin.mk b/net/libpcap/builtin.mk index d77c3eb4373..a3aae31647e 100644 --- a/net/libpcap/builtin.mk +++ b/net/libpcap/builtin.mk @@ -1,67 +1,92 @@ -# $NetBSD: builtin.mk,v 1.9 2005/01/11 21:19:24 xtraeme Exp $ +# $NetBSD: builtin.mk,v 1.10 2005/06/01 18:03:07 jlam Exp $ -_LIBPCAP_PKGSRC_PKGNAME= libpcap-0.8.3 -_LIBPCAP_PCAP_H= /usr/include/pcap.h +BUILTIN_PKG:= libpcap +BUILTIN_FIND_FILES_VAR:= H_LIBPCAP +BUILTIN_FIND_FILES.H_LIBPCAP= /usr/include/pcap.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.libpcap) IS_BUILTIN.libpcap= no -. if exists(${_LIBPCAP_PCAP_H}) +. if empty(H_LIBPCAP:M${LOCALBASE}/*) && exists(${H_LIBPCAP}) IS_BUILTIN.libpcap= yes +. endif +.endif +MAKEVARS+= IS_BUILTIN.libpcap +### +### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to +### a package name to represent the built-in package. +### +.if !defined(BUILTIN_PKG.libpcap) && \ + !empty(IS_BUILTIN.libpcap:M[yY][eE][sS]) && \ + exists(${H_LIBPCAP}) # libpcap>=0.8.3: MODE_MON added -_PCAP_083!= \ - ${GREP} -c MODE_MON ${_LIBPCAP_PCAP_H} || ${TRUE} +_BLTN_PCAP_083!= \ + ${GREP} -c MODE_MON ${H_LIBPCAP} || ${TRUE} # libpcap>=0.8.1: pcap_get_selectable_fd added -_PCAP_081!= \ - ${GREP} -c pcap_get_selectable_fd ${_LIBPCAP_PCAP_H} || ${TRUE} +_BLTN_PCAP_081!= \ + ${GREP} -c pcap_get_selectable_fd ${H_LIBPCAP} || ${TRUE} # libpcap>=0.8.0: pcap_datalink_val_to_description added -_PCAP_080!= \ - ${GREP} -c pcap_datalink_val_to_description \ - ${_LIBPCAP_PCAP_H} || ${TRUE} +_BLTN_PCAP_080!= \ + ${GREP} -c pcap_datalink_val_to_description ${H_LIBPCAP} || ${TRUE} # libpcap>=0.7.0: pcap_setnonblock added -_PCAP_070!= \ - ${GREP} -c pcap_setnonblock ${_LIBPCAP_PCAP_H} || ${TRUE} +_BLTN_PCAP_070!= \ + ${GREP} -c pcap_setnonblock ${H_LIBPCAP} || ${TRUE} # libpcap>=0.6.0: prototype change for pcap_freecode -_PCAP_060!= \ - ${GREP} -c pcap_freecode.struct.bpf_program \ - ${_LIBPCAP_PCAP_H} || ${TRUE} +_BLTN_PCAP_060!= \ + ${GREP} -c pcap_freecode.struct.bpf_program ${H_LIBPCAP} || ${TRUE} # libpcap>=0.5.0: pcap_compile_nopcap added -_PCAP_050!= \ - ${GREP} -c pcap_compile_nopcap ${_LIBPCAP_PCAP_H} || ${TRUE} +_BLTN_PCAP_050!= \ + ${GREP} -c pcap_compile_nopcap ${H_LIBPCAP} || ${TRUE} -.if ${_PCAP_083} == "1" -BUILTIN_PKG.libpcap= libpcap-0.8.3 -.elif ${_PCAP_081} == "1" -BUILTIN_PKG.libpcap= libpcap-0.8.1 -.elif ${_PCAP_080} == "1" -BUILTIN_PKG.libpcap= libpcap-0.8.0 -.elif ${_PCAP_070} == "1" -BUILTIN_PKG.libpcap= libpcap-0.7.0 -.elif ${_PCAP_060} == "1" -BUILTIN_PKG.libpcap= libpcap-0.6.0 -.elif ${_PCAP_050} == "1" -BUILTIN_PKG.libpcap= libpcap-0.5.0 -.else -BUILTIN_PKG.libpcap= libpcap-0.4.0 +. if ${_BLTN_PCAP_083} == "1" +BUILTIN_VERSION.libpcap= 0.8.3 +. elif ${_BLTN_PCAP_081} == "1" +BUILTIN_VERSION.libpcap= 0.8.1 +. elif ${_BLTN_PCAP_080} == "1" +BUILTIN_VERSION.libpcap= 0.8.0 +. elif ${_BLTN_PCAP_070} == "1" +BUILTIN_VERSION.libpcap= 0.7.0 +. elif ${_BLTN_PCAP_060} == "1" +BUILTIN_VERSION.libpcap= 0.6.0 +. elif ${_BLTN_PCAP_050} == "1" +BUILTIN_VERSION.libpcap= 0.5.0 +. else +BUILTIN_VERSION.libpcap= 0.4.0 +. endif +BUILTIN_PKG.libpcap= libpcap-${BUILTIN_VERSION.libpcap} .endif +MAKEVARS+= BUILTIN_PKG.libpcap -.endif # exists({_LIBPCAP_PCAP_H}) - +### +### 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.libpcap) -USE_BUILTIN.libpcap?= ${IS_BUILTIN.libpcap} - -. if defined(BUILTIN_PKG.libpcap) +. if ${PREFER.libpcap} == "pkgsrc" +USE_BUILTIN.libpcap= no +. else +USE_BUILTIN.libpcap= ${IS_BUILTIN.libpcap} +. if defined(BUILTIN_PKG.libpcap) && \ + !empty(IS_BUILTIN.libpcap:M[yY][eE][sS]) USE_BUILTIN.libpcap= yes -. for _depend_ in ${BUILDLINK_DEPENDS.libpcap} -. if !empty(USE_BUILTIN.libpcap:M[yY][eE][sS]) -USE_BUILTIN.libpcap!= \ - if ${PKG_ADMIN} pmatch '${_depend_}' ${BUILTIN_PKG.libpcap}; then \ - ${ECHO} "yes"; \ +. for _dep_ in ${BUILDLINK_DEPENDS.libpcap} +. if !empty(USE_BUILTIN.libpcap:M[yY][eE][sS]) +USE_BUILTIN.libpcap!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.libpcap:Q}; then \ + ${ECHO} yes; \ else \ - ${ECHO} "no"; \ + ${ECHO} no; \ fi -. endif -. endfor -. endif -.endif # USE_BUILTIN.libpcap -.endif # IS_BUILTIN.libpcap +. endif +. endfor +. endif +. endif # PREFER.libpcap +.endif +MAKEVARS+= USE_BUILTIN.libpcap diff --git a/net/mldonkey-gui/Makefile b/net/mldonkey-gui/Makefile index 2d801813ea5..20603975ef1 100644 --- a/net/mldonkey-gui/Makefile +++ b/net/mldonkey-gui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/03/24 16:20:20 tron Exp $ +# $NetBSD: Makefile,v 1.4 2005/06/01 18:03:07 jlam Exp $ # .include "../../net/mldonkey/Makefile.common" @@ -6,7 +6,6 @@ PKGNAME= ${DISTNAME:S/mldonkey/mldonkey-gui/} COMMENT+= (GTK interface) -USE_X11= YES PRINT_PLIST_AWK+= /^@dirrm libexec\/mldonkey$$/ \ { print "@comment in mldonkey: " $$0; next } diff --git a/net/mtr-gtk/Makefile b/net/mtr-gtk/Makefile index 3e05cab2694..4f83bb1deda 100644 --- a/net/mtr-gtk/Makefile +++ b/net/mtr-gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/05/22 20:08:25 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2005/06/01 18:03:07 jlam Exp $ # DISTNAME= mtr-0.69 @@ -14,7 +14,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews GNU_CONFIGURE= yes USE_TOOLS+= gmake -USE_X11= yes INSTALLATION_DIRS= man/man8 sbin diff --git a/net/nam/Makefile b/net/nam/Makefile index a8b369ccb05..49eff040cc0 100644 --- a/net/nam/Makefile +++ b/net/nam/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/04/11 21:46:50 tv Exp $ +# $NetBSD: Makefile,v 1.18 2005/06/01 18:03:07 jlam Exp $ DISTNAME= nam-src-1.11 PKGNAME= ${DISTNAME:S/-src//} @@ -14,7 +14,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//} USE_LANGUAGES= c c++ GNU_CONFIGURE= yes -USE_X11= yes BUILD_TARGET= CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl} diff --git a/net/netbsd-tap/builtin.mk b/net/netbsd-tap/builtin.mk index bce8f902880..bc8d19347c2 100644 --- a/net/netbsd-tap/builtin.mk +++ b/net/netbsd-tap/builtin.mk @@ -1,10 +1,47 @@ -# $NetBSD: builtin.mk,v 1.1.1.1 2005/01/20 18:02:39 cube Exp $ +# $NetBSD: builtin.mk,v 1.2 2005/06/01 18:03:08 jlam Exp $ +BUILTIN_PKG:= netbsd-tap + +BUILTIN_FIND_FILES_VAR:= H_NETBSD_TAP +BUILTIN_FIND_FILES.H_NETBSD_TAP= /usr/include/net/if_tap.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.netbsd-tap) -. if exists(/usr/include/net/if_tap.h) -IS_BUILTIN.netbsd-tap= YES -. else -IS_BUILTIN.netbsd-tap= NO -.endif # IS_BUILTIN.netbsd-tap +IS_BUILTIN.netbsd-tap= no +. if empty(H_NETBSD_TAP:M${LOCALBASE}/*) && exists(${H_NETBSD_TAP}) +IS_BUILTIN.netbsd-tap= yes +. endif +.endif +MAKEVARS+= IS_BUILTIN.netbsd-tap -USE_BUILTIN.netbsd-tap?= ${IS_BUILTIN.netbsd-tap} +### +### 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.netbsd-tap) +. if ${PREFER.netbsd-tap} == "pkgsrc" +USE_BUILTIN.netbsd-tap= no +. else +USE_BUILTIN.netbsd-tap= ${IS_BUILTIN.netbsd-tap} +. if defined(BUILTIN_PKG.netbsd-tap) && \ + !empty(IS_BUILTIN.netbsd-tap:M[yY][eE][sS]) +USE_BUILTIN.netbsd-tap= yes +. for _dep_ in ${BUILDLINK_DEPENDS.netbsd-tap} +. if !empty(USE_BUILTIN.netbsd-tap:M[yY][eE][sS]) +USE_BUILTIN.netbsd-tap!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.netbsd-tap:Q}; then \ + ${ECHO} yes; \ + else \ + ${ECHO} no; \ + fi +. endif +. endfor +. endif +. endif # PREFER.netbsd-tap +.endif +MAKEVARS+= USE_BUILTIN.netbsd-tap diff --git a/net/netsaint-base/Makefile.common b/net/netsaint-base/Makefile.common index 7028666c4cb..b30e9621e3b 100644 --- a/net/netsaint-base/Makefile.common +++ b/net/netsaint-base/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.7 2005/05/22 20:08:25 jlam Exp $ +# $NetBSD: Makefile.common,v 1.8 2005/06/01 18:03:08 jlam Exp $ # CATEGORIES= net sysutils @@ -15,7 +15,6 @@ PKG_GROUPS+= ${NETSTADM_GROUP} PKG_USERS+= ${NETSAINT_USER}:${NETSAINT_GROUP}::NetSaint\\ Runtime\\ User PKG_USERS+= ${NETSTADM_USER}:${NETSTADM_GROUP}::NetSaint\\ Administrator:${PREFIX}/etc/netsaint:${SH} -USE_X11= YES GNU_CONFIGURE= YES USE_TOOLS+= gmake @@ -31,3 +30,5 @@ CONFIGURE_ARGS+= --with-lockfile=var/run/netsaint/netsaint.lock CONFIGURE_ARGS+= --with-netsaint-user=${NETSAINT_USER} CONFIGURE_ARGS+= --with-netsaint-grp=${NETSAINT_GROUP} CONFIGURE_ARGS+= --with-init-dir=${PREFIX}/etc/rc.d + +.include "../../mk/x11.buildlink3.mk" diff --git a/net/ns/Makefile b/net/ns/Makefile index 097ee923dc0..fc2451cd24f 100644 --- a/net/ns/Makefile +++ b/net/ns/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/04/11 21:46:52 tv Exp $ +# $NetBSD: Makefile,v 1.18 2005/06/01 18:03:08 jlam Exp $ DISTNAME= ns-src-2.27 PKGNAME= ${DISTNAME:S/-src//} @@ -15,7 +15,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//} USE_LANGUAGES= c c++ GNU_CONFIGURE= yes -USE_X11= yes PTHREAD_OPTS+= require # Perl is only needed if you want to run the validation tests. #USE_PERL5= build diff --git a/net/pload/Makefile b/net/pload/Makefile index e914c16c50b..34174312d69 100644 --- a/net/pload/Makefile +++ b/net/pload/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/04/11 21:46:57 tv Exp $ +# $NetBSD: Makefile,v 1.14 2005/06/01 18:03:08 jlam Exp $ # DISTNAME= pload-0.9.4 @@ -16,4 +16,5 @@ HAS_CONFIGURE= YES USE_X11BASE= YES INSTALL_TARGET= install install.man +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/rdesktop/Makefile b/net/rdesktop/Makefile index def28d90132..ff074f6f35c 100644 --- a/net/rdesktop/Makefile +++ b/net/rdesktop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/05/18 01:11:44 xtraeme Exp $ +# $NetBSD: Makefile,v 1.24 2005/06/01 18:03:08 jlam Exp $ # DISTNAME= rdesktop-1.4.1 @@ -9,7 +9,6 @@ MAINTAINER= grant@NetBSD.org HOMEPAGE= http://www.rdesktop.org/ COMMENT= Open-source Remote Desktop Protocol client -USE_X11= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --with-x=${X11BASE} CONFIGURE_ARGS+= --with-openssl=${SSLBASE} @@ -24,4 +23,5 @@ SUBST_MESSAGE.audio= "Fixing hardcoded audio device." .include "../../security/openssl/buildlink3.mk" .include "../../mk/ossaudio.buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/skype/Makefile b/net/skype/Makefile index e11774bd620..83b8996fa2b 100644 --- a/net/skype/Makefile +++ b/net/skype/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/04/09 19:53:09 jmmv Exp $ +# $NetBSD: Makefile,v 1.8 2005/06/01 18:03:08 jlam Exp $ # DISTNAME= skype_staticQT-1.0.0.20 @@ -20,7 +20,7 @@ DEPENDS+= suse_freetype2>=9.1:../../emulators/suse91_freetype2 DEPENDS+= suse_x11>=9.1:../../emulators/suse91_x11 .include "../../emulators/suse_linux/Makefile.application" .else -USE_X11= yes +.include "../../mk/x11.buildlink3.mk" .endif ONLY_FOR_PLATFORM= *-*-i386 diff --git a/net/tsclient/Makefile b/net/tsclient/Makefile index 7d49b2fb24a..9e8160c22a2 100644 --- a/net/tsclient/Makefile +++ b/net/tsclient/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/05/22 20:08:26 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2005/06/01 18:03:08 jlam Exp $ # DISTNAME= tsclient-0.132 @@ -18,7 +18,6 @@ USE_DIRS+= gnome2-1.5 USE_TOOLS+= gmake USE_PKGLOCALEDIR= yes USE_PERL5= run -USE_X11= yes GNU_CONFIGURE= yes .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/net/ttt/Makefile b/net/ttt/Makefile index 707fe9e43da..cafd6d41f14 100644 --- a/net/ttt/Makefile +++ b/net/ttt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/04/11 21:47:01 tv Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 18:03:08 jlam Exp $ # DISTNAME= ttt-1.8 @@ -9,7 +9,6 @@ MAINTAINER= sakamoto@NetBSD.org HOMEPAGE= http://www.csl.sony.co.jp/person/kjc/software.html COMMENT= Tele Traffic Tapper -USE_X11= yes GNU_CONFIGURE= yes INSTALL_TARGET= install install-man diff --git a/net/vino/Makefile b/net/vino/Makefile index 3e07d170b55..158c85fc363 100644 --- a/net/vino/Makefile +++ b/net/vino/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:26 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2005/06/01 18:03:08 jlam Exp $ # DISTNAME= vino-2.10.0 @@ -16,7 +16,6 @@ USE_TOOLS+= gmake USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes USE_PERL5= build -USE_X11= yes GCONF2_SCHEMAS= vino-server.schemas diff --git a/net/wistumbler/Makefile b/net/wistumbler/Makefile index a18fa44eb75..d2509dcd7c7 100644 --- a/net/wistumbler/Makefile +++ b/net/wistumbler/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/04/11 21:47:02 tv Exp $ +# $NetBSD: Makefile,v 1.18 2005/06/01 18:03:08 jlam Exp $ DISTNAME= wistumbler-20020816 PKGNAME= wistumbler-20020816.0 @@ -11,7 +11,6 @@ HOMEPAGE= http://gongon.com/persons/iseki/wistumbler/ COMMENT= Network stumbler for WaveLAN/IEEE wireless networking WRKSRC= ${WRKDIR}/wistumbler -USE_X11= YES NOT_FOR_PLATFORM= NetBSD-0.*-* NetBSD-1.[01234]*-* NetBSD-1.5-* NOT_FOR_PLATFORM+= NetBSD-1.5.*-* NetBSD-1.5[A-V]-* diff --git a/net/x2vnc/Makefile b/net/x2vnc/Makefile index 319d797b36e..ad1a45fd27b 100644 --- a/net/x2vnc/Makefile +++ b/net/x2vnc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/04/11 21:47:02 tv Exp $ +# $NetBSD: Makefile,v 1.10 2005/06/01 18:03:08 jlam Exp $ # DISTNAME= x2vnc-1.5.1 @@ -11,6 +11,6 @@ HOMEPAGE= http://fredrik.hubbe.net/x2vnc.html COMMENT= Multi-console display using X and VNC GNU_CONFIGURE= yes -USE_X11= yes +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/xipdump/Makefile b/net/xipdump/Makefile index cc252009a68..9b1fc3f3bb3 100644 --- a/net/xipdump/Makefile +++ b/net/xipdump/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/04/11 21:47:02 tv Exp $ +# $NetBSD: Makefile,v 1.19 2005/06/01 18:03:08 jlam Exp $ # DISTNAME= xipdump-1.5.4 @@ -31,4 +31,5 @@ post-build: @${ECHO} "@dirrm share/xipdump" >> ${PLIST_SRC} .include "../../devel/libnet/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/xtraceroute/Makefile b/net/xtraceroute/Makefile index f90c668df4a..4991b0a73dd 100644 --- a/net/xtraceroute/Makefile +++ b/net/xtraceroute/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2005/04/11 21:47:03 tv Exp $ +# $NetBSD: Makefile,v 1.41 2005/06/01 18:03:08 jlam Exp $ # DISTNAME= xtraceroute-0.8.14 @@ -14,7 +14,6 @@ COMMENT= Graphical version of traceroute, which traces the route IP packets go BUILD_USES_MSGFMT= yes -USE_X11= yes GNU_CONFIGURE= yes USE_PKGLOCALEDIR= yes diff --git a/net/ytalk-x11/Makefile b/net/ytalk-x11/Makefile index a5a87d3cfc4..a0deae19937 100644 --- a/net/ytalk-x11/Makefile +++ b/net/ytalk-x11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2004/03/06 12:05:20 grant Exp $ +# $NetBSD: Makefile,v 1.2 2005/06/01 18:03:08 jlam Exp $ .include "../../net/ytalk/Makefile.common" @@ -7,7 +7,6 @@ CATEGORIES+= x11 COMMENT= Multi-user replacement for UNIX talk (includes X11 support) CONFIGURE_ARGS+=--with-x -USE_X11= yes CONFLICTS+= ytalk-[0-9]* @@ -16,4 +15,5 @@ DISTINFO_FILE= ${.CURDIR}/../../net/ytalk/distinfo PATCHDIR= ${.CURDIR}/../../net/ytalk/patches PLIST_SRC= ${.CURDIR}/../../net/ytalk/PLIST +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/parallel/clusterit/Makefile b/parallel/clusterit/Makefile index 682cf3c437d..e82edced132 100644 --- a/parallel/clusterit/Makefile +++ b/parallel/clusterit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/05/24 05:42:37 garbled Exp $ +# $NetBSD: Makefile,v 1.10 2005/06/01 18:03:08 jlam Exp $ DISTNAME= clusterit-2.3 CATEGORIES= parallel @@ -10,6 +10,6 @@ COMMENT= Clustering package for unix HAS_CONFIGURE= YES CONFIGURE_ARGS+= --prefix=${PREFIX} -USE_X11= YES +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/parallel/mpi-ch/Makefile b/parallel/mpi-ch/Makefile index 00ae34fa53a..5a3d9a7def6 100644 --- a/parallel/mpi-ch/Makefile +++ b/parallel/mpi-ch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2005/03/07 02:08:37 jschauma Exp $ +# $NetBSD: Makefile,v 1.35 2005/06/01 18:03:08 jlam Exp $ DISTNAME= mpich-1.2.6 CATEGORIES= parallel @@ -17,7 +17,6 @@ BUILD_TARGET= ALL examples INSTALL_TARGET= install-all USE_PERL5= yes HAS_CONFIGURE= yes -USE_X11= yes USE_FORTRAN= yes PKG_SYSCONFSUBDIR= mpi-ch diff --git a/parallel/openpbs/Makefile b/parallel/openpbs/Makefile index 2e9523ab5d8..5228830693f 100644 --- a/parallel/openpbs/Makefile +++ b/parallel/openpbs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/04/11 21:47:04 tv Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:08 jlam Exp $ # DISTNAME= OpenPBS_2_3_16 @@ -14,7 +14,6 @@ INTERACTIVE_STAGE= fetch HAS_CONFIGURE= yes CONFIGURE_ARGS+= --prefix=${PREFIX} -USE_X11= yes REPLACE_INTERPRETER+= tcl _REPLACE.tcl.old= .*/bin/pbs_tclsh diff --git a/parallel/pvm3/Makefile b/parallel/pvm3/Makefile index cc6f7447791..d92207870ce 100644 --- a/parallel/pvm3/Makefile +++ b/parallel/pvm3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2005/04/11 21:47:04 tv Exp $ +# $NetBSD: Makefile,v 1.38 2005/06/01 18:03:08 jlam Exp $ DISTNAME= pvm3.4.5 PKGNAME= pvm-3.4.5 @@ -19,7 +19,6 @@ PVM_SSH?= ${LOCALBASE}/bin/ssh WRKSRC= ${WRKDIR}/pvm3 USE_LANGUAGES= fortran -USE_X11= yes USE_LIBTOOL= yes PVM_ROOT= ${WRKSRC} @@ -37,6 +36,8 @@ BUILD_TARGET= all install PVM_DIR= ${PREFIX}/pvm3 BUILDLINK_PASSTHRU_RPATHDIRS+= ${PVM_DIR}/lib/${PVM_ARCH} +.include "../../mk/x11.buildlink3.mk" + post-build: ${CP} ${WRKSRC}/examples/${PVM_ARCH}/.libs/* \ ${WRKSRC}/bin/${PVM_ARCH}/.libs diff --git a/parallel/sge/Makefile b/parallel/sge/Makefile index d0e1243fbbb..d8987a01d4c 100644 --- a/parallel/sge/Makefile +++ b/parallel/sge/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:27 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2005/06/01 18:03:08 jlam Exp $ # DISTNAME= sge-5.3p6 @@ -14,7 +14,6 @@ BUILD_DEPENDS+= {standalone-tcsh,tcsh}-[0-9]*:../../shells/tcsh GNU_CONFIGURE= YES USE_TOOLS+= gmake -USE_X11= YES USE_PERL5= YES CFLAGS+= -D${UPPER_OPSYS} diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile index cf1c66415e0..102d87a7728 100644 --- a/pkgtools/x11-links/Makefile +++ b/pkgtools/x11-links/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.67 2005/05/07 22:24:04 wiz Exp $ +# $NetBSD: Makefile,v 1.68 2005/06/01 18:03:08 jlam Exp $ # # NOTE: If you update this package, then you'll likely need to also update # the x11-links dependency in buildlink3.mk to the correct version, @@ -20,7 +20,6 @@ USE_LANGUAGES= # empty EXTRACT_ONLY= # empty NO_CHECKSUM= yes NO_MTREE= yes -USE_X11= yes PLIST_SRC= ${WRKDIR}/.PLIST_SRC PLIST_SRC.dirs= ${PLIST_SRC}.dirs @@ -50,6 +49,8 @@ FILES_LIST_CMD= ${SED} -e "s/@ABI@/${ABI}/" ${FILES_LIST} | ${GREP} -v "^\#" CREATE_X11LINK?= ${LN} -fs $$src $$dest +.include "../../mk/x11.buildlink3.mk" + do-build: ${MKDIR} ${X11_LINKS_BUILD_DIR} ${RM} -f ${PLIST_SRC.dirs} diff --git a/pkgtools/x11-links/builtin.mk b/pkgtools/x11-links/builtin.mk index d46a19f35fc..10d8241067d 100644 --- a/pkgtools/x11-links/builtin.mk +++ b/pkgtools/x11-links/builtin.mk @@ -1,53 +1,9 @@ -# $NetBSD: builtin.mk,v 1.6 2005/03/05 18:16:21 wiz Exp $ +# $NetBSD: builtin.mk,v 1.7 2005/06/01 18:03:08 jlam Exp $ -.if !defined(XF86_VERSION) -. if exists(${X11BASE}/lib/X11/config/xorg.cf) -_X11_CONFIG_VERSION_DEF= ${X11BASE}/lib/X11/config/xorg.cf -_XORG_MAJOR!= \ - ${AWK} '/\#define[ ]*XORG_VERSION_MAJOR/ { print $$3 }' \ - ${_X11_CONFIG_VERSION_DEF} -_XORG_MINOR!= \ - ${AWK} '/\#define[ ]*XORG_VERSION_MINOR/ { print $$3 }' \ - ${_X11_CONFIG_VERSION_DEF} -_XORG_PATCH!= \ - ${AWK} '/\#define[ ]*XORG_VERSION_PATCH/ { print $$3 }' \ - ${_X11_CONFIG_VERSION_DEF} -_XORG_SNAP!= \ - ${AWK} '/\#define[ ]*XORG_VERSION_SNAP/ { print $$3 }' \ - ${_X11_CONFIG_VERSION_DEF} -_XORG_TEENY= ${_XORG_PATCH}.${_XORG_SNAP} -. if !empty(_XORG_TEENY:M0.0) -XF86_VERSION= 4.4 -. else -XF86_VERSION= 4.4.${_XORG_TEENY} -. endif -. else -_X11_CONFIG_VERSION_DEF= ${X11BASE}/lib/X11/config/version.def -XF86_VERSION= 3.3 -. if !exists(${_X11_CONFIG_VERSION_DEF}) -XF86_VERSION= 0 -. else -_XF86_MAJOR!= \ - ${AWK} '/\#define[ ]*XF86_VERSION_MAJOR/ { print $$3 }' \ - ${_X11_CONFIG_VERSION_DEF} -_XF86_MINOR!= \ - ${AWK} '/\#define[ ]*XF86_VERSION_MINOR/ { print $$3 }' \ - ${_X11_CONFIG_VERSION_DEF} -_XF86_PATCH!= \ - ${AWK} '/\#define[ ]*XF86_VERSION_PATCH/ { print $$3 }' \ - ${_X11_CONFIG_VERSION_DEF} -_XF86_SNAP!= \ - ${AWK} '/\#define[ ]*XF86_VERSION_SNAP/ { print $$3 }' \ - ${_X11_CONFIG_VERSION_DEF} -_XF86_TEENY= ${_XF86_PATCH}.${_XF86_SNAP} -. if !empty(_XF86_TEENY:M0.0) -XF86_VERSION= ${_XF86_MAJOR}.${_XF86_MINOR} -. else -XF86_VERSION= ${_XF86_MAJOR}.${_XF86_MINOR}.${_XF86_TEENY} -. endif -. endif -. endif # xorg -BUILDLINK_VARS+= XF86_VERSION -.endif +BUILTIN_PKG:= x11-links +.include "../../mk/buildlink3/bsd.builtin.mk" -USE_BUILTIN.x11-links?= no +.if !defined(USE_BUILTIN.x11-links) +USE_BUILTIN.x11-links= no +.endif +MAKEVARS+= USE_BUILTIN.x11-links diff --git a/pkgtools/x11-links/version.mk b/pkgtools/x11-links/version.mk new file mode 100644 index 00000000000..59ea8ad2782 --- /dev/null +++ b/pkgtools/x11-links/version.mk @@ -0,0 +1,35 @@ +# $NetBSD: version.mk,v 1.1 2005/06/01 18:03:08 jlam Exp $ +# +# This Makefile fragment is included by Makefiles that need to access +# the X11_TYPE and version number of a native X11 distribution. +# +# The following variables are provided by this file: +# +# BUILTIN_X11_TYPE.native is the X11_TYPE of the native X11 +# distribution detected on the system. +# +# BUILTIN_X11_VERSION.native is the version number, where applicable, +# of the native X11 distribution detected on the system. +# + +.if !defined(BUILTIN_X11_VERSION.native) +. include "../../x11/xorg-libs/version.mk" +. include "../../x11/XFree86-libs/version.mk" + +. if defined(BUILTIN_X11_VERSION.xorg) +BUILTIN_X11_TYPE.native= ${BUILTIN_X11_TYPE.xorg} +BUILTIN_X11_VERSION.native= ${BUILTIN_X11_VERSION.xorg} +. elif defined(BUILTIN_X11_VERSION.XFree86) +BUILTIN_X11_TYPE.native= ${BUILTIN_X11_TYPE.XFree86} +BUILTIN_X11_VERSION.native= ${BUILTIN_X11_VERSION.XFree86} +. elif !empty(X11BASE:M*openwin) +BUILTIN_X11_TYPE.native= openwin +. elif ${OPSYS} == "IRIX" +BUILTIN_X11_TYPE.native= xsgi +. elif ${OPSYS} == "OSF1" +BUILTIN_X11_TYPE.native= xdec +. else +BUILTIN_X11_TYPE.native= unknown +. endif +.endif +MAKEVARS+= BUILTIN_X11_VERSION.native diff --git a/pkgtools/x11-links/xfree.mk b/pkgtools/x11-links/xfree.mk index adddf84380a..05740091ada 100644 --- a/pkgtools/x11-links/xfree.mk +++ b/pkgtools/x11-links/xfree.mk @@ -1,4 +1,4 @@ -# $NetBSD: xfree.mk,v 1.10 2004/03/29 05:43:32 jlam Exp $ +# $NetBSD: xfree.mk,v 1.11 2005/06/01 18:03:08 jlam Exp $ FILES_LIST= ${FILESDIR}/xfree @@ -18,13 +18,14 @@ FILES_LIST= ${FILESDIR}/xfree # Check if any headers and libraries for ${X11_MODULES} found in # ${X11BASE} actually belong to the base XFree86 or not. # -.for _pkg_ in ${BUILDLINK_PACKAGES} -CHECK_BUILTIN.${_pkg_}= yes -USE_BUILTIN.${_pkg_}= yes +.for _pkg_ in ${BUILDLINK_PACKAGES:Nx11-links} +CHECK_BUILTIN.${_pkg_}:= yes +USE_BUILTIN.${_pkg_}= yes +. sinclude "${BUILDLINK_PKGSRCDIR.${_pkg_}}/builtin.mk" +CHECK_BUILTIN.${_pkg_}:= no .endfor -.include "../../mk/buildlink3/bsd.builtin.mk" -.for _pkg_ in ${BUILDLINK_PACKAGES} +.for _pkg_ in ${BUILDLINK_PACKAGES:Nx11-links} IGNORE_PKG.${_pkg_}= yes . if !empty(IS_BUILTIN.${_pkg_}:M[yY][eE][sS]) && \ exists(${FILESDIR}/xfree.${_pkg_}) diff --git a/pkgtools/xpkgwedge/Makefile b/pkgtools/xpkgwedge/Makefile index fb7b813b995..d62bdd9f00a 100644 --- a/pkgtools/xpkgwedge/Makefile +++ b/pkgtools/xpkgwedge/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.55 2005/05/07 22:24:04 wiz Exp $ +# $NetBSD: Makefile,v 1.56 2005/06/01 18:03:08 jlam Exp $ DISTNAME= xpkgwedge-1.12 CATEGORIES= pkgtools devel x11 @@ -26,7 +26,6 @@ PKG_SKIP_REASON+= "xpkgwedge is not needed when X11BASE is LOCALBASE" CONFLICTS+= mkfontscale-[0-9]* .endif -USE_X11= YES USE_PKGINSTALL= YES DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL @@ -41,6 +40,8 @@ FILES_SUBST+= VIEWBASE=${VIEWBASE} FILES_SUBST+= FONT_PROGS=${FONT_PROGS:Q} FILES_SUBST+= MAKE=${MAKE_PROGRAM:Q} +.include "../../mk/x11.buildlink3.mk" + post-extract: @${CP} ${FILESDIR}/xpkgwedge.def ${WRKSRC} diff --git a/print/advi/Makefile b/print/advi/Makefile index e6cd1aea21a..e95018478b3 100644 --- a/print/advi/Makefile +++ b/print/advi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:27 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 18:03:08 jlam Exp $ DISTNAME= advi-1.6.0 CATEGORIES= print @@ -15,7 +15,6 @@ BUILD_DEPENDS+= ocaml>=3.04:../../lang/ocaml USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes USE_TOOLS+= gmake -USE_X11= yes post-extract: @${CP} ${WRKSRC}/tex/*.eps ${WRKSRC}/doc diff --git a/print/cjk-lyx/Makefile b/print/cjk-lyx/Makefile index 95c97a883c0..de9bece9dd7 100644 --- a/print/cjk-lyx/Makefile +++ b/print/cjk-lyx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/04/11 21:47:06 tv Exp $ +# $NetBSD: Makefile,v 1.15 2005/06/01 18:03:09 jlam Exp $ DISTNAME= lyx-${LYX_VERS} PKGNAME= cjk-${DISTNAME} @@ -26,7 +26,6 @@ DEPENDS+= teTeX-bin>=1.0.7nb1:../../print/teTeX-bin USE_LANGUAGES= c c++ USE_PKGLOCALEDIR= yes USE_PERL5= yes -USE_X11= yes GNU_CONFIGURE= yes USE_LIBTOOL= yes diff --git a/print/ggv2/Makefile b/print/ggv2/Makefile index 1068dc52cc6..029ed64ffb3 100644 --- a/print/ggv2/Makefile +++ b/print/ggv2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2005/05/22 20:08:27 jlam Exp $ +# $NetBSD: Makefile,v 1.43 2005/06/01 18:03:09 jlam Exp $ # DISTNAME= ggv-2.8.4 @@ -17,7 +17,6 @@ USE_DIRS+= gnome2-1.5 USE_PKGLOCALEDIR= YES USE_LIBTOOL= YES USE_TOOLS+= gmake -USE_X11= YES GCONF2_SCHEMAS= ggv.schemas diff --git a/print/ghostscript-esp/Makefile b/print/ghostscript-esp/Makefile index 25bd8d52cc1..8ca3d605a42 100644 --- a/print/ghostscript-esp/Makefile +++ b/print/ghostscript-esp/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.8 2005/05/30 14:57:28 dillo Exp $ +# $NetBSD: Makefile,v 1.9 2005/06/01 18:03:09 jlam Exp $ PKGNAME= ghostscript-esp-${GS_VERS} PKGREVISION= 4 COMMENT= ESP/CUPS Postscript interpreter -USE_X11= # defined CONFIGURE_ARGS+= --with-x +.include "../../mk/x11.buildlink3.mk" .include "Makefile.common" diff --git a/print/ghostscript-gnu-x11/Makefile b/print/ghostscript-gnu-x11/Makefile index e3d193bf151..691e0f435e2 100644 --- a/print/ghostscript-gnu-x11/Makefile +++ b/print/ghostscript-gnu-x11/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.5 2005/05/30 15:39:11 dillo Exp $ +# $NetBSD: Makefile,v 1.6 2005/06/01 18:03:09 jlam Exp $ PKGNAME= ghostscript-gnu-x11-${GS_VERS} COMMENT= GNU Postscript interpreter with X11 and image drivers only -USE_X11= YES CONFIGURE_ARGS+= --with-x # Based on the definitions for the DEVICE_DEVS* from ${WRKSRC}/src/devs.mak, @@ -19,4 +18,5 @@ MAKE_FLAGS+= DEVICE_DEVS${N}= # MAKE_FLAGS+= DEVICE_DEVS5="\$$(DD)ijs.dev" +.include "../../mk/x11.buildlink3.mk" .include "../ghostscript-gnu/Makefile.common" diff --git a/print/ghostscript-gnu/Makefile b/print/ghostscript-gnu/Makefile index 34957e0c549..a8f62dfc37e 100644 --- a/print/ghostscript-gnu/Makefile +++ b/print/ghostscript-gnu/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.6 2005/05/30 15:39:11 dillo Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:09 jlam Exp $ PKGNAME= ghostscript-gnu-${GS_VERS} COMMENT= GNU Postscript interpreter with all drivers -USE_X11= YES CONFIGURE_ARGS+= --with-x +.include "../../mk/x11.buildlink3.mk" .include "Makefile.common" diff --git a/print/ghostscript/Makefile b/print/ghostscript/Makefile index 913664f92f6..73c33d04bb7 100644 --- a/print/ghostscript/Makefile +++ b/print/ghostscript/Makefile @@ -1,13 +1,13 @@ -# $NetBSD: Makefile,v 1.14 2005/05/30 14:57:28 dillo Exp $ +# $NetBSD: Makefile,v 1.15 2005/06/01 18:03:09 jlam Exp $ PKGNAME= ghostscript-${GS_VERS} PKGREVISION= 5 COMMENT= Aladdin Postscript interpreter -USE_X11= YES GS_DISPLAY_DEVICE= x11.dev XLIBS= Xt SM ICE Xext X11 +.include "../../mk/x11.buildlink3.mk" .include "../../print/ghostscript-nox11/Makefile.common" MAKEFRAGS+= ${FILESDIR}/devs.x11 diff --git a/print/gimp-print/Makefile b/print/gimp-print/Makefile index 052be3c6711..0eff7948f1d 100644 --- a/print/gimp-print/Makefile +++ b/print/gimp-print/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/05/22 20:08:28 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2005/06/01 18:03:09 jlam Exp $ DISTNAME= gimp-print-4.2.7 PKGREVISION= 1 @@ -13,7 +13,6 @@ CONFLICTS+= gimp<=1.2.3 USE_TOOLS+= gmake USE_LIBTOOL= yes -USE_X11= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --without-samples --without-user-guide CONFIGURE_ARGS+= --without-cups --without-translated-ppds diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile index ef858184b9d..1b5f7943518 100644 --- a/print/gnome-print/Makefile +++ b/print/gnome-print/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.67 2005/04/11 21:47:07 tv Exp $ +# $NetBSD: Makefile,v 1.68 2005/06/01 18:03:09 jlam Exp $ DISTNAME= gnome-print-0.37 CATEGORIES= print gnome @@ -10,7 +10,6 @@ COMMENT= Prototype implementation of the Gnome Printing Architecture USE_DIRS+= gnome1-1.5 USE_PKGLOCALEDIR= YES -USE_X11= YES USE_LIBTOOL= YES GNU_CONFIGURE= YES diff --git a/print/gpdf/Makefile b/print/gpdf/Makefile index 8c19d8a7b74..e28d135c190 100644 --- a/print/gpdf/Makefile +++ b/print/gpdf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/05/22 20:08:28 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2005/06/01 18:03:09 jlam Exp $ # DISTNAME= gpdf-2.10.0 @@ -17,7 +17,6 @@ USE_TOOLS+= gmake USE_PKGLOCALEDIR= yes USE_LANGUAGES= c c++ USE_LIBTOOL= yes -USE_X11= yes GNU_CONFIGURE= yes GCONF2_SCHEMAS= gpdf.schemas diff --git a/print/gv/Makefile b/print/gv/Makefile index 5690dcbce63..b3574c057de 100644 --- a/print/gv/Makefile +++ b/print/gv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.53 2005/05/22 20:08:28 jlam Exp $ +# $NetBSD: Makefile,v 1.54 2005/06/01 18:03:09 jlam Exp $ DISTNAME= gv-3.6.1 CATEGORIES= print @@ -10,7 +10,6 @@ COMMENT= PostScript and PDF previewer GNU_CONFIGURE= yes USE_TOOLS+= gmake -USE_X11= yes USE_MAKEINFO= yes TEXINFO_REQD= 4.2 diff --git a/print/imposter/Makefile b/print/imposter/Makefile index bf1d8fb9bc2..969c4c8f2ca 100644 --- a/print/imposter/Makefile +++ b/print/imposter/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:28 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:09 jlam Exp $ # DISTNAME= imposter-0.2 @@ -15,7 +15,6 @@ BUILD_USES_MSGFMT= yes GNU_CONFIGURE= yes USE_TOOLS+= gmake USE_PKGLOCALEDIR= yes -USE_X11= yes .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/pkgconfig/buildlink3.mk" diff --git a/print/ja-ptex/Makefile b/print/ja-ptex/Makefile index 468c6cc5942..f7057d4abbd 100644 --- a/print/ja-ptex/Makefile +++ b/print/ja-ptex/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/01/19 12:22:36 kei Exp $ +# $NetBSD: Makefile,v 1.8 2005/06/01 18:03:20 jlam Exp $ DISTNAME= ja-ptex-1.0 PKGREVISION= 1 @@ -14,7 +14,6 @@ DEPENDS+= ja-jsclasses>=0.0.0.20021127:../../print/ja-jsclasses DEPENDS+= ja-vfxdvik>=22.40v.j1.14:../../print/ja-vfxdvik DEPENDS+= dvipdfmx>=0.0.0.20021230nb1:../../print/dvipdfmx -USE_X11= yes EXTRACT_ONLY= # empty NO_CHECKSUM= yes NO_CONFIGURE= yes @@ -24,4 +23,5 @@ MESSAGE_SRC= ${PKGDIR}/MESSAGE do-install: # empty +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/ja-vflib-utils/Makefile b/print/ja-vflib-utils/Makefile index 51e1d1de577..484b53a8baf 100644 --- a/print/ja-vflib-utils/Makefile +++ b/print/ja-vflib-utils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2004/12/03 15:15:07 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:20 jlam Exp $ .include "../../print/ja-vflib-lib/Makefile.common" @@ -8,11 +8,11 @@ COMMENT= Utilities for manipulating VFlib vector font files BUILDLINK_DEPENDS.vflib=ja-vflib-lib>=${VFLIB_VERSION} -USE_X11= # defined CONFIGURE_ARGS+= --enable-tools --with-x BUILD_TARGET= build-tools INSTALL_TARGET= install-tools .include "../../print/ja-vflib-lib/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/ja-vflib/Makefile b/print/ja-vflib/Makefile index 5ba17cfc5ac..f4ecc56a0b7 100644 --- a/print/ja-vflib/Makefile +++ b/print/ja-vflib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2004/10/28 11:48:24 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2005/06/01 18:03:20 jlam Exp $ DISTNAME= ja-vflib-${VFLIB_VERSION} VFLIB_VERSION= 2.24.2nb1 @@ -13,7 +13,6 @@ COMMENT= Japanese Vector font libraries and utilities DEPENDS+= ja-vflib-lib-${VFLIB_VERSION}:../../print/ja-vflib-lib DEPENDS+= ja-vflib-utils-${VFLIB_VERSION}:../../print/ja-vflib-utils -USE_X11= # defined # ja-vflib-utils uses X11 EXTRACT_ONLY= # empty NO_CHECKSUM= # defined @@ -22,4 +21,5 @@ NO_BUILD= # defined do-install: # empty +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/ja-vfxdvik/Makefile b/print/ja-vfxdvik/Makefile index ef8e1c9999c..c80042377de 100644 --- a/print/ja-vfxdvik/Makefile +++ b/print/ja-vfxdvik/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/05/22 20:08:28 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2005/06/01 18:03:20 jlam Exp $ DISTNAME= xdvik-${XDVIK_ORIGINAL_VERS} PKGNAME= ja-vfxdvik-${XDVIK_ORIGINAL_VERS}.${XDVIK_JP_PATCH_VERS} @@ -26,7 +26,6 @@ DEPENDS+= ja-ptex-bin>=3.1.2:../../print/ja-ptex-bin XDVI_DIR= ${WRKDIR}/${DISTNAME}/texk/xdvik USE_TOOLS+= gmake -USE_X11= YES USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/config/config LIBTOOL_OVERRIDE= klibtool @@ -80,4 +79,5 @@ do-install: .include "../../print/ja-vflib-lib/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../fonts/t1lib/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/lgrind/Makefile b/print/lgrind/Makefile index 4d6aeee9579..b78c73ca9e4 100644 --- a/print/lgrind/Makefile +++ b/print/lgrind/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/01/17 12:51:29 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2005/06/01 18:03:20 jlam Exp $ DISTNAME= lgrind PKGNAME= lgrind-3.5 @@ -13,10 +13,11 @@ COMMENT= Source pretty printer for LaTeX DEPENDS+= teTeX>=1.0:../../print/teTeX WRKSRC= ${WRKDIR}/lgrind/source -USE_X11= yes NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL NO_CONFIGURE= yes +.include "../../mk/x11.buildlink3.mk" + pre-patch: ${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile-prepatch ${SED} -e '/Id/s|\$$||g' ${WRKSRC}/Makefile-prepatch > ${WRKSRC}/Makefile diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile index 6f201ede7d6..4a501e35477 100644 --- a/print/libgnomeprint/Makefile +++ b/print/libgnomeprint/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2005/05/22 20:08:28 jlam Exp $ +# $NetBSD: Makefile,v 1.42 2005/06/01 18:03:20 jlam Exp $ # DISTNAME= libgnomeprint-2.10.3 @@ -14,7 +14,6 @@ BUILD_USES_MSGFMT= YES USE_TOOLS+= gmake USE_PKGLOCALEDIR= YES -USE_X11= YES USE_LIBTOOL= YES GNU_CONFIGURE= YES diff --git a/print/libgnomeprintui/Makefile b/print/libgnomeprintui/Makefile index 6bee92b222a..ec7da66f871 100644 --- a/print/libgnomeprintui/Makefile +++ b/print/libgnomeprintui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2005/05/22 20:08:28 jlam Exp $ +# $NetBSD: Makefile,v 1.36 2005/06/01 18:03:20 jlam Exp $ # DISTNAME= libgnomeprintui-2.10.2 @@ -15,7 +15,6 @@ BUILD_USES_MSGFMT= YES GNU_CONFIGURE= YES USE_PKGLOCALEDIR= YES USE_TOOLS+= gmake -USE_X11= YES USE_LIBTOOL= YES PKGCONFIG_OVERRIDE= libgnomeprintui/libgnomeprintui-2.2.pc.in diff --git a/print/mp/Makefile b/print/mp/Makefile index 70f3c293486..30f04a4a368 100644 --- a/print/mp/Makefile +++ b/print/mp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/04/11 21:47:08 tv Exp $ +# $NetBSD: Makefile,v 1.10 2005/06/01 18:03:20 jlam Exp $ # DISTNAME= mpdist-3.7.1 @@ -13,7 +13,6 @@ COMMENT= PostScript pretty printer GNU_CONFIGURE= yes USE_LIBTOOL= yes -USE_X11= yes .include "../../mk/bsd.prefs.mk" diff --git a/print/scribus/Makefile b/print/scribus/Makefile index a7f0f23e60c..5e5caff4cd5 100644 --- a/print/scribus/Makefile +++ b/print/scribus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/05/22 20:08:28 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2005/06/01 18:03:20 jlam Exp $ DISTNAME= scribus-1.2.1 CATEGORIES= print @@ -9,7 +9,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.scribus.net/ COMMENT= Publishing layout with graphical interface -USE_X11= # defined USE_TOOLS+= gmake PTHREAD_OPTS+= require diff --git a/print/teTeX-bin/Makefile.common b/print/teTeX-bin/Makefile.common index 7fc8e6103b4..bcbede64090 100644 --- a/print/teTeX-bin/Makefile.common +++ b/print/teTeX-bin/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.8 2005/05/22 20:08:29 jlam Exp $ +# $NetBSD: Makefile.common,v 1.9 2005/06/01 18:03:20 jlam Exp $ TETEX_BIN_VERS= 2.0.2 DIST_SUBDIR= teTeX @@ -8,7 +8,6 @@ INSTALL_TARGET= install strip USE_TOOLS+= gmake USE_LANGUAGES= c c++ USE_PKGINSTALL= yes -USE_X11= yes CFLAGS+= -Dunix GNU_CONFIGURE= yes @@ -60,3 +59,4 @@ OWN_DIRS_PERMS+= ${TEXFONTSDIR}/tfm ${ROOT_USER} ${ROOT_GROUP} 1777 .include "../../fonts/t1lib/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" diff --git a/print/teTeX1-bin/Makefile b/print/teTeX1-bin/Makefile index e4735f41e62..c4eb101bdb5 100644 --- a/print/teTeX1-bin/Makefile +++ b/print/teTeX1-bin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:29 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2005/06/01 18:03:20 jlam Exp $ DISTNAME= teTeX-src-1.0.7 PKGNAME= teTeX-bin-1.0.7 @@ -25,7 +25,6 @@ INSTALL_TARGET= install strip USE_PKGINSTALL= yes USE_TOOLS+= gmake USE_LANGUAGES= c c++ -USE_X11= yes CFLAGS+= -Dunix INFO_FILES= latex.info dvips.info web2c.info kpathsea.info @@ -93,5 +92,6 @@ post-install: .include "../../graphics/png/buildlink3.mk" .include "../../www/libwww/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/teTeX1/Makefile b/print/teTeX1/Makefile index 579a373e989..ad5041f640b 100644 --- a/print/teTeX1/Makefile +++ b/print/teTeX1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/04/11 21:47:09 tv Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:20 jlam Exp $ # DISTNAME= teTeX-1.0.7 @@ -15,7 +15,6 @@ DEPENDS+= teTeX-bin-1.0.[7-9]*:../teTeX1-bin DEPENDS+= teTeX-sharesrc-1.0.[1-9]*:../teTeX1-sharesrc DEPENDS+= texi2html>=1.52:../../textproc/texi2html -USE_X11= yes EXTRACT_ONLY= # empty NO_CHECKSUM= yes NO_CONFIGURE= yes diff --git a/print/teTeX3-bin/Makefile.common b/print/teTeX3-bin/Makefile.common index 5ee64ca05a7..b9b5b6ddf30 100644 --- a/print/teTeX3-bin/Makefile.common +++ b/print/teTeX3-bin/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.3 2005/05/22 20:08:29 jlam Exp $ +# $NetBSD: Makefile.common,v 1.4 2005/06/01 18:03:20 jlam Exp $ TETEX_BIN_VERS= 3.0 DIST_SUBDIR= teTeX @@ -8,7 +8,6 @@ INSTALL_TARGET= install strip USE_TOOLS+= gmake USE_LANGUAGES= c c++ USE_PKGINSTALL= yes -USE_X11= yes CFLAGS+= -Dunix GNU_CONFIGURE= yes @@ -60,3 +59,4 @@ OWN_DIRS_PERMS+= ${TEXFONTSDIR}/tfm ${ROOT_USER} ${ROOT_GROUP} 1777 .include "../../fonts/t1lib/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" diff --git a/print/texfamily/Makefile b/print/texfamily/Makefile index 36edb9d9274..3954012ca5a 100644 --- a/print/texfamily/Makefile +++ b/print/texfamily/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:29 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 18:03:20 jlam Exp $ DISTNAME= TeXfamily-1.2.1 PKGREVISION= 5 @@ -40,7 +40,6 @@ PKGSRC_USE_TOOLS+= gtar BUILD_TARGET= all INSTALL_TARGET= install strip USE_TOOLS+= gmake -USE_X11= yes PLIST_SUBST+= MV="${MV}" CFLAGS+= -Dunix MAKEFLAGS+= PREFIX=${PREFIX:Q} @@ -83,6 +82,8 @@ TEXFAMILY_PTEXVERSION= 3.0.1 TEXFAMILY_DVIPSVERSION= 1.5g TEXFAMILY_MENDEXVERSION=2.5 +.include "../../mk/x11.buildlink3.mk" + pre-extract: if [ ! -r ${WRKSRC} ]; then \ cd ../../print/teTeX1-bin && ${MAKE} patch; \ diff --git a/print/xpdf/Makefile b/print/xpdf/Makefile index 26e8598a258..48478c2c780 100644 --- a/print/xpdf/Makefile +++ b/print/xpdf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2005/04/11 21:47:09 tv Exp $ +# $NetBSD: Makefile,v 1.37 2005/06/01 18:03:20 jlam Exp $ DISTNAME= xpdf-3.00 PKGNAME= ${DISTNAME}pl3 @@ -22,7 +22,6 @@ DEPENDS+= ghostscript-fonts-[0-9]*:../../fonts/ghostscript-fonts CONFLICTS= xpdf-crypto-[0-9]* USE_PKGINSTALL= YES -USE_X11= YES USE_LANGUAGES= c c++ GNU_CONFIGURE= YES diff --git a/print/xpp/Makefile b/print/xpp/Makefile index 36aa5e7906b..9630e624c7d 100644 --- a/print/xpp/Makefile +++ b/print/xpp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2005/05/22 20:08:29 jlam Exp $ +# $NetBSD: Makefile,v 1.30 2005/06/01 18:03:20 jlam Exp $ DISTNAME= xpp-1.1 PKGREVISION= 5 @@ -9,7 +9,6 @@ MAINTAINER= jlam@NetBSD.org HOMEPAGE= http://cups.sourceforge.net/xpp/index.html COMMENT= X Printing Panel -USE_X11= yes USE_TOOLS+= gmake GNU_CONFIGURE= yes USE_LANGUAGES= c++ diff --git a/security/PAM/builtin.mk b/security/PAM/builtin.mk index ca7acf2e9d9..3b3c81f2e01 100644 --- a/security/PAM/builtin.mk +++ b/security/PAM/builtin.mk @@ -1,35 +1,57 @@ -# $NetBSD: builtin.mk,v 1.11 2005/01/14 07:54:20 jlam Exp $ +# $NetBSD: builtin.mk,v 1.12 2005/06/01 18:03:20 jlam Exp $ -.include "../../mk/bsd.prefs.mk" +BUILTIN_PKG:= linux-pam -_LINUX_PAM_APPL_HEADERS= /usr/include/pam/pam_appl.h \ - /usr/include/security/pam_appl.h -_LINUX_PAM_IDENT= The Linux-PAM Framework layer API +BUILTIN_FIND_FILES_VAR:= H_LINUX_PAM +BUILTIN_FIND_FILES.H_LINUX_PAM= /usr/include/security/pam_appl.h \ + /usr/include/pam/pam_appl.h +BUILTIN_FIND_GREP.H_LINUX_PAM= The Linux-PAM Framework layer API +.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.linux-pam) IS_BUILTIN.linux-pam= no -. for _inc_ in ${_LINUX_PAM_APPL_HEADERS} -. if !empty(IS_BUILTIN.linux-pam:M[nN][oO]) && exists(${_inc_}) -IS_BUILTIN.linux-pam!= \ - case ${_inc_} in \ - ${LOCALBASE}/*) \ - ${ECHO} "no"; \ - ;; \ - *) \ - if ${GREP} -q "${_LINUX_PAM_IDENT}" ${_inc_}; then \ - ${ECHO} "yes"; \ - else \ - ${ECHO} "no"; \ - fi; \ - ;; \ - esac -. endif -. endfor -BUILDLINK_VARS+= IS_BUILTIN.linux-pam -.endif # IS_BUILTIN.linux-pam +. if empty(H_LINUX_PAM:M${LOCALBASE}/*) && exists(${H_LINUX_PAM}) +IS_BUILTIN.linux-pam= yes +. endif +.endif +MAKEVARS+= IS_BUILTIN.linux-pam -USE_BUILTIN.linux-pam?= ${IS_BUILTIN.linux-pam} +### +### 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.linux-pam) +. if ${PREFER.linux-pam} == "pkgsrc" +USE_BUILTIN.linux-pam= no +. else +USE_BUILTIN.linux-pam= ${IS_BUILTIN.linux-pam} +. if defined(BUILTIN_PKG.linux-pam) && \ + !empty(IS_BUILTIN.linux-pam:M[yY][eE][sS]) +USE_BUILTIN.linux-pam= yes +. for _dep_ in ${BUILDLINK_DEPENDS.linux-pam} +. if !empty(USE_BUILTIN.linux-pam:M[yY][eE][sS]) +USE_BUILTIN.linux-pam!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.linux-pam:Q}; then \ + ${ECHO} yes; \ + else \ + ${ECHO} no; \ + fi +. endif +. endfor +. endif +. endif # PREFER.linux-pam +.endif +MAKEVARS+= USE_BUILTIN.linux-pam +### +### The section below only applies if we are not including this file +### solely to determine whether a built-in implementation exists. +### CHECK_BUILTIN.linux-pam?= no .if !empty(CHECK_BUILTIN.linux-pam:M[nN][oO]) @@ -41,10 +63,11 @@ BUILDLINK_TARGETS+= buildlink-pam-security .PHONY: buildlink-pam-security buildlink-pam-security: ${_PKG_SILENT}${_PKG_DEBUG} \ - if [ -d ${BUILDLINK_PREFIX.linux-pam}/include/pam ]; then \ - ${RM} -fr ${BUILDLINK_DIR}/include/security; \ - ${LN} -fs ${BUILDLINK_PREFIX.linux-pam}/include/pam \ - ${BUILDLINK_DIR}/include/security; \ + src=${BUILDLINK_PREFIX.linux-pam:Q}"/include/pam"; \ + dest=${BUILDLINK_DIR:Q}"/include/security"; \ + if ${TEST} -d "$$src"; then \ + ${RM} -fr "$$dest"; \ + ${LN} -fs "$$src" "$$dest"; \ fi . endif diff --git a/security/dsniff/Makefile b/security/dsniff/Makefile index 36f845f1112..9d60be39320 100644 --- a/security/dsniff/Makefile +++ b/security/dsniff/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/03/22 01:07:07 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2005/06/01 18:03:20 jlam Exp $ .include "Makefile.common" @@ -7,9 +7,10 @@ COMMENT= Password sniffer (webspy) DEPENDS+= dsniff-nox11-[0-9]*:../../security/dsniff-nox11 -USE_X11= yes BUILD_TARGET= libmissing.a webspy +.include "../../mk/x11.buildlink3.mk" + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/webspy ${PREFIX}/sbin ${INSTALL_MAN} ${WRKSRC}/webspy.8 ${PREFIX}/man/man8 diff --git a/security/heimdal/builtin.mk b/security/heimdal/builtin.mk index f8ff20aae46..c33504f7b0a 100644 --- a/security/heimdal/builtin.mk +++ b/security/heimdal/builtin.mk @@ -1,83 +1,100 @@ -# $NetBSD: builtin.mk,v 1.3 2004/09/14 15:10:09 jlam Exp $ +# $NetBSD: builtin.mk,v 1.4 2005/06/01 18:03:20 jlam Exp $ -_KRB5_KRB5_H= /usr/include/krb5/krb5.h +BUILTIN_PKG:= heimdal +BUILTIN_FIND_FILES_VAR:= H_HEIMDAL +BUILTIN_FIND_FILES.H_HEIMDAL= /usr/include/krb5/krb5.h +BUILTIN_FIND_GREP.H_HEIMDAL= heimdal_version + +.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.heimdal) IS_BUILTIN.heimdal= no -. if exists(${_KRB5_KRB5_H}) -IS_BUILTIN.heimdal!= \ - if ${GREP} -q heimdal_version ${_KRB5_KRB5_H}; then \ - ${ECHO} "yes"; \ - else \ - ${ECHO} "no"; \ - fi -. if !empty(IS_BUILTIN.heimdal:M[yY][eE][sS]) -# -# Create an appropriate name for the built-in package distributed -# with the system. This package name can be used to check against -# BUILDLINK_DEPENDS.<pkg> to see if we need to install the pkgsrc -# version or if the built-in one is sufficient. +. if empty(H_HEIMDAL:M${LOCALBASE}/*) && exists(${H_HEIMDAL}) +IS_BUILTIN.heimdal= yes +. endif +.endif +MAKEVARS+= IS_BUILTIN.heimdal + +### +### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to +### a package name to represent the built-in package. +### +.if !defined(BUILTIN_PKG.heimdal) && \ + !empty(IS_BUILTIN.heimdal:M[yY][eE][sS]) # # heimdal<=0.6 doesn't have a method of checking the headers to discover # the version number of the software. Match up heimdal versions with # OS versions for an approximate determination of the heimdal version. # -. if !defined(_HEIMDAL_VERSION) -_HEIMDAL_VERSIONS= 0.6 0.5 0.4e 0.3f 0.3e -_HEIMDAL_0.6.3= NetBSD-[2-9]*-* -_HEIMDAL_0.6.2= # empty -_HEIMDAL_0.6.1= NetBSD-1.6[U-Z]-* NetBSD-1.6Z*-* -_HEIMDAL_0.6= NetBSD-1.6[U-Z]-* NetBSD-1.6Z*-* NetBSD-[2-9]*-* -_HEIMDAL_0.5= NetBSD-1.6[I-T]-* -_HEIMDAL_0.4e= NetBSD-1.6[A-H]-* \ +_BLTN_HEIMDAL_VERSIONS= 0.6 0.5 0.4e 0.3f 0.3e +_BLTN_HEIMDAL_0.6.3= NetBSD-[2-9]*-* +_BLTN_HEIMDAL_0.6.2= # empty +_BLTN_HEIMDAL_0.6.1= NetBSD-1.6[U-Z]-* NetBSD-1.6Z*-* +_BLTN_HEIMDAL_0.6= NetBSD-1.6[U-Z]-* NetBSD-1.6Z*-* NetBSD-[2-9]*-* +_BLTN_HEIMDAL_0.5= NetBSD-1.6[I-T]-* +_BLTN_HEIMDAL_0.4e= NetBSD-1.6[A-H]-* \ NetBSD-1.6-* NetBSD-1.6_*-* NetBSD-1.6.*-* \ NetBSD-1.5[YZ]-* NetBSD-1.5Z*-* -_HEIMDAL_0.3f= NetBSD-1.5X-* -_HEIMDAL_0.3e= NetBSD-1.5[UVW]-* \ +_BLTN_HEIMDAL_0.3f= NetBSD-1.5X-* +_BLTN_HEIMDAL_0.3e= NetBSD-1.5[UVW]-* \ NetBSD-1.5.*-* -. for _heimdal_version_ in ${_HEIMDAL_VERSIONS} -. for _pattern_ in ${_HEIMDAL_${_heimdal_version_}} -. if !empty(MACHINE_PLATFORM:M${_pattern_}) -_HEIMDAL_VERSION?= ${_heimdal_version_} -. endif -. endfor -. endfor -_HEIMDAL_VERSION?= 0.2t +. for _heimdal_version_ in ${_BLTN_HEIMDAL_VERSIONS} +. for _pattern_ in ${_BLTN_HEIMDAL_${_heimdal_version_}} +. if !empty(MACHINE_PLATFORM:M${_pattern_}) +BUILTIN_VERSION.heimdal?= ${_heimdal_version_} . endif -BUILTIN_PKG.heimdal= heimdal-${_HEIMDAL_VERSION} -MAKEFLAGS+= BUILTIN_PKG.heimdal=${BUILTIN_PKG.heimdal} -. endif -. endif -MAKEFLAGS+= IS_BUILTIN.heimdal=${IS_BUILTIN.heimdal} +. endfor +. endfor +BUILTIN_VERSION.heimdal?= 0.2t +BUILTIN_PKG.heimdal= heimdal-${BUILTIN_VERSION.heimdal} .endif +MAKEVARS+= BUILTIN_PKG.heimdal +### +### 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.heimdal) -USE_BUILTIN.heimdal?= ${IS_BUILTIN.heimdal} - -. if defined(BUILTIN_PKG.heimdal) +. if ${PREFER.heimdal} == "pkgsrc" +USE_BUILTIN.heimdal= ${IS_BUILTIN.heimdal} +. else +USE_BUILTIN.heimdal= ${IS_BUILTIN.heimdal} +. if defined(BUILTIN_PKG.heimdal) && \ + !empty(IS_BUILTIN.heimdal:M[yY][eE][sS]) USE_BUILTIN.heimdal= yes -. for _depend_ in ${BUILDLINK_DEPENDS.heimdal} -. if !empty(USE_BUILTIN.heimdal:M[yY][eE][sS]) -USE_BUILTIN.heimdal!= \ - if ${PKG_ADMIN} pmatch '${_depend_}' ${BUILTIN_PKG.heimdal}; then \ - ${ECHO} "yes"; \ +. for _dep_ in ${BUILDLINK_DEPENDS.heimdal} +. if !empty(USE_BUILTIN.heimdal:M[yY][eE][sS]) +USE_BUILTIN.heimdal!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.heimdal:Q}; then \ + ${ECHO} yes; \ else \ - ${ECHO} "no"; \ + ${ECHO} no; \ fi -. endif -. endfor -. endif -.endif # USE_BUILTIN.heimdal +. endif +. endfor +. endif +. endif # PREFER.heimdal +.endif +MAKEVARS+= USE_BUILTIN.heimdal +### +### The section below only applies if we are not including this file +### solely to determine whether a built-in implementation exists. +### CHECK_BUILTIN.heimdal?= no .if !empty(CHECK_BUILTIN.heimdal:M[nN][oO]) -.if !empty(USE_BUILTIN.heimdal:M[nN][oO]) +. if !empty(USE_BUILTIN.heimdal:M[nN][oO]) BUILDLINK_DEPENDS.heimdal+= heimdal>=0.6 KRB5_CONFIG?= ${BUILDLINK_PREFIX.heimdal}/bin/krb5-config -CONFIGURE_ENV+= KRB5_CONFIG="${KRB5_CONFIG}" -MAKE_ENV+= KRB5_CONFIG="${KRB5_CONFIG}" -.endif +CONFIGURE_ENV+= KRB5_CONFIG=${KRB5_CONFIG:Q} +MAKE_ENV+= KRB5_CONFIG=${KRB5_CONFIG:Q} +. endif .endif # CHECK_BUILTIN.heimdal diff --git a/security/kth-krb4/Makefile b/security/kth-krb4/Makefile index 9a0308b8d73..982cb010861 100644 --- a/security/kth-krb4/Makefile +++ b/security/kth-krb4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2005/04/11 21:47:12 tv Exp $ +# $NetBSD: Makefile,v 1.38 2005/06/01 18:03:21 jlam Exp $ # DISTNAME= krb4-1.2.1 @@ -16,7 +16,6 @@ CONFLICTS+= libdes-[0-9]* CRYPTO= yes -USE_X11= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --includedir=${PREFIX}/include/kerberosIV @@ -65,4 +64,5 @@ post-install: ${INSTALL_DATA} ${FILESDIR}/services-1.5.diff ${EXAMPLEDIR} .include "../../security/openssl/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/libdes/builtin.mk b/security/libdes/builtin.mk index d864ba4b1f0..710e3277265 100644 --- a/security/libdes/builtin.mk +++ b/security/libdes/builtin.mk @@ -1,28 +1,72 @@ -# $NetBSD: builtin.mk,v 1.3 2004/12/11 00:32:16 jlam Exp $ +# $NetBSD: builtin.mk,v 1.4 2005/06/01 18:03:21 jlam Exp $ +BUILTIN_PKG:= libdes + +BUILTIN_FIND_FILES_VAR:= H_LIBDES +BUILTIN_FIND_FILES.H_LIBDES= /usr/include/libdes.h /usr/include/des.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.libdes) -IS_BUILTIN.libdes= no -. if exists(/usr/include/libdes.h) || exists(/usr/include/des.h) -IS_BUILTIN.libdes= yes +IS_BUILTIN.libdes= no +. if empty(H_LIBDES:M${LOCALBASE}/*) && exists(${H_LIBDES}) +IS_BUILTIN.libdes= yes . endif -.endif # IS_BUILTIN.libdes +.endif +MAKEVARS+= IS_BUILTIN.libdes -USE_BUILTIN.libdes?= ${IS_BUILTIN.libdes} +### +### 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.libdes) +. if ${PREFER.libdes} == "pkgsrc" +USE_BUILTIN.libdes= no +. else +USE_BUILTIN.libdes= ${IS_BUILTIN.libdes} +. if defined(BUILTIN_PKG.libdes) && \ + !empty(IS_BUILTIN.libdes:M[yY][eE][sS]) +USE_BUILTIN.libdes= yes +. for _dep_ in ${BUILDLINK_DEPENDS.libdes} +. if !empty(USE_BUILTIN.libdes:M[yY][eE][sS]) +USE_BUILTIN.libdes!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.libdes:Q}; then \ + ${ECHO} yes; \ + else \ + ${ECHO} no; \ + fi +. endif +. endfor +. endif +. endif # PREFER.libdes +.endif +MAKEVARS+= USE_BUILTIN.libdes +### +### The section below only applies if we are not including this file +### solely to determine whether a built-in implementation exists. +### CHECK_BUILTIN.libdes?= no .if !empty(CHECK_BUILTIN.libdes:M[nN][oO]) + . if !empty(USE_BUILTIN.libdes:M[yY][eE][sS]) BUILDLINK_TARGETS+= buildlink-libdes-libdes-h -. if !target(buildlink-libdes-libdes-h) +. endif + +. if !target(buildlink-libdes-libdes-h) .PHONY: buildlink-libdes-libdes-h buildlink-libdes-libdes-h: ${_PKG_SILENT}${_PKG_DEBUG} \ - dest="${BUILDLINK_DIR}/include/libdes.h"; \ src="/usr/include/des.h"; \ + dest=${BUILDLINK_DIR:Q}"/include/libdes.h"; \ if ${TEST} ! -f "$$dest" -a -f "$$src"; then \ - ${MKDIR} -p `${DIRNAME} $$dest`; \ - ${LN} -fs $$src $$dest; \ + ${MKDIR} -p `${DIRNAME} "$$dest"`; \ + ${LN} -fs "$$src" "$$dest"; \ fi -. endif -. endif # USE_BUILTIN.libdes == yes +. endif + .endif # CHECK_BUILTIN.libdes diff --git a/security/nessus-core/Makefile b/security/nessus-core/Makefile index b886e5a3250..d5f46839d16 100644 --- a/security/nessus-core/Makefile +++ b/security/nessus-core/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/04/11 21:47:14 tv Exp $ +# $NetBSD: Makefile,v 1.21 2005/06/01 18:03:21 jlam Exp $ .include "../nessus/Makefile.common" @@ -8,7 +8,6 @@ COMMENT= Core module of the Nessus Network Security Scanner WRKSRC= ${WRKDIR}/nessus-core USE_PKGINSTALL= yes -USE_X11= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-gtk --with-x --localstatedir=${VARBASE} CONFIGURE_ENV+= ac_cv_path_GTKCONFIG="pkg-config gtk+-2.0" \ diff --git a/security/nessus/Makefile b/security/nessus/Makefile index f7878cc4523..abca4e156f7 100644 --- a/security/nessus/Makefile +++ b/security/nessus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/04/04 09:31:46 adam Exp $ +# $NetBSD: Makefile,v 1.25 2005/06/01 18:03:21 jlam Exp $ .include "../nessus/Makefile.common" @@ -11,7 +11,6 @@ COMMENT= The Nessus Network Security Scanner DEPENDS+= nessus-core-${VERS}:../nessus-core DEPENDS+= nessus-plugins-${VERS}:../nessus-plugins -USE_X11= yes EXTRACT_ONLY= # empty NO_CHECKSUM= yes NO_CONFIGURE= yes diff --git a/security/openpam/builtin.mk b/security/openpam/builtin.mk index 004a00eb720..a1a64a6d582 100644 --- a/security/openpam/builtin.mk +++ b/security/openpam/builtin.mk @@ -1,40 +1,61 @@ -# $NetBSD: builtin.mk,v 1.2 2005/01/14 07:47:29 jlam Exp $ +# $NetBSD: builtin.mk,v 1.3 2005/06/01 18:03:21 jlam Exp $ -_SECURITY_OPENPAM_VERSION_H= /usr/include/security/openpam_version.h +BUILTIN_PKG:= openpam +BUILTIN_FIND_FILES_VAR:= H_OPENPAM +BUILTIN_FIND_FILES.H_OPENPAM= /usr/include/security/openpam_version.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.openpam) IS_BUILTIN.openpam= no -. if empty(_SECURITY_OPENPAM_VERSION_H:M${LOCALBASE}/*) && \ - exists(${_SECURITY_OPENPAM_VERSION_H}) +. if empty(H_OPENPAM:M${LOCALBASE}/*) && exists(${H_OPENPAM}) IS_BUILTIN.openpam= yes -# -# Create an appropriate package name for the built-in software -# distributed with the system. This package name can be used to check -# against BUILDLINK_DEPENDS.<pkg> to see if we need to install the -# pkgsrc version or if the built-in one is sufficient. -# -_OPENPAM_VERSION!= ${AWK} '/\#define[ ]*_OPENPAM_VERSION[ ]/ {print $$3; }' ${_SECURITY_OPENPAM_VERSION_H} -BUILTIN_PKG.openpam= openpam-${_OPENPAM_VERSION} -BUILDLINK_VARS+= BUILTIN_PKG.openpam . endif -BUILDLINK_VARS+= IS_BUILTIN.openpam -.endif # IS_BUILTIN.openpam +.endif +MAKEVARS+= IS_BUILTIN.openpam -.if !defined(USE_BUILTIN.openpam) -USE_BUILTIN.openpam?= ${IS_BUILTIN.openpam} +### +### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to +### a package name to represent the built-in package. +### +.if !defined(BUILTIN_PKG.openpam) && \ + !empty(IS_BUILTIN.openpam:M[yY][eE][sS]) && \ + exists(${H_OPENPAM}) +BUILTIN_VERSION.openpam!= \ + ${AWK} '/\#define[ ]*_OPENPAM_VERSION[ ]/ {print $$3; }' \ + ${H_OPENPAM} +BUILTIN_PKG.openpam= openpam-${BUILTIN_VERSION.openpam} +.endif +MAKEVARS+= BUILTIN_PKG.openpam -. if defined(BUILTIN_PKG.openpam) +### +### 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.openpam) +. if ${PREFER.openpam} == "pkgsrc" +USE_BUILTIN.openpam= ${IS_BUILTIN.openpam} +. else +USE_BUILTIN.openpam= ${IS_BUILTIN.openpam} +. if defined(BUILTIN_PKG.openpam) && \ + !empty(IS_BUILTIN.openpam:M[yY][eE][sS]) USE_BUILTIN.openpam= yes -. for _depend_ in ${BUILDLINK_DEPENDS.openpam} -. if !empty(USE_BUILTIN.openpam:M[yY][eE][sS]) -USE_BUILTIN.openpam!= \ - if ${PKG_ADMIN} pmatch '${_depend_}' ${BUILTIN_PKG.openpam}; then \ - ${ECHO} "yes"; \ +. for _dep_ in ${BUILDLINK_DEPENDS.openpam} +. if !empty(USE_BUILTIN.openpam:M[yY][eE][sS]) +USE_BUILTIN.openpam!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.openpam:Q}; then \ + ${ECHO} yes; \ else \ - ${ECHO} "no"; \ + ${ECHO} no; \ fi -. endif -. endfor -. endif -BUILDLINK_VARS+= USE_BUILTIN.openpam -.endif # USE_BUILTIN.openpam +. endif +. endfor +. endif +. endif # PREFER.openpam +.endif +MAKEVARS+= USE_BUILTIN.openpam diff --git a/security/openssl/builtin.mk b/security/openssl/builtin.mk index 6d8fe6e0609..35a9f1ef9c4 100644 --- a/security/openssl/builtin.mk +++ b/security/openssl/builtin.mk @@ -1,172 +1,145 @@ -# $NetBSD: builtin.mk,v 1.12 2005/03/23 09:06:38 jlam Exp $ +# $NetBSD: builtin.mk,v 1.13 2005/06/01 18:03:21 jlam Exp $ -_OPENSSL_PKGSRC_PKGNAME= openssl-0.9.7f -_OPENSSL_OPENSSLV_H= /usr/include/openssl/opensslv.h +BUILTIN_PKG:= openssl -.for _lib_ in des -. if !defined(_BLNK_LIB_FOUND.${_lib_}) -_BLNK_LIB_FOUND.${_lib_}!= \ - if ${TEST} "`${ECHO} /usr/lib/lib${_lib_}.*`" != "/usr/lib/lib${_lib_}.*"; then \ - ${ECHO} "yes"; \ - elif ${TEST} "`${ECHO} /lib/lib${_lib_}.*`" != "/lib/lib${_lib_}.*"; then \ - ${ECHO} "yes"; \ - else \ - ${ECHO} "no"; \ - fi -BUILDLINK_VARS+= _BLNK_LIB_FOUND.${_lib_} -. endif -.endfor -.undef _lib_ +BUILTIN_FIND_LIBS:= des +BUILTIN_FIND_FILES_VAR:= H_OPENSSL +BUILTIN_FIND_FILES.H_OPENSSL= /usr/include/openssl/opensslv.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.openssl) IS_BUILTIN.openssl= no -. if exists(${_OPENSSL_OPENSSLV_H}) +. if empty(H_OPENSSL:M${LOCALBASE}/*) && exists(${H_OPENSSL}) IS_BUILTIN.openssl= yes -# -# Create an appropriate name for the built-in package distributed -# with the system. This package name can be used to check against -# BUILDLINK_DEPENDS.<pkg> to see if we need to install the pkgsrc -# version or if the built-in one is sufficient. -# -_OPENSSL_MAJOR!= \ - ${AWK} 'BEGIN { hex="0123456789abcdef" } \ - /\#define[ ]*OPENSSL_VERSION_NUMBER/ { \ - i = index(hex, substr($$3, 3, 1)) - 1; \ - print i; \ - exit 0; \ +. endif +.endif +MAKEVARS+= IS_BUILTIN.openssl + +### +### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to +### a package name to represent the built-in package. +### +.if !defined(BUILTIN_PKG.openssl) && \ + !empty(IS_BUILTIN.openssl:M[yY][eE][sS]) && \ + exists (${H_OPENSSL}) +BUILTIN_VERSION.openssl!= \ + ${AWK} 'BEGIN { hex="0123456789abcdef"; \ + split("abcdefghijklmnopqrstuvwxyz", alpha, ""); \ } \ - ' ${_OPENSSL_OPENSSLV_H} -_OPENSSL_MINOR!= \ - ${AWK} 'BEGIN { hex="0123456789abcdef" } \ /\#define[ ]*OPENSSL_VERSION_NUMBER/ { \ + major = index(hex, substr($$3, 3, 1)) - 1; \ i = 16 * (index(hex, substr($$3, 4, 1)) - 1); \ i += index(hex, substr($$3, 5, 1)) - 1; \ - print i; \ - exit 0; \ - } \ - ' ${_OPENSSL_OPENSSLV_H} -_OPENSSL_TEENY!= \ - ${AWK} 'BEGIN { hex="0123456789abcdef" } \ - /\#define[ ]*OPENSSL_VERSION_NUMBER/ { \ + minor = "."i; \ i = 16 * (index(hex, substr($$3, 6, 1)) - 1); \ i += index(hex, substr($$3, 7, 1)) - 1; \ - print i; \ - exit 0; \ - } \ - ' ${_OPENSSL_OPENSSLV_H} -_OPENSSL_PATCHLEVEL!= \ - ${AWK} 'BEGIN { hex="0123456789abcdef"; \ - split("abcdefghijklmnopqrstuvwxyz", alpha, ""); \ - } \ - /\#define[ ]*OPENSSL_VERSION_NUMBER/ { \ + teeny = "."i; \ i = 16 * (index(hex, substr($$3, 8, 1)) - 1); \ i += index(hex, substr($$3, 9, 1)) - 1; \ if (i == 0) { \ - print ""; \ + patchlevel = ""; \ } else if (i > 26) { \ - print "a"; \ + patchlevel = "a"; \ } else { \ - print alpha[i]; \ + patchlevel = alpha[i]; \ } \ + printf "%s%s%s%s\n", \ + major, minor, teeny, patchlevel; \ exit 0; \ } \ - ' ${_OPENSSL_OPENSSLV_H} -_OPENSSL_VERSION= ${_OPENSSL_MAJOR}.${_OPENSSL_MINOR}.${_OPENSSL_TEENY}${_OPENSSL_PATCHLEVEL} -BUILTIN_PKG.openssl= openssl-${_OPENSSL_VERSION} -. if !empty(_OPENSSL_VERSION:M0\.9\.6g) + ' ${H_OPENSSL} + +. if !empty(BUILTIN_VERSION.openssl:M0\.9\.6g) && \ + exists(${H_OPENSSL}) # # If the native OpenSSL contains the security fixes pulled up to the # netbsd-1-6 branch on 2003-11-07, then pretend it's openssl-0.9.6l. # -_OPENSSL_HAS_20031107_FIX!= \ +BUILTIN_OPENSSL_HAS_20031107_FIX!= \ ${AWK} 'BEGIN { ans = "no" } \ /OPENSSL_HAS_20031107_FIX/ { ans = "yes" } \ END { print ans; exit 0 } \ - ' ${_OPENSSL_OPENSSLV_H} -. if !empty(_OPENSSL_HAS_20031107_FIX:M[yY][eE][sS]) -BUILTIN_PKG.openssl= openssl-0.9.6l -. endif + ' ${H_OPENSSL} +. if !empty(BUILTIN_OPENSSL_HAS_20031107_FIX:M[yY][eE][sS]) +BUILTIN_VERSION.openssl= 0.9.6l +. endif # # If the native OpenSSL contains the security fixes pulled up to the # netbsd-1-6 branch on 2004-04-01, then pretend it's openssl-0.9.6m. # -_OPENSSL_HAS_20040401_FIX!= \ +BUILTIN_OPENSSL_HAS_20040401_FIX!= \ ${AWK} 'BEGIN { ans = "no" } \ /OPENSSL_HAS_20040401_FIX/ { ans = "yes" } \ END { print ans; exit 0 } \ - ' ${_OPENSSL_OPENSSLV_H} -. if !empty(_OPENSSL_HAS_20040401_FIX:M[yY][eE][sS]) -BUILTIN_PKG.openssl= openssl-0.9.6m -. endif + ' ${H_OPENSSL} +. if !empty(BUILTIN_OPENSSL_HAS_20040401_FIX:M[yY][eE][sS]) +BUILTIN_VERSION.openssl= -0.9.6m . endif -BUILDLINK_VARS+= BUILTIN_PKG.openssl . endif -BUILDLINK_VARS+= IS_BUILTIN.openssl -.endif # IS_BUILTIN.openssl +BUILTIN_PKG.openssl= openssl-${BUILTIN_VERSION.openssl} +.endif +MAKEVARS+= BUILTIN_PKG.openssl +### +### 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.openssl) -USE_BUILTIN.openssl?= ${IS_BUILTIN.openssl} - -. if defined(BUILTIN_PKG.openssl) +. if ${PREFER.openssl} == "pkgsrc" +USE_BUILTIN.openssl= ${IS_BUILTIN.openssl} +. else +USE_BUILTIN.openssl= ${IS_BUILTIN.openssl} +. if defined(BUILTIN_PKG.openssl) && \ + !empty(IS_BUILTIN.openssl:M[yY][eE][sS]) USE_BUILTIN.openssl= yes -. for _depend_ in ${BUILDLINK_DEPENDS.openssl} -. if !empty(USE_BUILTIN.openssl:M[yY][eE][sS]) -USE_BUILTIN.openssl!= \ - if ${PKG_ADMIN} pmatch '${_depend_}' ${BUILTIN_PKG.openssl}; then \ - ${ECHO} "yes"; \ - else \ - ${ECHO} "no"; \ - fi -. endif -. endfor -. endif -.endif # USE_BUILTIN.openssl - -CHECK_BUILTIN.openssl?= no -.if !empty(CHECK_BUILTIN.openssl:M[nN][oO]) - -.if !defined(_NEED_NEWER_OPENSSL) -_NEED_NEWER_OPENSSL?= no -. for _depend_ in ${BUILDLINK_DEPENDS.openssl} -. if !empty(_NEED_NEWER_OPENSSL:M[nN][oO]) -_NEED_NEWER_OPENSSL!= \ - if ${PKG_ADMIN} pmatch '${_depend_}' ${_OPENSSL_PKGSRC_PKGNAME}; then \ - ${ECHO} "no"; \ +. for _dep_ in ${BUILDLINK_DEPENDS.openssl} +. if !empty(USE_BUILTIN.openssl:M[yY][eE][sS]) +USE_BUILTIN.openssl!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.openssl:Q}; then \ + ${ECHO} yes; \ else \ - ${ECHO} "yes"; \ + ${ECHO} no; \ fi +. endif +. endfor . endif -. endfor -BUILDLINK_VARS+= _NEED_NEWER_OPENSSL +. endif # PREFER.openssl .endif +MAKEVARS+= USE_BUILTIN.openssl -.if !empty(USE_BUILTIN.openssl:M[nN][oO]) && \ - !empty(_NEED_NEWER_OPENSSL:M[yY][eE][sS]) -PKG_SKIP_REASON= \ - "Unable to satisfy dependency: ${BUILDLINK_DEPENDS.openssl}" -.endif +### +### The section below only applies if we are not including this file +### solely to determine whether a built-in implementation exists. +### +CHECK_BUILTIN.openssl?= no +.if !empty(CHECK_BUILTIN.openssl:M[nN][oO]) -.if !empty(USE_BUILTIN.openssl:M[yY][eE][sS]) +. if !empty(USE_BUILTIN.openssl:M[yY][eE][sS]) BUILDLINK_PREFIX.openssl= /usr -.endif +. endif # By default, we don't bother with the old DES API. USE_OLD_DES_API?= no -.if !empty(USE_OLD_DES_API:M[yY][eE][sS]) +. if !empty(USE_OLD_DES_API:M[yY][eE][sS]) # # If we're using the old DES API, then check to see if the old DES # code was factored out into a separate library and header files and # no longer a part of libcrypto. # -. if !empty(USE_BUILTIN.openssl:M[yY][eE][sS]) -. if exists(${BUILDLINK_PREFIX.openssl}/include/des.h) && \ - !empty(_BLNK_LIB_FOUND.des:M[yY][eE][sS]) +. if !empty(USE_BUILTIN.openssl:M[yY][eE][sS]) +. if exists(${BUILDLINK_PREFIX.openssl}/include/des.h) && \ + !empty(BUILTIN_LIB_FOUND.des:M[yY][eE][sS]) BUILDLINK_TRANSFORM+= l:crypto:des:crypto WRAPPER_REORDER_CMDS+= reorder:l:des:crypto +. endif . endif -. endif -# The idea is to prevent needing to patch source files for packages that +# The idea is to avoid the need to patch source files for packages that # use OpenSSL for DES support by ensuring that including <openssl/des.h> # will always present the old DES API. # @@ -182,7 +155,7 @@ WRAPPER_REORDER_CMDS+= reorder:l:des:crypto # system one and <des.h>. # BUILDLINK_TARGETS+= buildlink-openssl-des-h -. if !target(buildlink-openssl-des-h) +. if !target(buildlink-openssl-des-h) .PHONY: buildlink-openssl-des-h buildlink-openssl-des-h: ${_PKG_SILENT}${_PKG_DEBUG} \ @@ -209,22 +182,22 @@ buildlink-openssl-des-h: ${ECHO} "Unable to find headers for old DES API."; \ exit 1; \ fi -. endif -.endif # USE_OLD_DES_API == yes +. endif +. endif # USE_OLD_DES_API == yes -.if defined(PKG_SYSCONFDIR.openssl) +. if defined(PKG_SYSCONFDIR.openssl) SSLCERTS= ${PKG_SYSCONFDIR.openssl}/certs SSLKEYS= ${PKG_SYSCONFDIR.openssl}/private -.elif ${OPSYS} == "NetBSD" +. elif ${OPSYS} == "NetBSD" SSLCERTS= /etc/openssl/certs SSLKEYS= /etc/openssl/private -.elif !empty(USE_BUILTIN.openssl:M[yY][eE][sS]) +. elif !empty(USE_BUILTIN.openssl:M[yY][eE][sS]) SSLCERTS= /etc/ssl/certs # likely place where certs live SSLKEYS= /etc/ssl/private # likely place where private keys live -.else +. else SSLCERTS= ${PKG_SYSCONFBASEDIR}/openssl/certs SSLKEYS= ${PKG_SYSCONFBASEDIR}/openssl/private -.endif +. endif BUILD_DEFS+= SSLCERTS SSLKEYS .endif # CHECK_BUILTIN.openssl diff --git a/security/pflkm/builtin.mk b/security/pflkm/builtin.mk index 755b860181c..b31464f1b7b 100644 --- a/security/pflkm/builtin.mk +++ b/security/pflkm/builtin.mk @@ -1,29 +1,87 @@ -# $NetBSD: builtin.mk,v 1.3 2005/05/11 22:01:28 peter Exp $ +# $NetBSD: builtin.mk,v 1.4 2005/06/01 18:03:21 jlam Exp $ -_PF_VERSION= 3.7 # pkg default -_PF_PFVAR_H= /usr/include/net/pfvar.h +BUILTIN_PKG:= pflkm -.if !defined(IS_BUILTIN.pflkm) -IS_BUILTIN.pflkm= no -. if exists(${_PF_PFVAR_H}) -IS_BUILTIN.pflkm= yes +BUILTIN_FIND_FILES_VAR:= H_PFLKM +BUILTIN_FIND_FILES.H_PFLKM= /usr/include/net/pfvar.h +.include "../../mk/buildlink3/bsd.builtin.mk" + +# Compute the version number of the PF API by checking for the presence +# of symbols added in newer versions and store the result in ${PF_VERSION}. +# +.if !defined(PF_VERSION) +PF_VERSION= 3.7 # package default +. if exists(${H_PFLKM}) # OpenBSD 3.7: pf_threshold added -_PF_3_7!= ${GREP} -c pf_threshold ${_PF_PFVAR_H} || ${TRUE} +_BLTN_PF_3_7!= ${GREP} -c pf_threshold ${H_PFLKM} || ${TRUE} # OpenBSD 3.6: pf_cksum_fixup added -_PF_3_6!= ${GREP} -c pf_cksum_fixup ${_PF_PFVAR_H} || ${TRUE} - -.if ${_PF_3_7} == "1" -BUILTIN_PKG.pflkm= 3.7 -.elif ${_PF_3_6} == "1" -BUILTIN_PKG.pflkm= 3.6 -.else -BUILTIN_PKG.pflkm= 3.5 +_BLTN_PF_3_6!= ${GREP} -c pf_cksum_fixup ${H_PFLKM} || ${TRUE} + +. if ${_BLTN_PF_3_7} == "1" +PF_VERSION= 3.7 +. elif ${_BLTN_PF_3_6} == "1" +PF_VERSION= 3.6 +. else +PF_VERSION= 3.5 +. endif +. endif .endif +MAKEVARS+= PF_VERSION -_PF_VERSION= ${BUILTIN_PKG.pflkm} +### +### Determine if there is a built-in implementation of the package and +### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). +### +.if !defined(IS_BUILTIN.pflkm) +IS_BUILTIN.pflkm= no +. if empty(H_PFLKM:M${LOCALBASE}/*) && exists(${H_PFLKM}) +IS_BUILTIN.pflkm= yes +. endif +.endif +MAKEVARS+= IS_BUILTIN.pflkm -. endif # exists(${_PF_PFVAR_H}) -.endif # IS_BUILTIN.pflkm +### +### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to +### a package name to represent the built-in package. +### +.if !defined(BUILTIN_PKG.pflkm) && \ + !empty(IS_BUILTIN.pflkm:M[yY][eE][sS]) +. if ${PF_VERSION} == "3.7" +BUILTIN_PKG.pflkm= 20050519 # release date for PF API 3.7 +. elif ${PF_VERSION} == "3.6" +BUILTIN_PKG.pflkm= 20041101 # release date for PF API 3.6 +. elif ${PF_VERSION} == "3.5" +BUILTIN_PKG.pflkm= 20040501 # release date for PF API 3.5 +. else +BUILTIN_PKG.pflkm= 20040501 # release date for PF API 3.5 +. endif +.endif +MAKEVARS+= BUILTIN_PKG.pflkm -USE_BUILTIN.pflkm?= ${IS_BUILTIN.pflkm} +### +### 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.pflkm) +. if ${PREFER.pflkm} == "pkgsrc" +USE_BUILTIN.pflkm= no +. else +USE_BUILTIN.pflkm= ${IS_BUILTIN.pflkm} +. if defined(BUILTIN_PKG.pflkm) && \ + !empty(IS_BUILTIN.pflkm:M[yY][eE][sS]) +USE_BUILTIN.pflkm= yes +. for _dep_ in ${BUILDLINK_DEPENDS.pflkm} +. if !empty(USE_BUILTIN.pflkm:M[yY][eE][sS]) +USE_BUILTIN.pflkm!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.pflkm:Q}; then \ + ${ECHO} yes; \ + else \ + ${ECHO} no; \ + fi +. endif +. endfor +. endif +. endif # PREFER.pflkm +.endif +MAKEVARS+= USE_BUILTIN.pflkm diff --git a/security/putty/Makefile b/security/putty/Makefile index 2e8583d6bb9..66529df4bad 100644 --- a/security/putty/Makefile +++ b/security/putty/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:30 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:21 jlam Exp $ # DISTNAME= putty-0.58 @@ -10,7 +10,6 @@ HOMEPAGE= http://www.chiark.greenend.org.uk/~sgtatham/putty/ COMMENT= Free implementation of Telnet and SSH for Win32 and Unix platforms USE_TOOLS+= gmake -USE_X11= yes BUILD_DIRS= ${WRKSRC}/unix MAKEFILE= Makefile.gtk diff --git a/security/qca-tls/Makefile b/security/qca-tls/Makefile index 7041f8f915b..45280ecf711 100644 --- a/security/qca-tls/Makefile +++ b/security/qca-tls/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:31 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:21 jlam Exp $ DISTNAME= qca-tls-1.0 PKGREVISION= # empty @@ -12,7 +12,6 @@ COMMENT= Cross-platform crypto API for QT - TLS plugin USE_TOOLS+= gmake USE_LIBTOOL= yes -USE_X11= yes HAS_CONFIGURE= yes CONFIGURE_ARGS+= --with-openssl-inc=${SSLBASE}/include diff --git a/security/qca/Makefile b/security/qca/Makefile index d2325185e12..a0f275a3e72 100644 --- a/security/qca/Makefile +++ b/security/qca/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:31 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2005/06/01 18:03:21 jlam Exp $ DISTNAME= qca-1.0 PKGREVISION= # empty @@ -12,7 +12,6 @@ COMMENT= Cross-platform crypto API for QT USE_TOOLS+= gmake USE_LIBTOOL= yes -USE_X11= yes HAS_CONFIGURE= yes do-install: diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile index 3caed767863..9351ed34d31 100644 --- a/security/seahorse/Makefile +++ b/security/seahorse/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2005/05/22 20:08:31 jlam Exp $ +# $NetBSD: Makefile,v 1.38 2005/06/01 18:03:21 jlam Exp $ DISTNAME= seahorse-0.7.8 CATEGORIES= security @@ -17,7 +17,6 @@ USE_DIRS+= gnome2-1.5 USE_TOOLS+= gmake USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes -USE_X11= yes CONFIGURE_ARGS= --disable-gedit diff --git a/security/skey/builtin.mk b/security/skey/builtin.mk index 521879bccc9..0430d5cf856 100644 --- a/security/skey/builtin.mk +++ b/security/skey/builtin.mk @@ -1,54 +1,61 @@ -# $NetBSD: builtin.mk,v 1.1 2004/04/28 03:35:58 jlam Exp $ +# $NetBSD: builtin.mk,v 1.2 2005/06/01 18:03:21 jlam Exp $ -_SKEY_H= /usr/include/skey.h +BUILTIN_PKG:= skey +BUILTIN_FIND_FILES_VAR:= H_SKEY +BUILTIN_FIND_FILES.H_SKEY= /usr/include/skey.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.skey) IS_BUILTIN.skey= no -. if exists(${_SKEY_H}) +. if empty(H_SKEY:M${LOCALBASE}/*) && exists(${H_SKEY}) IS_BUILTIN.skey= yes +. endif +.endif +MAKEVARS+= IS_BUILTIN.skey + +### +### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to +### a package name to represent the built-in package. +### +.if !defined(BUILTIN_PKG.skey) && \ + !empty(IS_BUILTIN.skey:M[yY][eE][sS) && \ + exists(${H_SKEY}) # XXX # XXX Consider the native skey to be skey-1.1.5. # XXX BUILTIN_PKG.skey= skey-1.1.5 -BUILDLINK_VARS+= BUILTIN_PKG.skey -. endif -BUILDLINK_VARS+= IS_BUILTIN.skey -.endif # IS_BUILTIN.skey +.endif +MAKEVARS+= BUILTIN_PKG.skey +### +### 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.skey) -USE_BUILTIN.skey?= ${IS_BUILTIN.skey} -PREFER.skey?= pkgsrc - -. if defined(BUILTIN_PKG.skey) +. if ${PREFER.skey} == "pkgsrc" +USE_BUILTIN.skey= no +. else +USE_BUILTIN.skey= ${IS_BUILTIN.skey} +. if defined(BUILTIN_PKG.skey) && \ + !empty(IS_BUILTIN.skey:M[yY][eE][sS]) USE_BUILTIN.skey= yes -. for _depend_ in ${BUILDLINK_DEPENDS.skey} -. if !empty(USE_BUILTIN.skey:M[yY][eE][sS]) -USE_BUILTIN.skey!= \ - if ${PKG_ADMIN} pmatch '${_depend_}' ${BUILTIN_PKG.skey}; then \ - ${ECHO} "yes"; \ +. for _dep_ in ${BUILDLINK_DEPENDS.skey} +. if !empty(USE_BUILTIN.skey:M[yY][eE][sS]) +USE_BUILTIN.skey!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.skey:Q}; then \ + ${ECHO} yes; \ else \ - ${ECHO} "no"; \ + ${ECHO} no; \ fi -. endif -. endfor -. endif - -. if ${PREFER.skey} == "native" -. if (${OPSYS} == "NetBSD") && exists(${_SKEY_H}) -USE_BUILTIN.skey= yes -_INCOMPAT_SKEY?= # should be set from defs.${OPSYS}.mk -. for _pattern_ in ${_INCOMPAT_SKEY} ${INCOMPAT_SKEY} -. if !empty(MACHINE_PLATFORM:M${_pattern_}) -USE_BUILTIN.skey= no . endif . endfor . endif -. endif - -. if defined(USE_SKEY) -. if !empty(IS_BUILTIN.skey:M[nN][oO]) && \ - (${PREFER.skey} == "pkgsrc") -USE_BUILTIN.skey= no -. endif -. endif -.endif # USE_BUILTIN.skey +. endif # PREFER.skey +.endif +MAKEVARS+= USE_BUILTIN.skey diff --git a/security/ssh2/Makefile b/security/ssh2/Makefile index bbe9f3aeae2..5915610855a 100644 --- a/security/ssh2/Makefile +++ b/security/ssh2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2004/12/28 02:47:49 reed Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 18:03:21 jlam Exp $ # PKGNAME= ${DISTNAME:C/ssh-/ssh2-/} @@ -7,8 +7,8 @@ PKGREVISION= 3 CONFLICTS= ssh2-nox11-[0-9]* -USE_X11= YES CONFIGURE_ARGS+= --with-x # be explicit +.include "../../mk/x11.buildlink3.mk" .include "../../security/ssh2/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/security/ssh2/Makefile.common b/security/ssh2/Makefile.common index 10a8fc4e76e..08a251fbc3f 100644 --- a/security/ssh2/Makefile.common +++ b/security/ssh2/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.12 2005/04/11 21:47:19 tv Exp $ +# $NetBSD: Makefile.common,v 1.13 2005/06/01 18:03:21 jlam Exp $ # DISTNAME= ssh-3.2.9.1 @@ -97,3 +97,4 @@ post-install: .endfor .include "../../security/tcp_wrappers/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" diff --git a/security/tcp_wrappers/builtin.mk b/security/tcp_wrappers/builtin.mk index f6bf3efd730..d571b5df8e8 100644 --- a/security/tcp_wrappers/builtin.mk +++ b/security/tcp_wrappers/builtin.mk @@ -1,11 +1,50 @@ -# $NetBSD: builtin.mk,v 1.5 2005/05/17 21:53:20 gavan Exp $ +# $NetBSD: builtin.mk,v 1.6 2005/06/01 18:03:21 jlam Exp $ +BUILTIN_PKG:= tcp_wrappers + +BUILTIN_FIND_LIBS:= wrap +BUILTIN_FIND_FILES_VAR:= H_TCP_WRAPPERS +BUILTIN_FIND_FILES.H_TCP_WRAPPERS= /usr/include/tcpd.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.tcp_wrappers) IS_BUILTIN.tcp_wrappers= no -. if exists(/usr/include/tcpd.h) && (exists(/usr/lib${ABI}/libwrap.so) || \ - exists(/usr/lib${ABI}/libwrap.a)) +. if empty(H_TCP_WRAPPERS:M${LOCALBASE}/*) && \ + exists(${H_TCP_WRAPPERS}) && \ + !empty(BUILTIN_LIB_FOUND.wrap:M[yY][eE][sS]) IS_BUILTIN.tcp_wrappers= yes . endif -.endif # IS_BUILTIN.tcp_wrappers +.endif +MAKEVARS+= IS_BUILTIN.tcp_wrappers -USE_BUILTIN.tcp_wrappers?= ${IS_BUILTIN.tcp_wrappers} +### +### 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.tcp_wrappers) +. if ${PREFER.tcp_wrappers} == "pkgsrc" +USE_BUILTIN.tcp_wrappers= no +. else +USE_BUILTIN.tcp_wrappers= ${IS_BUILTIN.tcp_wrappers} +. if defined(BUILTIN_PKG.tcp_wrappers) && \ + !empty(IS_BUILTIN.tcp_wrappers:M[yY][eE][sS]) +USE_BUILTIN.tcp_wrappers= yes +. for _dep_ in ${BUILDLINK_DEPENDS.tcp_wrappers} +. if !empty(USE_BUILTIN.tcp_wrappers:M[yY][eE][sS]) +USE_BUILTIN.tcp_wrappers!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.tcp_wrappers:Q}; then \ + ${ECHO} yes; \ + else \ + ${ECHO} no; \ + fi +. endif +. endfor +. endif +. endif # PREFER.tcp_wrappers +.endif +MAKEVARS+= USE_BUILTIN.tcp_wrappers 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 diff --git a/textproc/catdoc-tk/Makefile b/textproc/catdoc-tk/Makefile index 62606ff50c8..31c40fda475 100644 --- a/textproc/catdoc-tk/Makefile +++ b/textproc/catdoc-tk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2004/12/29 17:27:36 fredb Exp $ +# $NetBSD: Makefile,v 1.5 2005/06/01 18:03:23 jlam Exp $ # .include "../../textproc/catdoc/Makefile.common" @@ -8,7 +8,6 @@ COMMENT+= (Tk interface) DEPENDS+= catdoc>=0.91.4nb1:../../textproc/catdoc -USE_X11= yes CONFIGURE_ARGS+= --enable-wordview CONFIGURE_ENV+= WISH="${BUILDLINK_PREFIX.tk}/bin/wish" diff --git a/textproc/expat/builtin-imake.mk b/textproc/expat/builtin-imake.mk new file mode 100644 index 00000000000..77f5d4aa43d --- /dev/null +++ b/textproc/expat/builtin-imake.mk @@ -0,0 +1,12 @@ +XCOMM $NetBSD: builtin-imake.mk,v 1.1 2005/06/01 18:03:23 jlam Exp $ + +/* + * Check the value of BuildExpatLibrary for the presence of + * expat in the X11 distribution. + */ +builtin-test: +#if BuildExpatLibrary + @echo yes +#else + @echo no +#endif diff --git a/textproc/expat/builtin.mk b/textproc/expat/builtin.mk index 1b6ea514d5b..595e56266f5 100644 --- a/textproc/expat/builtin.mk +++ b/textproc/expat/builtin.mk @@ -1,69 +1,91 @@ -# $NetBSD: builtin.mk,v 1.2 2004/03/29 05:43:35 jlam Exp $ +# $NetBSD: builtin.mk,v 1.3 2005/06/01 18:03:23 jlam Exp $ -_EXPAT_H= ${X11BASE}/include/expat.h -_X11_TMPL= ${X11BASE}/lib/X11/config/X11.tmpl +BUILTIN_PKG:= expat +BUILTIN_FIND_FILES_VAR:= H_EXPAT +BUILTIN_FIND_FILES.H_EXPAT= ${X11BASE}/include/expat.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.expat) IS_BUILTIN.expat= no -. if exists(${_X11_TMPL}) && exists(${_EXPAT_H}) +. if exists(${H_EXPAT}) +PKGSRC_USE_TOOLS+= imake # XXX +IMAKE?= ${X11BASE}/bin/imake # XXX +. if defined(IMAKE) && exists(${IMAKE}) IS_BUILTIN.expat!= \ - if ${GREP} -q BuildExpatLibrary ${_X11_TMPL}; then \ - ${ECHO} "yes"; \ - else \ - ${ECHO} "no"; \ - fi -. if !empty(IS_BUILTIN.expat:M[yY][eE][sS]) -# -# Create an appropriate package name for the built-in expat distributed -# with the system. This package name can be used to check against -# BUILDLINK_DEPENDS.<pkg> to see if we need to install the pkgsrc version -# or if the built-in one is sufficient. -# -_EXPAT_MAJOR!= \ - ${AWK} '/\#define[ ]*XML_MAJOR_VERSION/ { print $$3 }' \ - ${_EXPAT_H} -_EXPAT_MINOR!= \ - ${AWK} '/\#define[ ]*XML_MINOR_VERSION/ { print $$3 }' \ - ${_EXPAT_H} -_EXPAT_MICRO!= \ - ${AWK} '/\#define[ ]*XML_MICRO_VERSION/ { print $$3 }' \ - ${_EXPAT_H} -_EXPAT_VERSION= ${_EXPAT_MAJOR}.${_EXPAT_MINOR}.${_EXPAT_MICRO} -BUILTIN_PKG.expat= expat-${_EXPAT_VERSION} -BUILDLINK_VARS+= BUILTIN_PKG.expat + ${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config \ + -f ${BUILDLINK_PKGSRCDIR.expat}/builtin-imake.mk \ + -s - | \ + ${MAKE} -f - builtin-test . endif . endif -BUILDLINK_VARS+= IS_BUILTIN.expat -.endif # IS_BUILTIN.expat +.endif +MAKEVARS+= IS_BUILTIN.expat -.if !defined(USE_BUILTIN.expat) -USE_BUILTIN.expat?= ${IS_BUILTIN.expat} +### +### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to +### a package name to represent the built-in package. +### +.if !defined(BUILTIN_PKG.expat) && \ + !empty(IS_BUILTIN.expat:M[yY][eE][sS]) && \ + exists(${H_EXPAT}) +BUILTIN_VERSION.expat!= \ + ${AWK} '/\#define[ ]*XML_MAJOR_VERSION/ { M = $$3 } \ + /\#define[ ]*XML_MINOR_VERSION/ { m = "."$$3 } \ + /\#define[ ]*XML_MICRO_VERSION/ { u = "."$$3 } \ + END { printf "%s%s%s\n", M, m, u }' \ + ${H_EXPAT} +BUILTIN_PKG.expat= expat-${BUILTIN_VERSION.expat} +.endif +MAKEVARS+= BUILTIN_PKG.expat -. if defined(BUILTIN_PKG.expat) +### +### 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.expat) +. if ${PREFER.expat} == "pkgsrc" +USE_BUILTIN.expat= no +. else +USE_BUILTIN.expat= ${IS_BUILTIN.expat} +. if defined(BUILTIN_PKG.expat) && \ + !empty(IS_BUILTIN.expat:M[yY][eE][sS]) USE_BUILTIN.expat= yes -. for _depend_ in ${BUILDLINK_DEPENDS.expat} -. if !empty(USE_BUILTIN.expat:M[yY][eE][sS]) -USE_BUILTIN.expat!= \ - if ${PKG_ADMIN} pmatch '${_depend_}' ${BUILTIN_PKG.expat}; then \ - ${ECHO} "yes"; \ +. for _dep_ in ${BUILDLINK_DEPENDS.expat} +. if !empty(USE_BUILTIN.expat:M[yY][eE][sS]) +USE_BUILTIN.expat!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.expat:Q}; then \ + ${ECHO} yes; \ else \ - ${ECHO} "no"; \ + ${ECHO} no; \ fi -. endif -. endfor -. endif -.endif # USE_BUILTIN.expat +. endif +. endfor +. endif +. endif # PREFER.expat +.endif +MAKEVARS+= USE_BUILTIN.expat +### +### The section below only applies if we are not including this file +### solely to determine whether a built-in implementation exists. +### CHECK_BUILTIN.expat?= no .if !empty(CHECK_BUILTIN.expat:M[nN][oO]) -.if !empty(USE_BUILTIN.expat:M[nN][oO]) +. if !empty(USE_BUILTIN.expat:M[nN][oO]) BUILDLINK_DEPENDS.expat+= expat>=1.95.4 -.endif +. endif -.if !empty(USE_BUILTIN.expat:M[yY][eE][sS]) -BUILDLINK_PREFIX.expat= ${X11BASE} -USE_X11= yes -.endif +. if !empty(USE_BUILTIN.expat:M[yY][eE][sS]) +BUILDLINK_PREFIX.expat= ${X11BASE} +. include "../../mk/x11.buildlink3.mk" +. include "../../mk/x11.builtin.mk" +. endif .endif # CHECK_BUILTIN.expat diff --git a/textproc/gtkspell/Makefile b/textproc/gtkspell/Makefile index f77448fba2a..8adb79d63a0 100644 --- a/textproc/gtkspell/Makefile +++ b/textproc/gtkspell/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/04/26 20:15:04 drochner Exp $ +# $NetBSD: Makefile,v 1.22 2005/06/01 18:03:23 jlam Exp $ DISTNAME= gtkspell-2.0.10 CATEGORIES= textproc devel @@ -10,7 +10,6 @@ COMMENT= Spell checking GtkTextView widget USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes -USE_X11= yes GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE= gtkspell-2.0.pc.in diff --git a/textproc/libcroco/Makefile b/textproc/libcroco/Makefile index 8e1d22681c7..4dfd851a0b5 100644 --- a/textproc/libcroco/Makefile +++ b/textproc/libcroco/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/05/22 20:08:35 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2005/06/01 18:03:23 jlam Exp $ # DISTNAME= libcroco-0.6.0 @@ -13,7 +13,6 @@ COMMENT= Toolkit to parse and manipulate CSS (Cascading Style Sheets) USE_TOOLS+= gmake USE_LIBTOOL= yes -USE_X11= yes GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE+= libcroco-0.6.pc.in diff --git a/textproc/stardic/Makefile b/textproc/stardic/Makefile index aa556798f62..f9a990f4477 100644 --- a/textproc/stardic/Makefile +++ b/textproc/stardic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/04/11 21:47:42 tv Exp $ +# $NetBSD: Makefile,v 1.10 2005/06/01 18:03:23 jlam Exp $ DISTNAME= dic PKGNAME= stardic-1.31 @@ -11,7 +11,6 @@ COMMENT= English-Chinese dictionary DIST_SUBDIR= ${PKGNAME_NOREV} -USE_X11= # defined MAKEFILE= makefile USE_LANGUAGES= c c++ diff --git a/time/bbdate/Makefile b/time/bbdate/Makefile index b67bbb7af53..d913ed36b38 100644 --- a/time/bbdate/Makefile +++ b/time/bbdate/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2004/11/22 21:02:33 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2005/06/01 18:03:23 jlam Exp $ # DISTNAME= bbdate-0.2.4 @@ -10,7 +10,7 @@ HOMEPAGE= http://bbtools.windsofstorm.net/available.phtml#bbdate COMMENT= Display the current date GNU_CONFIGURE= YES -USE_X11= YES USE_LANGUAGES= c++ +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/time/dclock/Makefile b/time/dclock/Makefile index 96d71a9569f..e02bf61c8d7 100644 --- a/time/dclock/Makefile +++ b/time/dclock/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/04/11 21:47:44 tv Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 18:03:23 jlam Exp $ # DISTNAME= dclock @@ -15,4 +15,5 @@ CONFLICTS+= ivtools-* WRKSRC= ${WRKDIR} USE_X11BASE= yes +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/time/glclock/Makefile b/time/glclock/Makefile index f936fbf0b9d..3f4f56b31b9 100644 --- a/time/glclock/Makefile +++ b/time/glclock/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/04/11 21:47:44 tv Exp $ +# $NetBSD: Makefile,v 1.15 2005/06/01 18:03:23 jlam Exp $ # DISTNAME= glclock-6.0b6.0 @@ -13,7 +13,6 @@ COMMENT= OpenGL-based pocket watch MAKEFILE= makefile BUILD_TARGET= glclock -USE_X11= # defined .include "../../mk/bsd.prefs.mk" @@ -29,4 +28,5 @@ do-install: # ${INSTALL_SCRIPT} ${WRKSRC}/$$i ${PREFIX}/bin; done .include "../../graphics/Mesa/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/time/gnotime/Makefile b/time/gnotime/Makefile index c5019f7d4ad..92b76da4061 100644 --- a/time/gnotime/Makefile +++ b/time/gnotime/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:43 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2005/06/01 18:03:23 jlam Exp $ DISTNAME= gnotime-2.2.1 PKGREVISION= # empty @@ -14,7 +14,6 @@ USE_DIRS+= gnome2-1.5 USE_TOOLS+= gmake USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes -USE_X11= yes GCONF2_SCHEMAS= gnotime.schemas diff --git a/time/ical/Makefile b/time/ical/Makefile index 6ab19b292f2..8db147c2b0e 100644 --- a/time/ical/Makefile +++ b/time/ical/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/04/29 19:01:33 kristerw Exp $ +# $NetBSD: Makefile,v 1.15 2005/06/01 18:03:23 jlam Exp $ DISTNAME= ical-2.3.1 PKGREVISION= 1 @@ -12,7 +12,6 @@ COMMENT= Calendar application PKG_INSTALLATION_TYPES= overwrite pkgviews USE_LANGUAGES= c c++ -USE_X11= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} \ --with-tclconfig=${BUILDLINK_PREFIX.tcl}/lib \ diff --git a/time/pclock/Makefile b/time/pclock/Makefile index 5b10a7f5483..aa0c7de1b48 100644 --- a/time/pclock/Makefile +++ b/time/pclock/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/04/11 21:47:45 tv Exp $ +# $NetBSD: Makefile,v 1.9 2005/06/01 18:03:23 jlam Exp $ # DISTNAME= pclock_0.13.1.orig @@ -11,7 +11,6 @@ MAINTAINER= salo@NetBSD.org COMMENT= Simple analog clock designed for Window Maker WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}.orig -USE_X11= YES MAKE_ENV+= LN=${LN} @@ -23,5 +22,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/pclock .include "../../graphics/xpm/buildlink3.mk" - .include "../../mk/bsd.pkg.mk" diff --git a/time/ptimetracker/Makefile b/time/ptimetracker/Makefile index df195856d26..54fd7588602 100644 --- a/time/ptimetracker/Makefile +++ b/time/ptimetracker/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:43 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2005/06/01 18:03:23 jlam Exp $ DISTNAME= ptimetracker-1.7.3 PKGREVISION= # empty @@ -10,7 +10,6 @@ HOMEPAGE= http://www.eggtart.plus.com/ptt/ COMMENT= Keep track of the time spent on projects # USE_GNOME= gnomehack gnomeprefix libgtkhtml libgnomeui -USE_X11= yes USE_TOOLS+= gmake USE_LIBTOOL= yes diff --git a/time/rclock/Makefile b/time/rclock/Makefile index c15ab6394f0..39f03018bb7 100644 --- a/time/rclock/Makefile +++ b/time/rclock/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/03/24 21:13:03 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:24 jlam Exp $ DISTNAME= rxvt-2.6.0 PKGNAME= rclock-2.6.0 @@ -15,4 +15,5 @@ USE_X11BASE= yes GNU_CONFIGURE= yes BUILD_TARGET= clock +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/time/xbeats/Makefile b/time/xbeats/Makefile index f3849186ca7..f764f11206f 100644 --- a/time/xbeats/Makefile +++ b/time/xbeats/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/04/11 21:47:45 tv Exp $ +# $NetBSD: Makefile,v 1.9 2005/06/01 18:03:24 jlam Exp $ # DISTNAME= xbeats-0.4 @@ -9,7 +9,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://iznogood.bohemians.org/ COMMENT= Beats clock dockable in both Window Maker and AfterStep -USE_X11= YES GNU_CONFIGURE= YES .include "../../graphics/xpm/buildlink3.mk" diff --git a/time/xdaliclock/Makefile b/time/xdaliclock/Makefile index 54091f234c0..7f0055d20f8 100644 --- a/time/xdaliclock/Makefile +++ b/time/xdaliclock/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2004/01/20 12:27:16 agc Exp $ +# $NetBSD: Makefile,v 1.6 2005/06/01 18:03:24 jlam Exp $ # DISTNAME= xdaliclock-2.18 @@ -12,6 +12,6 @@ COMMENT= Animated digital clock WRKSRC= ${WRKDIR}/${DISTNAME}/X11 GNU_CONFIGURE= yes -USE_X11= yes +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/time/xdkcal/Makefile b/time/xdkcal/Makefile index 094130fb5b9..21c9c7da534 100644 --- a/time/xdkcal/Makefile +++ b/time/xdkcal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/04/11 21:47:45 tv Exp $ +# $NetBSD: Makefile,v 1.3 2005/06/01 18:03:24 jlam Exp $ # DISTNAME= xdkcal-0.9d @@ -12,10 +12,11 @@ COMMENT= X Desktop Calendar PKG_INSTALLATION_TYPES= overwrite pkgviews GNU_CONFIGURE= yes -USE_X11= yes INSTALLATION_DIRS= bin man/man1 +.include "../../mk/x11.buildlink3.mk" + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xdkcal ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/xdkcal.1x ${PREFIX}/man/man1/xdkcal.1 diff --git a/time/xtu/Makefile b/time/xtu/Makefile index 328cb9da05f..578b1983805 100644 --- a/time/xtu/Makefile +++ b/time/xtu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2004/04/29 14:18:58 sketch Exp $ +# $NetBSD: Makefile,v 1.5 2005/06/01 18:03:24 jlam Exp $ # DISTNAME= xtu-1.2 @@ -9,7 +9,8 @@ MAINTAINER= sketch@NetBSD.org HOMEPAGE= http://core.de/~coto/projects/xtu/ COMMENT= Small configurable X11 analog clock -USE_X11= yes + +.include "../../mk/x11.buildlink3.mk" do-build: cd ${WRKSRC} && ${CC} *.c -o xtu -I${X11BASE}/include ${X11_LDFLAGS} -lX11 -lXext diff --git a/wm/3ddesktop/Makefile b/wm/3ddesktop/Makefile index 58d13ef166d..881776af79b 100644 --- a/wm/3ddesktop/Makefile +++ b/wm/3ddesktop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/04/11 21:47:45 tv Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/01 18:03:24 jlam Exp $ # DISTNAME= 3ddesktop-0.2.8 @@ -10,7 +10,6 @@ HOMEPAGE= http://desk3d.sourceforge.net/ COMMENT= 3D Virtual Desktop Switcher USE_PKGINSTALL= yes -USE_X11= yes GNU_CONFIGURE= yes EGDIR= ${PREFIX}/share/examples/3ddesktop @@ -23,4 +22,5 @@ pre-install: .include "../../graphics/glu/buildlink3.mk" .include "../../graphics/imlib2/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/aewm++/Makefile b/wm/aewm++/Makefile index c8b00effd81..3c46c9e832e 100644 --- a/wm/aewm++/Makefile +++ b/wm/aewm++/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/04/11 21:47:45 tv Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:24 jlam Exp $ # DISTNAME= aewm++-1.0.24 @@ -10,6 +10,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://sapphire.sourceforge.net/ COMMENT= Fork of the popular minimal window manager aewm -USE_X11= YES +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/afterstep/Makefile b/wm/afterstep/Makefile index be6ca59207a..a622e923558 100644 --- a/wm/afterstep/Makefile +++ b/wm/afterstep/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2005/05/22 20:08:43 jlam Exp $ +# $NetBSD: Makefile,v 1.29 2005/06/01 18:03:24 jlam Exp $ # DISTNAME= AfterStep-2.00.01 @@ -16,7 +16,7 @@ GNU_CONFIGURE= YES USE_DIRS+= gnome2-1.5 USE_TOOLS+= gmake USE_PERL5= run -USE_X11= YES .include "../../graphics/freetype2/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/afterstep1/Makefile b/wm/afterstep1/Makefile index e7f5e38bcae..6bbaf401b53 100644 --- a/wm/afterstep1/Makefile +++ b/wm/afterstep1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/05/22 05:35:33 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2005/06/01 18:03:24 jlam Exp $ DISTNAME= AfterStep-1.8.11 PKGNAME= ${DISTNAME:S/AfterStep/afterstep/} @@ -18,7 +18,6 @@ DEPENDS+= xp-[0-9]*:../../x11/xp AUTOCONF_REQD= 2.13 GNU_CONFIGURE= YES USE_LIBTOOL= YES -USE_X11= YES CONFIGURE_ARGS+= --disable-staticlibs CONFIGURE_ARGS+= --disable-xinerama diff --git a/wm/amaterus/Makefile b/wm/amaterus/Makefile index 3b26c2f11b5..f0b3826dcc8 100644 --- a/wm/amaterus/Makefile +++ b/wm/amaterus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/04/11 21:47:45 tv Exp $ +# $NetBSD: Makefile,v 1.15 2005/06/01 18:03:24 jlam Exp $ DISTNAME= amaterus-0.34.1 PKGREVISION= 4 @@ -10,7 +10,6 @@ HOMEPAGE= http://www.taiyaki.org/ COMMENT= GTK+ window manager GNU_CONFIGURE= YES -USE_X11= YES post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/amaterus diff --git a/wm/amiwm/Makefile b/wm/amiwm/Makefile index b63828f2a00..ab7d770b344 100644 --- a/wm/amiwm/Makefile +++ b/wm/amiwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/04/11 21:47:46 tv Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/01 18:03:24 jlam Exp $ # DISTNAME= amiwm0.20pl48 @@ -15,7 +15,6 @@ RESTRICTED= "Restrictive copyright (non-commerical use only)" NO_SRC_ON_CDROM= ${RESTRICTED} NO_BIN_ON_CDROM= ${RESTRICTED} -USE_X11= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CFLAGS="-DHAVE_X11_EXTENSIONS_SHAPE_H=1 -O" \ X_PRE_LIBS="${X_PRE_LIBS}" \ @@ -24,4 +23,5 @@ CONFIGURE_ENV= CFLAGS="-DHAVE_X11_EXTENSIONS_SHAPE_H=1 -O" \ X_PRE_LIBS= ${COMPILER_RPATH_FLAG}${X11BASE}/lib FIX_RPATH+= X_PRE_LIBS +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/bbconf/Makefile b/wm/bbconf/Makefile index ce5c0cc002f..e8e7f679924 100644 --- a/wm/bbconf/Makefile +++ b/wm/bbconf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/04/16 23:09:00 kristerw Exp $ +# $NetBSD: Makefile,v 1.10 2005/06/01 18:03:24 jlam Exp $ # DISTNAME= bbconf-1.4 @@ -10,7 +10,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://bbconf.sourceforge.net/ COMMENT= Configuration tool for the blackbox window manager -USE_X11= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES diff --git a/wm/bbkeys/Makefile b/wm/bbkeys/Makefile index e266c6d620c..50b199bc69e 100644 --- a/wm/bbkeys/Makefile +++ b/wm/bbkeys/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/04/11 21:47:46 tv Exp $ +# $NetBSD: Makefile,v 1.15 2005/06/01 18:03:24 jlam Exp $ # DISTNAME= bbkeys-0.8.6 @@ -10,9 +10,9 @@ HOMEPAGE= http://bbkeys.sourceforge.net/ COMMENT= General X Window keygrabber GNU_CONFIGURE= YES -USE_X11= YES USE_LANGUAGES= c++ .include "../../lang/perl5/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/bbpager/Makefile b/wm/bbpager/Makefile index a0510a13d0d..11cc858ec1b 100644 --- a/wm/bbpager/Makefile +++ b/wm/bbpager/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/04/11 21:47:46 tv Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 18:03:24 jlam Exp $ # DISTNAME= bbpager-0.3.1 @@ -11,9 +11,10 @@ HOMEPAGE= http://bbtools.windsofstorm.net/available.phtml COMMENT= Pager for the blackbox window manager GNU_CONFIGURE= YES -USE_X11= YES USE_LANGUAGES= c++ +.include "../../mk/x11.buildlink3.mk" + post-install: ${INSTALL_MAN} ${WRKSRC}/bbpager.1 ${PREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/bbpager.bb.5 ${PREFIX}/man/man5 diff --git a/wm/bbrun/Makefile b/wm/bbrun/Makefile index af408471185..2c816daa981 100644 --- a/wm/bbrun/Makefile +++ b/wm/bbrun/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:43 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2005/06/01 18:03:24 jlam Exp $ DISTNAME= bbrun-1.3 PKGREVISION= 3 @@ -10,7 +10,6 @@ HOMEPAGE= http://www.dwave.net/~jking/bbrun/ COMMENT= Run utility for BlackBox WRKSRC= ${WRKDIR}/${DISTNAME}/bbrun -USE_X11= YES USE_TOOLS+= gmake BUILD_TARGET= bbrun diff --git a/wm/blackbox/Makefile b/wm/blackbox/Makefile index 9b25eb925f3..715f7b8a7d8 100644 --- a/wm/blackbox/Makefile +++ b/wm/blackbox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/04/11 21:47:46 tv Exp $ +# $NetBSD: Makefile,v 1.22 2005/06/01 18:03:24 jlam Exp $ # DISTNAME= blackbox-0.65.0 @@ -13,8 +13,8 @@ COMMENT= Small and fast X11R6 window manager DEPENDS= bsetroot>=0.1nb1:../../wm/bsetroot USE_LANGUAGES= c c++ -USE_X11= YES GNU_CONFIGURE= YES .include "../../devel/gettext-lib/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/bsetroot/Makefile b/wm/bsetroot/Makefile index 3b78a3226bf..57dd7563da9 100644 --- a/wm/bsetroot/Makefile +++ b/wm/bsetroot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/04/11 21:47:46 tv Exp $ +# $NetBSD: Makefile,v 1.16 2005/06/01 18:03:24 jlam Exp $ # DISTNAME= blackbox-0.65.0 @@ -12,7 +12,6 @@ HOMEPAGE= http://blackboxwm.sourceforge.net/ COMMENT= Tools to set the root windows background USE_LANGUAGES= c c++ -USE_X11= YES GNU_CONFIGURE= YES BUILD_DIRS= ${WRKSRC}/nls ${WRKSRC}/util @@ -25,4 +24,5 @@ do-install: ( cd ${WRKSRC}/nls && ${MAKE} install ) .include "../../devel/gettext-lib/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/e16menuedit2/Makefile b/wm/e16menuedit2/Makefile index aa5c637b20a..19ddb9b573b 100644 --- a/wm/e16menuedit2/Makefile +++ b/wm/e16menuedit2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/04/11 21:47:47 tv Exp $ +# $NetBSD: Makefile,v 1.3 2005/06/01 18:03:24 jlam Exp $ # DISTNAME= e16menuedit2-0.0.1 @@ -16,7 +16,6 @@ BUILD_USES_MSGFMT= yes GNU_CONFIGURE= yes USE_DIRS+= gnome2-1.5 USE_PKGLOCALEDIR= yes -USE_X11= yes pre-configure: cd ${WRKSRC}; \ diff --git a/wm/econf/Makefile b/wm/econf/Makefile index 338075320e6..0cc621dc235 100644 --- a/wm/econf/Makefile +++ b/wm/econf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/05/31 22:12:18 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2005/06/01 18:03:24 jlam Exp $ # DISTNAME= enlightenment-conf-0.15 @@ -12,7 +12,6 @@ HOMEPAGE= http://www.enlightenment.org/ COMMENT= Configuration tool for easily setting up Enlightenment USE_LANGUAGES= c c++ -USE_X11= yes USE_TOOLS+= gmake USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes diff --git a/wm/enlightenment/Makefile b/wm/enlightenment/Makefile index f05e08bc6fe..3f3537cb83d 100644 --- a/wm/enlightenment/Makefile +++ b/wm/enlightenment/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2005/05/22 20:08:43 jlam Exp $ +# $NetBSD: Makefile,v 1.29 2005/06/01 18:03:24 jlam Exp $ DISTNAME= enlightenment-0.16.7.2 CATEGORIES= x11 gnome wm @@ -11,7 +11,6 @@ COMMENT= Highly themeable and configurable window manager USE_TOOLS+= bison USE_PERL5= YES USE_PKGLOCALEDIR= YES -USE_X11= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --enable-fsstd CONFIGURE_ARGS+= --enable-xrandr diff --git a/wm/ethemes/Makefile b/wm/ethemes/Makefile index a6b542cfc73..5930fae38fe 100644 --- a/wm/ethemes/Makefile +++ b/wm/ethemes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/05/16 01:15:33 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 18:03:24 jlam Exp $ DISTNAME= ethemes-0.1 PKGREVISION= 2 @@ -13,7 +13,6 @@ COMMENT= Themes for the window manager Enlightenment DEPENDS+= enlightenment>=0.16.2:../../wm/enlightenment DIST_SUBDIR= ethemes -USE_X11= yes NO_BUILD= yes NO_CONFIGURE= yes EXTRACT_ONLY= @@ -38,6 +37,8 @@ E_THEMES?= Absolute_E-DR16-199911060830.etheme \ arctic-DR16-200006050720.etheme \ eMac-DR16-199912101635.etheme small-e-DR16-199908230041.etheme +.include "../../mk/x11.buildlink3.mk" + do-install: .for FILE in ${E_THEMES} NAME=`echo ${FILE} | ${SED} -e s/-DR16.*//` ; \ diff --git a/wm/evilwm/Makefile b/wm/evilwm/Makefile index 76f7815b52f..f4580c409e0 100644 --- a/wm/evilwm/Makefile +++ b/wm/evilwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/04/11 21:47:47 tv Exp $ +# $NetBSD: Makefile,v 1.14 2005/06/01 18:03:25 jlam Exp $ # DISTNAME= evilwm_0.99.17.orig @@ -11,10 +11,11 @@ HOMEPAGE= http://evilwm.sourceforge.net/ COMMENT= Minimalist Window Manager for X WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/} -USE_X11= yes BUILD_TARGET= allinone +.include "../../mk/x11.buildlink3.mk" + post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/evilwm cd ${WRKSRC} && \ diff --git a/wm/fluxbox/Makefile b/wm/fluxbox/Makefile index ab6e58ff89a..7bfb8822947 100644 --- a/wm/fluxbox/Makefile +++ b/wm/fluxbox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/05/22 20:08:43 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2005/06/01 18:03:25 jlam Exp $ # DISTNAME= fluxbox-0.9.12 @@ -12,7 +12,6 @@ COMMENT= Window Manager for X based on Blackbox DEPENDS= bsetroot>=0.1nb1:../../wm/bsetroot -USE_X11= YES USE_LANGUAGES= c c++ GNU_CONFIGURE= YES USE_TOOLS= gmake @@ -28,4 +27,5 @@ CONFIGURE_ARGS+= --enable-xinerama .include "options.mk" .include "../../converters/libiconv/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/flwm/Makefile b/wm/flwm/Makefile index a68615fbdd6..fb68c58db48 100644 --- a/wm/flwm/Makefile +++ b/wm/flwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/04/11 21:47:47 tv Exp $ +# $NetBSD: Makefile,v 1.16 2005/06/01 18:03:25 jlam Exp $ # DISTNAME= flwm-1.00 @@ -11,7 +11,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://flwm.sourceforge.net/ COMMENT= The Fast, Light Window Manager -USE_X11= # defined GNU_CONFIGURE= # defined CONFIGURE_ENV+= X_LIBS="-lGL" diff --git a/wm/fvwm-devel/Makefile b/wm/fvwm-devel/Makefile index 57d29772e3a..ccf35085ec2 100644 --- a/wm/fvwm-devel/Makefile +++ b/wm/fvwm-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/04/11 21:47:47 tv Exp $ +# $NetBSD: Makefile,v 1.8 2005/06/01 18:03:25 jlam Exp $ DISTNAME= fvwm-2.5.12 PKGNAME= ${DISTNAME:S/fvwm/&-devel/} @@ -16,7 +16,6 @@ CONFLICTS= fvwm-[0-9]* fvwm1-[0-9]* fvwm2-[0-9]* PKG_INSTALLATION_TYPES= overwrite pkgviews USE_PKGLOCALEDIR= YES -USE_X11= YES GNU_CONFIGURE= YES USE_GNU_READLINE= YES diff --git a/wm/fvwm2-themes/Makefile b/wm/fvwm2-themes/Makefile index 3e7770fae38..952cb1ae6b2 100644 --- a/wm/fvwm2-themes/Makefile +++ b/wm/fvwm2-themes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/04/11 21:47:47 tv Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 18:03:25 jlam Exp $ # DISTNAME= fvwm-themes-${THEM_VER} @@ -30,4 +30,5 @@ post-install: ${DISTDIR}/fvwm-themes-extra-${THEM_VER}.tar.bz2 .include "../../graphics/ImageMagick/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/golem/Makefile b/wm/golem/Makefile index 8e429b50b4a..1492d003a8a 100644 --- a/wm/golem/Makefile +++ b/wm/golem/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:43 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 18:03:25 jlam Exp $ # DISTNAME= golem-0.0.5 @@ -12,7 +12,6 @@ COMMENT= Fast and lightweight yet customizable window manager USE_PKGINSTALL= YES USE_TOOLS+= gmake -USE_X11= YES GNU_CONFIGURE= YES CONFIGURE_ARGS= --enable-i18n diff --git a/wm/icewm/Makefile.common b/wm/icewm/Makefile.common index 6639ec13ac1..34129d85557 100644 --- a/wm/icewm/Makefile.common +++ b/wm/icewm/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.44 2005/05/31 14:05:57 rillig Exp $ +# $NetBSD: Makefile.common,v 1.45 2005/06/01 18:03:25 jlam Exp $ DISTNAME= icewm-1.2.20 CATEGORIES= x11 wm @@ -8,7 +8,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://icewm.sourceforge.net/ GNU_CONFIGURE= yes -USE_X11= yes USE_TOOLS+= gmake USE_PKGINSTALL= yes USE_PKGLOCALEDIR= yes diff --git a/wm/ion/Makefile b/wm/ion/Makefile index b51c8233ef8..95638614244 100644 --- a/wm/ion/Makefile +++ b/wm/ion/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/05/22 20:08:43 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2005/06/01 18:03:25 jlam Exp $ # DISTNAME= ion-2-20040729 @@ -14,7 +14,6 @@ COMMENT= Keyboard friendly tiling window manager PKG_INSTALLATION_TYPES= overwrite pkgviews USE_PKGINSTALL= YES -USE_X11= YES USE_TOOLS+= gmake GNU_CONFIGURE= YES @@ -40,5 +39,6 @@ INSTALLATION_DIRS+= share/doc/ion share/examples/ion share/ion .include "../../lang/lua/buildlink3.mk" .include "../../devel/libltdl/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/ion3-devel/Makefile b/wm/ion3-devel/Makefile index 98ce4892493..e2617fa593f 100644 --- a/wm/ion3-devel/Makefile +++ b/wm/ion3-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:43 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2005/06/01 18:03:25 jlam Exp $ # DISTNAME= ion-3ds-20040906 @@ -13,7 +13,6 @@ COMMENT= Keyboard friendly tiling window manager PKG_INSTALLATION_TYPES= overwrite pkgviews USE_PKGINSTALL= YES -USE_X11= YES USE_TOOLS+= gmake GNU_CONFIGURE= YES USE_PKGLOCALEDIR= YES @@ -41,6 +40,7 @@ CONF_FILES+= ${EGDIR}/$f ${PKG_SYSCONFDIR}/$f .include "../../devel/gettext-lib/buildlink3.mk" .include "../../lang/lua/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" # This is necessary because gettext's builtin.mk add stuff there, diff --git a/wm/matchbox/Makefile b/wm/matchbox/Makefile index 7cfb60f8bfe..8de7dbb477a 100644 --- a/wm/matchbox/Makefile +++ b/wm/matchbox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/04/11 21:47:48 tv Exp $ +# $NetBSD: Makefile,v 1.19 2005/06/01 18:03:25 jlam Exp $ # DISTNAME= matchbox-window-manager-0.9.3 @@ -10,7 +10,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://projects.o-hand.com/matchbox/ COMMENT= Window manager designed for computers with small displays -USE_X11= yes USE_LIBTOOL= yes USE_PKGINSTALL= yes GNU_CONFIGURE= yes diff --git a/wm/metacity/Makefile b/wm/metacity/Makefile index 1bb261d97c5..991b6866b3a 100644 --- a/wm/metacity/Makefile +++ b/wm/metacity/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2005/05/22 20:08:43 jlam Exp $ +# $NetBSD: Makefile,v 1.44 2005/06/01 18:03:25 jlam Exp $ # DISTNAME= metacity-2.10.1 @@ -14,7 +14,6 @@ BUILD_USES_MSGFMT= YES USE_DIRS+= gnome2-1.5 theme-1.0 USE_PKGLOCALEDIR= YES -USE_X11= YES USE_TOOLS+= gmake GNU_CONFIGURE= YES USE_LIBTOOL= YES diff --git a/wm/novawm/Makefile b/wm/novawm/Makefile index 7e6667a1034..21b1fb5f2b6 100644 --- a/wm/novawm/Makefile +++ b/wm/novawm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:43 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2005/06/01 18:03:25 jlam Exp $ # DISTNAME= NovaWM-0.8_alpha @@ -12,7 +12,6 @@ COMMENT= Nova window manager GNU_CONFIGURE= YES USE_TOOLS+= gmake -USE_X11= YES .include "../../graphics/xpm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/openbox/Makefile b/wm/openbox/Makefile index bd1e4192d63..63035d07515 100644 --- a/wm/openbox/Makefile +++ b/wm/openbox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/05/22 20:08:43 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2005/06/01 18:03:25 jlam Exp $ DISTNAME= openbox-3.2 PKGREVISION= 1 @@ -18,7 +18,6 @@ USE_TOOLS+= gmake USE_LIBTOOL= YES USE_PKGINSTALL= YES USE_PKGLOCALEDIR= YES -USE_X11= YES PKGCONFIG_OVERRIDE= parser/obparser-3.0.pc.in PKGCONFIG_OVERRIDE+= render/obrender-3.0.pc.in diff --git a/wm/openbox2/Makefile b/wm/openbox2/Makefile index 6c9d19b8699..7326a07ca8a 100644 --- a/wm/openbox2/Makefile +++ b/wm/openbox2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/04/11 21:47:48 tv Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:25 jlam Exp $ # DISTNAME= openbox-2.2.3 @@ -12,7 +12,6 @@ COMMENT= Window manager based on Blackbox (2.x branch) DEPENDS= bsetroot>=0.1nb1:../../wm/bsetroot -USE_X11= YES GNU_CONFIGURE= YES CPPFLAGS+= -DHAVE_STRFTIME=1 diff --git a/wm/oroborus/Makefile b/wm/oroborus/Makefile index cad25edd3f0..afd2a13588c 100644 --- a/wm/oroborus/Makefile +++ b/wm/oroborus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/04/11 21:47:48 tv Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 18:03:25 jlam Exp $ # DISTNAME= oroborus_2.0.12-1 @@ -12,8 +12,6 @@ COMMENT= Small and simple window manager for X WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} GNU_CONFIGURE= YES -USE_X11= YES .include "../../graphics/xpm/buildlink3.mk" - .include "../../mk/bsd.pkg.mk" diff --git a/wm/pekwm/Makefile b/wm/pekwm/Makefile index 5f2c103357c..4732a02fc00 100644 --- a/wm/pekwm/Makefile +++ b/wm/pekwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:44 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2005/06/01 18:03:25 jlam Exp $ # DISTNAME= pekwm-0.1.3 @@ -13,7 +13,6 @@ COMMENT= Window manager based on aewm++ GNU_CONFIGURE= YES USE_TOOLS+= gmake -USE_X11= YES USE_PERL5= run USE_PKGINSTALL= YES USE_LANGUAGES+= c++ diff --git a/wm/pwm/Makefile b/wm/pwm/Makefile index 32a889245db..ba03b97f9c0 100644 --- a/wm/pwm/Makefile +++ b/wm/pwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/05/22 20:08:44 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2005/06/01 18:03:25 jlam Exp $ # DISTNAME= pwm-20030617 @@ -15,7 +15,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews CONFLICTS+= ion<=20040729nb2 USE_PKGINSTALL= YES -USE_X11= YES USE_TOOLS+= gmake CFLAGS+= -DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\"" @@ -35,4 +34,5 @@ SUPPORT_FILES= # empty SUPPORT_FILES+= ${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE} .endfor +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/qvwm/Makefile b/wm/qvwm/Makefile index 96edf7630dd..4157f06af35 100644 --- a/wm/qvwm/Makefile +++ b/wm/qvwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:44 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2005/06/01 18:03:25 jlam Exp $ # DISTNAME= qvwm-1.1.12 @@ -10,7 +10,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.qvwm.org/ COMMENT= Windows 95/98/NT like window manager for X11 -USE_X11= yes GNU_CONFIGURE= yes USE_TOOLS+= gmake USE_LANGUAGES= c++ diff --git a/wm/ratpoison/Makefile b/wm/ratpoison/Makefile index 9260eeb612b..f80c9f687d7 100644 --- a/wm/ratpoison/Makefile +++ b/wm/ratpoison/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/04/11 21:47:48 tv Exp $ +# $NetBSD: Makefile,v 1.16 2005/06/01 18:03:25 jlam Exp $ # DISTNAME= ratpoison-1.3.0 @@ -9,11 +9,11 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.nongnu.org/ratpoison/ COMMENT= Simple window manager with no fat library dependencies -USE_X11= YES GNU_CONFIGURE= YES USE_GNU_READLINE= YES INFO_FILES= ratpoison.info .include "../../devel/readline/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/sawfish-themes/Makefile b/wm/sawfish-themes/Makefile index f64533f281b..9aca907027e 100644 --- a/wm/sawfish-themes/Makefile +++ b/wm/sawfish-themes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/11/30 18:26:40 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2005/06/01 18:03:25 jlam Exp $ DISTNAME= sawfish-themes-0.2 PKGREVISION= 2 @@ -22,6 +22,8 @@ USE_X11BASE= yes .include "../../mk/bsd.prefs.mk" +.include "../../mk/x11.buildlink3.mk" + pre-fetch: @${ECHO} "===========================================================" @${ECHO} diff --git a/wm/sawfish/Makefile b/wm/sawfish/Makefile index dbed0657cf4..0396b90c653 100644 --- a/wm/sawfish/Makefile +++ b/wm/sawfish/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2004/12/28 23:18:18 reed Exp $ +# $NetBSD: Makefile,v 1.29 2005/06/01 18:03:25 jlam Exp $ # PKGNAME= sawfish-${SF_VERS} @@ -20,6 +20,8 @@ INFO_FILES= sawfish.info PLIST_SUBST+= SF_VERS=${SF_VERS} +.include "../../mk/x11.buildlink3.mk" + post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/sawfish/themes ${TOUCH} ${PREFIX}/share/sawfish/themes/.directory diff --git a/wm/sawfish/Makefile.common b/wm/sawfish/Makefile.common index 165b9e3f430..bd422fa2ace 100644 --- a/wm/sawfish/Makefile.common +++ b/wm/sawfish/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.25 2005/05/31 22:12:18 wiz Exp $ +# $NetBSD: Makefile.common,v 1.26 2005/06/01 18:03:25 jlam Exp $ DISTNAME= sawfish-${SF_VERS}-gtk1 SF_VERS= 1.2 @@ -10,7 +10,6 @@ HOMEPAGE= http://sawmill.sourceforge.net/ DEPENDS+= rep-gtk>=0.15nb2:../../x11/rep-gtk -USE_X11= # defined USE_DIRS+= xdg-1.1 USE_PKGLOCALEDIR= # defined USE_TOOLS+= gmake diff --git a/wm/skippy/Makefile b/wm/skippy/Makefile index f562b6115f3..ee30a4756ba 100644 --- a/wm/skippy/Makefile +++ b/wm/skippy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/04/11 21:47:49 tv Exp $ +# $NetBSD: Makefile,v 1.3 2005/06/01 18:03:25 jlam Exp $ # DISTNAME= skippy-0.5.0 @@ -10,7 +10,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://thegraveyard.org/skippy.php COMMENT= Fullscreen task switcher for X11 -USE_X11= yes EGDIR= ${PREFIX}/share/examples/${PKGBASE} diff --git a/wm/waimea/Makefile b/wm/waimea/Makefile index 0f0d4e5ad15..78b70cb4bfd 100644 --- a/wm/waimea/Makefile +++ b/wm/waimea/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/05/22 20:08:44 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2005/06/01 18:03:25 jlam Exp $ # DISTNAME= waimea-0.4.0 @@ -13,7 +13,6 @@ COMMENT= Fast and highly customizable virtual window manager GNU_CONFIGURE= YES USE_TOOLS+= gmake USE_PERL5= run -USE_X11= YES .include "../../mk/bsd.prefs.mk" diff --git a/wm/wampager/Makefile b/wm/wampager/Makefile index 6e4fc3e4d42..99af0077c30 100644 --- a/wm/wampager/Makefile +++ b/wm/wampager/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/04/11 21:47:49 tv Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:26 jlam Exp $ # DISTNAME= wampager-0.9.1 @@ -11,7 +11,6 @@ COMMENT= Virtual pager dockapp for the Waimea Window Manager DEPENDS= waimea>=0.4.0:../../wm/waimea -USE_X11= YES do-build: @${ECHO} "${CC} ${CFLAGS} wampager.c -o wampager ${LDFLAGS} \ diff --git a/wm/weewm/Makefile b/wm/weewm/Makefile index dab8d940d50..9c8b1b09b10 100644 --- a/wm/weewm/Makefile +++ b/wm/weewm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/04/11 21:47:49 tv Exp $ +# $NetBSD: Makefile,v 1.3 2005/06/01 18:03:26 jlam Exp $ # DISTNAME= weewm-0.0.2 @@ -10,11 +10,12 @@ MAINTAINER= minskim@NetBSD.org HOMEPAGE= http://www.weewm.org/ COMMENT= Fast and ultra light windowmanager with total keyboard control -USE_X11= yes EXAMPLESDIR= ${PREFIX}/share/examples/weewm DOCDIR= ${PREFIX}/share/doc/weewm +.include "../../mk/x11.buildlink3.mk" + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/weewm ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/weewm.1 ${PREFIX}/man/man1 diff --git a/wm/whiteBOX/Makefile b/wm/whiteBOX/Makefile index 85f86a89780..52e3a296108 100644 --- a/wm/whiteBOX/Makefile +++ b/wm/whiteBOX/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:44 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2005/06/01 18:03:26 jlam Exp $ # DISTNAME= whiteBOX-0.5 @@ -10,7 +10,6 @@ MAINTAINER= jschauma@NetBSD.org HOMEPAGE= http://whitebox.sourceforge.net/ COMMENT= Multi-purpose configuration tool for Blackbox -USE_X11= YES USE_TOOLS+= gmake GNU_CONFIGURE= YES USE_LIBTOOL= YES diff --git a/wm/windowlab/Makefile b/wm/windowlab/Makefile index 739dd179ca1..9a4d96c5a89 100644 --- a/wm/windowlab/Makefile +++ b/wm/windowlab/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:44 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/06/01 18:03:26 jlam Exp $ # DISTNAME= windowlab-1.12 @@ -13,7 +13,6 @@ COMMENT= Small and simple window manager USE_PKGINSTALL= YES USE_TOOLS+= gmake -USE_X11= YES PKG_SYSCONFSUBDIR= windowlab diff --git a/wm/windowmaker/Makefile b/wm/windowmaker/Makefile index c441d4da6ac..7dd1ec8fed8 100644 --- a/wm/windowmaker/Makefile +++ b/wm/windowmaker/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.52 2005/04/16 22:55:22 kristerw Exp $ +# $NetBSD: Makefile,v 1.53 2005/06/01 18:03:26 jlam Exp $ DISTNAME= WindowMaker-0.91.0 PKGNAME= ${DISTNAME:S/WindowMaker/windowmaker/} @@ -15,7 +15,6 @@ COMMENT= GNUStep-compliant NEXTSTEP(tm) window manager clone BUILD_USES_MSGFMT= YES USE_PKGINSTALL= YES -USE_X11= YES USE_PKGLOCALEDIR= YES USE_LIBTOOL= YES GNU_CONFIGURE= YES diff --git a/wm/wm2/Makefile b/wm/wm2/Makefile index ce165402188..8ff43b58dfa 100644 --- a/wm/wm2/Makefile +++ b/wm/wm2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/04/11 21:47:49 tv Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/01 18:03:26 jlam Exp $ DISTNAME= wm2-4 PKGNAME= wm2-4.0 @@ -15,6 +15,8 @@ USE_LANGUAGES= c c++ USE_X11BASE= YES MAKE_ENV+= CCC="${CXX}" +.include "../../mk/x11.buildlink3.mk" + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/wm2 ${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/man/cat1/wm2.0 diff --git a/wm/wmctrl/Makefile b/wm/wmctrl/Makefile index 5c4e32f0160..0bcc9c40742 100644 --- a/wm/wmctrl/Makefile +++ b/wm/wmctrl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/04/11 21:47:49 tv Exp $ +# $NetBSD: Makefile,v 1.5 2005/06/01 18:03:26 jlam Exp $ DISTNAME= wmctrl-1.05 PKGREVISION= 1 @@ -11,9 +11,9 @@ COMMENT= Command line interface to an EWMH-compliant WM GNU_CONFIGURE= YES USE_PKGLOCALEDIR= YES -USE_X11= YES .include "../../devel/glib2/buildlink3.mk" .include "../../devel/pkgconfig/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/wmextra/Makefile b/wm/wmextra/Makefile index f930854558f..8b8498a545c 100644 --- a/wm/wmextra/Makefile +++ b/wm/wmextra/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/04/24 22:46:12 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2005/06/01 18:03:26 jlam Exp $ # DISTNAME= WindowMaker-extra-0.1 @@ -16,4 +16,5 @@ DEPENDS+= windowmaker>=0.80.0nb1:../../wm/windowmaker USE_X11BASE= yes GNU_CONFIGURE= yes +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/wmi/Makefile b/wm/wmi/Makefile index 404841516c3..a5be4b1cba2 100644 --- a/wm/wmi/Makefile +++ b/wm/wmi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/04/11 21:47:49 tv Exp $ +# $NetBSD: Makefile,v 1.8 2005/06/01 18:03:26 jlam Exp $ # DISTNAME= wmi-10 @@ -10,7 +10,6 @@ HOMEPAGE= http://wmi.modprobe.de/ COMMENT= Minimalist, flexible and highly customizable window manager USE_LANGUAGES= c c++ -USE_X11= yes GNU_CONFIGURE= yes .include "../../fonts/Xft2/buildlink3.mk" diff --git a/wm/wmthemes/Makefile b/wm/wmthemes/Makefile index a0cd96e65c7..9824c2a23b1 100644 --- a/wm/wmthemes/Makefile +++ b/wm/wmthemes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2004/01/20 12:27:35 agc Exp $ +# $NetBSD: Makefile,v 1.20 2005/06/01 18:03:26 jlam Exp $ # # There is no distinfo file because users can specify alternate themes @@ -38,6 +38,8 @@ SITES_${theme}.tar.gz= http://download.freshmeat.net/themes/${theme:C/-[^-]*$//} .endfor .undef theme +.include "../../mk/x11.buildlink3.mk" + do-install: @${RM} -f ${PLIST_SRC} @${TOUCH} ${PLIST_SRC} diff --git a/www/amaya/Makefile b/www/amaya/Makefile index 6111eec6ab6..d1cf50e6581 100644 --- a/www/amaya/Makefile +++ b/www/amaya/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2005/05/22 20:08:44 jlam Exp $ +# $NetBSD: Makefile,v 1.39 2005/06/01 18:03:26 jlam Exp $ DISTNAME= amaya-fullsrc-9.0 PKGNAME= ${DISTNAME:S/-fullsrc//} @@ -16,7 +16,6 @@ EXTRACT_ELEMENTS= Amaya libwww WRKSRC= ${WRKDIR}/Amaya/work USE_TOOLS+= gmake -USE_X11= yes GNU_CONFIGURE= yes CONFIGURE_SCRIPT= ../configure CONFIGURE_ARGS+= --without-graphic-libs # Use pkgsrc libraries diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile index 62cc601ed2c..9beb99ddb35 100644 --- a/www/bluefish/Makefile +++ b/www/bluefish/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2005/05/22 20:08:44 jlam Exp $ +# $NetBSD: Makefile,v 1.52 2005/06/01 18:03:26 jlam Exp $ DISTNAME= bluefish-1.0 PKGREVISION= 1 @@ -20,7 +20,6 @@ BUILD_USES_MSGFMT= YES USE_DIRS+= xdg-1.1 USE_TOOLS+= gmake USE_PKGLOCALEDIR= yes -USE_X11= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-icon-path=${PREFIX}/share/pixmaps diff --git a/www/dillo/Makefile b/www/dillo/Makefile index 37595fafcc2..c6a3727bb51 100644 --- a/www/dillo/Makefile +++ b/www/dillo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2005/04/11 21:47:52 tv Exp $ +# $NetBSD: Makefile,v 1.27 2005/06/01 18:03:26 jlam Exp $ DISTNAME= dillo-0.8.4 CATEGORIES= www @@ -10,7 +10,6 @@ HOMEPAGE= http://dillo.auriga.wearlab.de/ COMMENT= Very small and fast graphical web-browser USE_PKGINSTALL= yes -USE_X11= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --sysconfdir=${PKG_SYSCONFDIR} diff --git a/www/galeon/Makefile b/www/galeon/Makefile index 2811249c90d..71e0550c484 100644 --- a/www/galeon/Makefile +++ b/www/galeon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.78 2005/05/31 15:43:56 drochner Exp $ +# $NetBSD: Makefile,v 1.79 2005/06/01 18:03:26 jlam Exp $ # DISTNAME= galeon-1.3.21 @@ -19,7 +19,6 @@ USE_TOOLS+= gmake USE_PKGINSTALL= yes USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes -USE_X11= yes GNU_CONFIGURE= yes MOZILLA_USE_GTK2= # defined MOZILLA_USE_XFT= YES diff --git a/www/glibwww/Makefile b/www/glibwww/Makefile index e0ef7613aad..ba7cf56fe97 100644 --- a/www/glibwww/Makefile +++ b/www/glibwww/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/04/11 21:47:53 tv Exp $ +# $NetBSD: Makefile,v 1.22 2005/06/01 18:03:26 jlam Exp $ # DISTNAME= glibwww-0.2 @@ -10,7 +10,6 @@ MAINTAINER= rh@NetBSD.org HOMEPAGE= http://www.gnome.org/ COMMENT= Event register functions that use the glib event loop -USE_X11= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig diff --git a/www/grail/Makefile b/www/grail/Makefile index 3c57d0272d9..ae5a4a8d801 100644 --- a/www/grail/Makefile +++ b/www/grail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/04/11 21:47:53 tv Exp $ +# $NetBSD: Makefile,v 1.21 2005/06/01 18:03:26 jlam Exp $ # DISTNAME= grail-0.6 @@ -11,7 +11,6 @@ MAINTAINER= tsarna@NetBSD.org HOMEPAGE= http://grail.sourceforge.net/ COMMENT= Grail(TM) is a web browser written in Python -USE_X11= yes NO_CONFIGURE= yes NO_BUILD= yes diff --git a/www/htmldoc-x11/Makefile b/www/htmldoc-x11/Makefile index 21bd0aa4fe4..a40fea61aa0 100644 --- a/www/htmldoc-x11/Makefile +++ b/www/htmldoc-x11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2004/10/03 00:18:26 tv Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:26 jlam Exp $ # .include "../htmldoc/Makefile.common" @@ -9,7 +9,6 @@ COMMENT= Converts HTML to indexed HTML, PDF and/or PostScript (GUI available) CONFLICTS= htmldoc-[0-9]* -USE_X11= # defined CONFIGURE_ARGS+= --with-gui --with-x .include "../../x11/fltk/buildlink3.mk" diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile index b38a478b610..dd4e9cebf73 100644 --- a/www/libgtkhtml/Makefile +++ b/www/libgtkhtml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2005/05/22 20:08:45 jlam Exp $ +# $NetBSD: Makefile,v 1.30 2005/06/01 18:03:26 jlam Exp $ # DISTNAME= libgtkhtml-2.6.3 @@ -15,7 +15,6 @@ BUILD_USES_MSGFMT= yes GNU_CONFIGURE= yes USE_TOOLS+= gmake USE_LIBTOOL= yes -USE_X11= yes PKGCONFIG_OVERRIDE= libgtkhtml-2.0.pc.in diff --git a/www/liferea/Makefile b/www/liferea/Makefile index 58c21d5c7d7..9b37bb86fe4 100644 --- a/www/liferea/Makefile +++ b/www/liferea/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:45 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2005/06/01 18:03:26 jlam Exp $ DISTNAME= liferea-0.6.4 CATEGORIES= www @@ -13,7 +13,6 @@ USE_DIRS+= xdg-1.1 USE_TOOLS+= gmake USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes -USE_X11= yes SHLIBTOOL_OVERRIDE= libtool diff --git a/www/links-gui/Makefile b/www/links-gui/Makefile index 730b8cd6104..30fdd2f62da 100644 --- a/www/links-gui/Makefile +++ b/www/links-gui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2005/02/26 10:08:11 wiz Exp $ +# $NetBSD: Makefile,v 1.34 2005/06/01 18:03:26 jlam Exp $ # PKGNAME= links-gui-2.1.0.17 @@ -7,7 +7,6 @@ COMMENT= Lynx-like text and graphics WWW browser CONFLICTS+= links-[0-9]* elinks-0.3* -USE_X11= YES CONFIGURE_ARGS+= --enable-graphics CONFIGURE_ARGS+= --without-sdl @@ -15,5 +14,6 @@ CONFIGURE_ARGS+= --without-sdl .include "../../www/links/Makefile.common" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/mMosaic/Makefile b/www/mMosaic/Makefile index dbb9bc2fa77..1771d8af3b9 100644 --- a/www/mMosaic/Makefile +++ b/www/mMosaic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/04/11 21:47:54 tv Exp $ +# $NetBSD: Makefile,v 1.10 2005/06/01 18:03:26 jlam Exp $ # DISTNAME= mMosaic-3.7.2 @@ -11,7 +11,6 @@ HOMEPAGE= http://perso.enst.fr/~dauphin/mMosaic/ COMMENT= Modern derivative of NCSA XMosaic WRKSRC= ${WRKDIR}/mMosaic-src-3.7.2 -USE_X11= YES do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/mMosaic ${PREFIX}/bin/ diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common index d00e9477e4e..ba511646634 100644 --- a/www/mozilla/Makefile.common +++ b/www/mozilla/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.55 2005/05/22 20:08:45 jlam Exp $ +# $NetBSD: Makefile.common,v 1.56 2005/06/01 18:03:26 jlam Exp $ MOZ_DIST_VER?= ${MOZ_VER} DISTNAME?= mozilla-${MOZ_DIST_VER}-source @@ -17,7 +17,6 @@ WRKSRC= ${WRKDIR}/mozilla USE_LANGUAGES= c c++ USE_PERL5= build USE_TOOLS+= gmake -USE_X11= yes GNU_CONFIGURE= yes CONFIG_GUESS_OVERRIDE= build/autoconf/config.guess diff --git a/www/navigator3/Makefile b/www/navigator3/Makefile index fd6703bbced..c4a11532e37 100644 --- a/www/navigator3/Makefile +++ b/www/navigator3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2004/01/20 12:27:59 agc Exp $ +# $NetBSD: Makefile,v 1.14 2005/06/01 18:03:27 jlam Exp $ DISTNAME= netscape-v304-export.x86-unknown-bsd PKGNAME= navigator3-3.04 @@ -22,6 +22,8 @@ USE_X11BASE= YES SCRIPTS_ENV+= MACHINE_ARCH=${MACHINE_ARCH} NO_BUILD= YES +.include "../../mk/x11.buildlink3.mk" + pre-configure: cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure diff --git a/www/ns-remote/Makefile b/www/ns-remote/Makefile index af1420dd39c..d44327a7226 100644 --- a/www/ns-remote/Makefile +++ b/www/ns-remote/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/04/11 21:47:54 tv Exp $ +# $NetBSD: Makefile,v 1.25 2005/06/01 18:03:27 jlam Exp $ DISTNAME= ns-remote PKGNAME= ns-remote-1.10 @@ -12,10 +12,11 @@ COMMENT= Remote-control of Netscape and Mozilla-based browsers DIST_SUBDIR= netscape -USE_X11= # defined LDFLAGS.SunOS= -lsocket -lnsl +.include "../../mk/x11.buildlink3.mk" + do-extract: ${MKDIR} ${WRKSRC} .for distfile in ${DISTFILES} diff --git a/www/p5-Apache-Gallery/Makefile b/www/p5-Apache-Gallery/Makefile index 08a4b0a97c6..3503895af44 100644 --- a/www/p5-Apache-Gallery/Makefile +++ b/www/p5-Apache-Gallery/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/04/11 21:47:55 tv Exp $ +# $NetBSD: Makefile,v 1.25 2005/06/01 18:03:27 jlam Exp $ # DISTNAME= Apache-Gallery-0.9.1 @@ -21,7 +21,6 @@ DEPENDS+= p5-Text-Template-[0-9]*:../../textproc/p5-Text-Template DEPENDS+= p5-libapreq{,2}-[0-9]*:../../www/${LIBAPREQ} USE_PKGINSTALL= YES -USE_X11= YES USE_PERL5= run PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Apache/Gallery/.packlist @@ -99,6 +98,7 @@ post-install: ${INSTALL_DATA} ${WRKDIR}/${AG}.conf ${AG_EGDIR} .include "../../graphics/imlib2/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/w3m/Makefile.common b/www/w3m/Makefile.common index cc0f945024d..c71c06c928b 100644 --- a/www/w3m/Makefile.common +++ b/www/w3m/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.34 2005/05/22 20:08:46 jlam Exp $ +# $NetBSD: Makefile.common,v 1.35 2005/06/01 18:03:27 jlam Exp $ # DISTNAME= w3m-${W3M_VERS} @@ -62,7 +62,6 @@ CONFIGURE_ARGS+= --enable-keymap=w3m _W3M_USE_IMAGE?= NO .if ${_W3M_USE_IMAGE} == YES -USE_X11= YES CONFIGURE_ARGS+= --enable-image=x11 .else CONFIGURE_ARGS+= --disable-image @@ -128,5 +127,6 @@ post-install: .include "../../graphics/gdk-pixbuf/buildlink3.mk" .endif .include "../../security/openssl/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/9term/Makefile b/x11/9term/Makefile index 53ffb635c86..1e3753ee16c 100644 --- a/x11/9term/Makefile +++ b/x11/9term/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/04/11 21:48:03 tv Exp $ +# $NetBSD: Makefile,v 1.18 2005/06/01 18:03:27 jlam Exp $ DISTNAME= 9term.1.6.3 PKGNAME= 9term-1.6.3 @@ -14,10 +14,10 @@ BUILDLINK_DEPMETHOD.sam= full NOT_FOR_PLATFORM= *-*-alpha #LP64 Problems WRKSRC= ${WRKDIR} -USE_X11= yes MANCOMPRESSED= yes MAKE_ENV+= SAM_DIR=${BUILDLINK_PREFIX.sam} .include "../../editors/sam/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/XFree86-clients/Makefile b/x11/XFree86-clients/Makefile index f37c7c24bcb..f1fdd691013 100644 --- a/x11/XFree86-clients/Makefile +++ b/x11/XFree86-clients/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/04/11 21:48:04 tv Exp $ +# $NetBSD: Makefile,v 1.18 2005/06/01 18:03:27 jlam Exp $ DISTNAME= ${DISTFILES} PKGNAME= XFree86-clients-${XF_VER} @@ -12,7 +12,6 @@ MAINTAINER= xtraeme@NetBSD.org HOMEPAGE= http://www.xfree86.org/ COMMENT= XFree86 client programs and related files -USE_X11= yes DISTINFO_FILE= ${.CURDIR}/../../x11/XFree86-libs/distinfo PATCHDIR= ${.CURDIR}/../../x11/XFree86-libs/patches diff --git a/x11/XFree86-libs/builtin.mk b/x11/XFree86-libs/builtin.mk new file mode 100644 index 00000000000..de25ce940b9 --- /dev/null +++ b/x11/XFree86-libs/builtin.mk @@ -0,0 +1,73 @@ +# $NetBSD: builtin.mk,v 1.1 2005/06/01 18:03:27 jlam Exp $ + +BUILTIN_PKG:= XFree86-libs + +BUILTIN_FIND_FILES_VAR:= CF_XFREE86 +BUILTIN_FIND_FILES.CF_XFREE86= ${X11BASE}/lib/X11/config/xfree86.cf + +.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.XFree86-libs) +IS_BUILTIN.XFree86-libs= no +. if exists(${CF_XFREE86}) +IS_BUILTIN.XFree86-libs= yes +. endif +.endif +MAKEVARS+= IS_BUILTIN.XFree86-libs + +### +### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to +### a package name to represent the built-in package. +### +.if !defined(BUILTIN_PKG.XFree86-libs) && \ + !empty(IS_BUILTIN.XFree86-libs:M[yY][eE][sS]) && \ + exists(${CF_XFREE86}) +. include "${BUILDLINK_PKGSRCDIR.XFree86-libs}/version.mk" +BUILTIN_PKG.XFree86-libs= XFree86-libs-${BUILTIN_X11_VERSION.XFree86} +.endif +MAKEVARS+= BUILTIN_PKG.XFree86-libs + +### +### 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.XFree86-libs) +. if ${PREFER.XFree86-libs} == "pkgsrc" +USE_BUILTIN.XFree86-libs= no +. else +USE_BUILTIN.XFree86-libs= ${IS_BUILTIN.XFree86-libs} +. if defined(BUILTIN_PKG.XFree86-libs) && \ + !empty(IS_BUILTIN.XFree86-libs:M[yY][eE][sS]) +USE_BUILTIN.XFree86-libs= yes +. for _dep_ in ${BUILDLINK_DEPENDS.XFree86-libs} +. if !empty(USE_BUILTIN.XFree86-libs:M[yY][eE][sS]) +USE_BUILTIN.XFree86-libs!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.XFree86-libs:Q}; then \ + ${ECHO} yes; \ + else \ + ${ECHO} no; \ + fi +. endif +. endfor +. endif +. endif # PREFER.XFree86-libs +.endif +MAKEVARS+= USE_BUILTIN.XFree86-libs + +### +### The section below only applies if we are not including this file +### solely to determine whether a built-in implementation exists. +### +CHECK_BUILTIN.XFree86-libs?= no +.if !empty(CHECK_BUILTIN.XFree86-libs:M[nN][oO]) + +. if !empty(USE_BUILTIN.XFree86-libs:M[yY][eE][sS]) +BUILDLINK_PREFIX.XFree86-libs= ${X11BASE} +BUILDLINK_FILES.XFree86-libs+= lib/pkgconfig/XFree86-libs.pc +. endif + +.endif # CHECK_BUILTIN.XFree86-libs diff --git a/x11/XFree86-libs/version.mk b/x11/XFree86-libs/version.mk new file mode 100644 index 00000000000..dace44d7750 --- /dev/null +++ b/x11/XFree86-libs/version.mk @@ -0,0 +1,41 @@ +# $NetBSD: version.mk,v 1.1 2005/06/01 18:03:27 jlam Exp $ +# +# This Makefile fragment is included by Makefiles that need to access +# the X11_TYPE and version number of a XFree86 distribution. +# +# The following variables are provided by this file: +# +# BUILTIN_X11_TYPE.XFree86 is the X11_TYPE of the XFree86 distribution +# and is simply "XFree86". +# +# BUILTIN_X11_VERSION.XFree86 is the version number of the XFree86 +# distribution detected on the system. +# + +BUILTIN_X11_TYPE.XFree86= XFree86 + +BUILTIN_FILES_VAR:= CF_XFREE86 CF_XFREE86_VERSION +BUILTIN_FILES.CF_XFREE86= ${X11BASE}/lib/X11/config/xfree86.cf +BUILTIN_FILES.CF_XFREE86_VERSION= ${X11BASE}/lib/X11/config/version.def +.include "../../mk/buildlink3/find-files.mk" + +.if !defined(BUILTIN_X11_VERSION.XFree86) && \ + exists(${CF_XFREE86}) && exists(${CF_XFREE86_VERSION}) +BUILTIN_X11_VERSION.XFree86!= \ + ${AWK} '/\#define[ ]*XF86_VERSION_MAJOR/ { M = $$3 } \ + /\#define[ ]*XF86_VERSION_MINOR/ { m = "."$$3 } \ + /\#define[ ]*XF86_VERSION_PATCH/ { p = "."$$3 } \ + /\#define[ ]*XF86_VERSION_SNAP/ { s = "."$$3 } \ + /\#define[ ]*XFree86Version/ { \ + V = $$3; \ + if (M == "") M = int(V / 1000) % 10; \ + if (m == "") m = "."(int(V / 100) % 10); \ + if (p == "") p = "."(int(V / 10) % 10); \ + if (s == "") s = "."(V % 10); \ + } \ + END { if (s == ".0") s = ""; \ + if (p == ".0" && s == "") p = ""; \ + printf "%s%s%s%s\n", M, m, p, s }' \ + ${CF_XFREE86_VERSION} +.endif +MAKEVARS+= BUILTIN_X11_VERSION.XFree86 diff --git a/x11/XFree86-server/Makefile b/x11/XFree86-server/Makefile index 1c6eb41fa8b..d7c2939921f 100644 --- a/x11/XFree86-server/Makefile +++ b/x11/XFree86-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/04/11 21:48:04 tv Exp $ +# $NetBSD: Makefile,v 1.16 2005/06/01 18:03:27 jlam Exp $ DISTNAME= ${DISTFILES} PKGNAME= XFree86-server-${XF_VER} @@ -12,7 +12,6 @@ MAINTAINER= xtraeme@NetBSD.org HOMEPAGE= http://www.xfree86.org/ COMMENT= XFree86 X server and related programs -USE_X11= yes DISTINFO_FILE= ${.CURDIR}/../../x11/XFree86-libs/distinfo PATCHDIR= ${.CURDIR}/../../x11/XFree86-libs/patches @@ -52,5 +51,6 @@ post-install: .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../meta-pkgs/XFree86/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/x11/XaoS/Makefile b/x11/XaoS/Makefile index 71d95d25f83..46ba0df05ee 100644 --- a/x11/XaoS/Makefile +++ b/x11/XaoS/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:46 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2005/06/01 18:03:27 jlam Exp $ # DISTNAME= XaoS-3.1 @@ -13,7 +13,6 @@ COMMENT= Zoomable fractal rendering doodad PKG_INSTALLATION_TYPES= overwrite pkgviews USE_TOOLS= gmake USE_PKGLOCALEDIR= YES -USE_X11= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --with-curses-driver=no # DGA fails to link somehow, XXX should be fixed @@ -28,4 +27,5 @@ SUBST_SED.paths= -e 's,/usr/share/locale,${PREFIX}/${PKGLOCALEDIR}/locale,g' .include "../../devel/gettext-lib/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/Xaw-Xpm/buildlink3.mk b/x11/Xaw-Xpm/buildlink3.mk index 35de7df03ee..3e559a05d28 100644 --- a/x11/Xaw-Xpm/buildlink3.mk +++ b/x11/Xaw-Xpm/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/08/27 18:53:58 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2005/06/01 18:03:27 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XAW_XPM_BUILDLINK3_MK:= ${XAW_XPM_BUILDLINK3_MK}+ @@ -16,6 +16,7 @@ BUILDLINK_PKGSRCDIR.Xaw-Xpm?= ../../x11/Xaw-Xpm .endif # XAW_XPM_BUILDLINK3_MK .include "../../mk/bsd.prefs.mk" +.include "../../graphics/xpm/buildlink3.mk" LIBXAW?= -L${BUILDLINK_PREFIX.Xaw-Xpm}/lib \ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.Xaw-Xpm}/lib \ @@ -23,6 +24,4 @@ LIBXAW?= -L${BUILDLINK_PREFIX.Xaw-Xpm}/lib \ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.xpm}/lib \ -lXaw3d -lXpm -.include "../../graphics/xpm/buildlink3.mk" - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/Xaw3d/buildlink3.mk b/x11/Xaw3d/buildlink3.mk index 4a9bcad57cd..ef00e29adc1 100644 --- a/x11/Xaw3d/buildlink3.mk +++ b/x11/Xaw3d/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/08/27 18:53:58 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2005/06/01 18:03:27 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XAW3D_BUILDLINK3_MK:= ${XAW3D_BUILDLINK3_MK}+ @@ -16,6 +16,7 @@ BUILDLINK_PKGSRCDIR.Xaw3d?= ../../x11/Xaw3d .endif # XAW3D_BUILDLINK3_MK .include "../../mk/bsd.prefs.mk" +.include "../../mk/x11.buildlink3.mk" LIBXAW?= -L${BUILDLINK_PREFIX.Xaw3d}/lib \ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.Xaw3d}/lib \ diff --git a/x11/Xbae/Makefile b/x11/Xbae/Makefile index 5b53a70c804..8491b26645e 100644 --- a/x11/Xbae/Makefile +++ b/x11/Xbae/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/04/11 21:48:04 tv Exp $ +# $NetBSD: Makefile,v 1.24 2005/06/01 18:03:27 jlam Exp $ # DISTNAME= xbae-4.51.01 @@ -10,7 +10,6 @@ MAINTAINER= drochner@NetBSD.org HOMEPAGE= http://xbae.sourceforge.net/ COMMENT= Motif-compatible widgets: XbaeMatrix, XbaeCaption, XbaeInput -USE_X11= YES USE_LIBTOOL= YES GNU_CONFIGURE= YES diff --git a/x11/Xcomposite/Makefile b/x11/Xcomposite/Makefile index 293aa7c009d..6db7d599c90 100644 --- a/x11/Xcomposite/Makefile +++ b/x11/Xcomposite/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/04/11 21:48:04 tv Exp $ +# $NetBSD: Makefile,v 1.4 2005/06/01 18:03:27 jlam Exp $ # DISTNAME= libXcomposite-1.0.1 @@ -13,7 +13,6 @@ HOMEPAGE= http://freedesktop.org/ COMMENT= Xcomposite extension (library) USE_LIBTOOL= yes -USE_X11= yes GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE+= xcomposite.pc.in diff --git a/x11/Xcomposite/builtin-imake.mk b/x11/Xcomposite/builtin-imake.mk new file mode 100644 index 00000000000..30158e304ca --- /dev/null +++ b/x11/Xcomposite/builtin-imake.mk @@ -0,0 +1,12 @@ +XCOMM $NetBSD: builtin-imake.mk,v 1.1 2005/06/01 18:03:27 jlam Exp $ + +/* + * Check the value of BuildCompositeLibrary for the presence of + * Xcomposite in the X11 distribution. + */ +builtin-test: +#if BuildCompositeLibrary + @echo yes +#else + @echo no +#endif diff --git a/x11/Xcomposite/builtin.mk b/x11/Xcomposite/builtin.mk index 2d1441d3330..790ae502112 100644 --- a/x11/Xcomposite/builtin.mk +++ b/x11/Xcomposite/builtin.mk @@ -1,13 +1,56 @@ -# $NetBSD: builtin.mk,v 1.4 2004/10/09 06:40:48 xtraeme Exp $ +# $NetBSD: builtin.mk,v 1.5 2005/06/01 18:03:27 jlam Exp $ -_XCOMPOSITE_H= ${X11BASE}/include/X11/extensions/xcomposite.h -_XCOMPOSITE_PC= ${X11BASE}/lib/pkgconfig/xcomposite.pc +BUILTIN_PKG:= Xcomposite +BUILTIN_FIND_FILES_VAR:= H_XCOMPOSITE +BUILTIN_FIND_FILES.H_XCOMPOSITE= \ + ${X11BASE}/include/X11/extensions/xcomposite.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.Xcomposite) -IS_BUILTIN.Xcomposite= no -. if exists(${_XCOMPOSITE_H}) && exists(${_XCOMPOSITE_PC}) -IS_BUILTIN.Xcomposite= yes +IS_BUILTIN.Xcomposite= no +. if exists(${H_XCOMPOSITE}) +PKGSRC_USE_TOOLS+= imake # XXX +IMAKE?= ${X11BASE}/bin/imake # XXX +. if defined(IMAKE) && exists(${IMAKE}) +IS_BUILTIN.Xcomposite!= \ + ${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config \ + -f ${BUILDLINK_PKGSRCDIR.Xcomposite}/builtin-imake.mk \ + -s - | \ + ${MAKE} -f - builtin-test +. endif . endif -.endif # IS_BUILTIN.Xcomposite +.endif +MAKEVARS+= IS_BUILTIN.Xcomposite -USE_BUILTIN.Xcomposite?= ${IS_BUILTIN.Xcomposite} +### +### 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.Xcomposite) +. if ${PREFER.Xcomposite} == "pkgsrc" +USE_BUILTIN.Xcomposite= no +. else +USE_BUILTIN.Xcomposite= ${IS_BUILTIN.Xcomposite} +. if defined(BUILTIN_PKG.Xcomposite) && \ + !empty(IS_BUILTIN.Xcomposite:M[yY][eE][sS]) +USE_BUILTIN.Xcomposite= yes +. for _dep_ in ${BUILDLINK_DEPENDS.Xcomposite} +. if !empty(USE_BUILTIN.Xcomposite:M[yY][eE][sS]) +USE_BUILTIN.Xcomposite!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.Xcomposite:Q}; then \ + ${ECHO} yes; \ + else \ + ${ECHO} no; \ + fi +. endif +. endfor +. endif +. endif # PREFER.Xcomposite +.endif +MAKEVARS+= USE_BUILTIN.Xcomposite diff --git a/x11/Xfixes/Makefile b/x11/Xfixes/Makefile index 8d6e17862b3..8c3f38735ce 100644 --- a/x11/Xfixes/Makefile +++ b/x11/Xfixes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/04/11 21:48:04 tv Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 18:03:27 jlam Exp $ # DISTNAME= libXfixes-2.0.1 @@ -14,7 +14,6 @@ COMMENT= X Fixes extension of X RandR PKG_INSTALLATION_TYPES= overwrite pkgviews -USE_X11= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes @@ -22,4 +21,5 @@ PKGCONFIG_OVERRIDE+= xfixes.pc.in .include "../../devel/pkgconfig/buildlink3.mk" .include "../../x11/fixesext/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/Xfixes/buildlink3.mk b/x11/Xfixes/buildlink3.mk index b295f9d0fbc..b4244804c45 100644 --- a/x11/Xfixes/buildlink3.mk +++ b/x11/Xfixes/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2004/10/03 00:18:28 tv Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2005/06/01 18:03:27 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFIXES_BUILDLINK3_MK:= ${XFIXES_BUILDLINK3_MK}+ @@ -16,6 +16,7 @@ BUILDLINK_RECOMMENDED.Xfixes+= Xfixes>=2.0.1nb1 BUILDLINK_PKGSRCDIR.Xfixes?= ../../x11/Xfixes .endif # XFIXES_BUILDLINK3_MK +.include "../../mk/x11.buildlink3.mk" .include "../../x11/fixesext/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/Xfixes/builtin-imake.mk b/x11/Xfixes/builtin-imake.mk new file mode 100644 index 00000000000..7963f807be3 --- /dev/null +++ b/x11/Xfixes/builtin-imake.mk @@ -0,0 +1,12 @@ +XCOMM $NetBSD: builtin-imake.mk,v 1.1 2005/06/01 18:03:27 jlam Exp $ + +/* + * Check the value of BuildXfixesLibrary for the presence of + * Xfixes in the X11 distribution. + */ +builtin-test: +#if BuildXfixesLibrary + @echo yes +#else + @echo no +#endif diff --git a/x11/Xfixes/builtin.mk b/x11/Xfixes/builtin.mk index 5ca24d4e319..c038a583c23 100644 --- a/x11/Xfixes/builtin.mk +++ b/x11/Xfixes/builtin.mk @@ -1,13 +1,55 @@ -# $NetBSD: builtin.mk,v 1.3 2004/10/09 06:40:48 xtraeme Exp $ +# $NetBSD: builtin.mk,v 1.4 2005/06/01 18:03:27 jlam Exp $ -_H_XFIXES= ${X11BASE}/include/X11/extensions/Xfixes.h -_FIXESEXT_PC= ${X11BASE}/lib/pkgconfig/xfixes.pc +BUILTIN_PKG:= Xfixes +BUILTIN_FIND_FILES_VAR:= H_XFIXES +BUILTIN_FIND_FILES.H_XFIXES= ${X11BASE}/include/X11/extensions/Xfixes.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.Xfixes) -IS_BUILTIN.Xfixes= no -. if exists(${_H_XFIXES}) && exists(${_FIXESEXT_PC}) -IS_BUILTIN.Xfixes= yes +IS_BUILTIN.Xfixes= no +. if exists(${H_XFIXES}) +PKGSRC_USE_TOOLS+= imake # XXX +IMAKE?= ${X11BASE}/bin/imake # XXX +. if defined(IMAKE) && exists(${IMAKE}) +IS_BUILTIN.Xfixes!= \ + ${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config \ + -f ${BUILDLINK_PKGSRCDIR.Xfixes}/builtin-imake.mk \ + -s - | \ + ${MAKE} -f - builtin-test +. endif . endif -.endif # IS_BUILTIN.Xfixes +.endif +MAKEVARS+= IS_BUILTIN.Xfixes -USE_BUILTIN.Xfixes?= ${IS_BUILTIN.Xfixes} +### +### 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.Xfixes) +. if ${PREFER.Xfixes} == "pkgsrc" +USE_BUILTIN.Xfixes= no +. else +USE_BUILTIN.Xfixes= ${IS_BUILTIN.Xfixes} +. if defined(BUILTIN_PKG.Xfixes) && \ + !empty(IS_BUILTIN.Xfixes:M[yY][eE][sS]) +USE_BUILTIN.Xfixes= yes +. for _dep_ in ${BUILDLINK_DEPENDS.Xfixes} +. if !empty(USE_BUILTIN.Xfixes:M[yY][eE][sS]) +USE_BUILTIN.Xfixes!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.Xfixes:Q}; then \ + ${ECHO} yes; \ + else \ + ${ECHO} no; \ + fi +. endif +. endfor +. endif +. endif # PREFER.Xfixes +.endif +MAKEVARS+= USE_BUILTIN.Xfixes diff --git a/x11/Xrandr-mixedcase/buildlink3.mk b/x11/Xrandr-mixedcase/buildlink3.mk index caa2b0851b1..c1fe37e601f 100644 --- a/x11/Xrandr-mixedcase/buildlink3.mk +++ b/x11/Xrandr-mixedcase/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.16 2004/11/08 12:38:19 markd Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2005/06/01 18:03:27 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XRANDR_BUILDLINK3_MK:= ${XRANDR_BUILDLINK3_MK}+ @@ -16,8 +16,6 @@ BUILDLINK_RECOMMENDED.Xrandr+= Xrandr>=1.0.2nb1 BUILDLINK_PKGSRCDIR.Xrandr?= ../../x11/Xrandr .endif # XRANDR_BUILDLINK3_MK -USE_X11= yes - .include "../../x11/randrext/buildlink3.mk" .include "../../x11/Xrender/buildlink3.mk" diff --git a/x11/Xrandr-mixedcase/builtin-imake.mk b/x11/Xrandr-mixedcase/builtin-imake.mk new file mode 100644 index 00000000000..7474999aba3 --- /dev/null +++ b/x11/Xrandr-mixedcase/builtin-imake.mk @@ -0,0 +1,12 @@ +XCOMM $NetBSD: builtin-imake.mk,v 1.1 2005/06/01 18:03:27 jlam Exp $ + +/* + * Check the value of BuildRandRLibrary for the presence of + * Xrandr in the X11 distribution. + */ +builtin-test: +#if BuildRandRLibrary + @echo yes +#else + @echo no +#endif diff --git a/x11/Xrandr-mixedcase/builtin.mk b/x11/Xrandr-mixedcase/builtin.mk index bf91f74e19e..6a9f3f9212d 100644 --- a/x11/Xrandr-mixedcase/builtin.mk +++ b/x11/Xrandr-mixedcase/builtin.mk @@ -1,130 +1,118 @@ -# $NetBSD: builtin.mk,v 1.7 2005/03/01 18:56:43 xtraeme Exp $ +# $NetBSD: builtin.mk,v 1.8 2005/06/01 18:03:27 jlam Exp $ -_X11_TMPL= ${X11BASE}/lib/X11/config/X11.tmpl +BUILTIN_PKG:= Xrandr +BUILTIN_FIND_FILES_VAR:= H_XRANDR +BUILTIN_FIND_FILES.H_XRANDR= ${X11BASE}/include/X11/extensions/Xrandr.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.Xrandr) IS_BUILTIN.Xrandr= no -. if exists(${_X11_TMPL}) +. if exists(${H_XRANDR}) +PKGSRC_USE_TOOLS+= imake # XXX +IMAKE?= ${X11BASE}/bin/imake # XXX +. if defined(IMAKE) && exists(${IMAKE}) IS_BUILTIN.Xrandr!= \ - if ${GREP} -q BuildRandRLibrary ${_X11_TMPL}; then \ - ${ECHO} "yes"; \ - else \ - ${ECHO} "no"; \ - fi -. if !empty(IS_BUILTIN.Xrandr:M[yY][eE][sS]) -# -# Create an appropriate package name for the built-in Xrandr distributed -# with the system. This package name can be used to check against -# BUILDLINK_DEPENDS.<pkg> to see if we need to install the pkgsrc version -# or if the built-in one is sufficient. -# -# Xrandr doesn't provide a method of discovering the version number of -# the software. Match up Xrandr versions with XFree86 versions for an -# approximate determination of the Xrandr version. -# -_XRANDR_VERSIONS= 1.0.2 1.0.1 1.0 0.99 -_XRANDR_0.99= 4.2 4.2.* -_XRANDR_1.0= 4.3 4.3.[0-9] 4.3.[0-9].* 4.3.[1-8][0-9]* 4.3.9[0-8]* -_XRANDR_1.0+= 4.3.99.* 4.[4-9]* 4.[1-9][0-9]* -. if !defined(XF86_VERSION) -XF86_VERSION= 3.3 -. if exists(${X11BASE}/lib/X11/config/xorgversion.def) -_X11_CONFIG_VERSION_DEF= ${X11BASE}/lib/X11/config/xorgversion.def -. elif exists(${X11BASE}/lib/X11/config/xorg.cf) -_X11_CONFIG_VERSION_DEF= ${X11BASE}/lib/X11/config/xorg.cf -_XORG_MAJOR!= \ - ${AWK} '/\#define[ ]*XORG_VERSION_MAJOR/ { print $$3 }' \ - ${_X11_CONFIG_VERSION_DEF} -_XORG_MINOR!= \ - ${AWK} '/\#define[ ]*XORG_VERSION_MINOR/ { print $$3 }' \ - ${_X11_CONFIG_VERSION_DEF} -_XORG_PATCH!= \ - ${AWK} '/\#define[ ]*XORG_VERSION_PATCH/ { print $$3 }' \ - ${_X11_CONFIG_VERSION_DEF} -_XORG_SNAP!= \ - ${AWK} '/\#define[ ]*XORG_VERSION_SNAP/ { print $$3 }' \ - ${_X11_CONFIG_VERSION_DEF} -_XORG_TEENY= ${_XORG_PATCH}.${_XORG_SNAP} -. if !empty(_XORG_TEENY:M0.0) -XF86_VERSION= 4.4 -. else -XF86_VERSION= 4.4.${_XORG_TEENY} -. endif -. elif exists(${X11BASE}/lib/X11/config/version.def) -_X11_CONFIG_VERSION_DEF= ${X11BASE}/lib/X11/config/version.def -_XF86_MAJOR!= \ - ${AWK} '/\#define[ ]*XF86_VERSION_MAJOR/ { print $$3 }' \ - ${_X11_CONFIG_VERSION_DEF} -_XF86_MINOR!= \ - ${AWK} '/\#define[ ]*XF86_VERSION_MINOR/ { print $$3 }' \ - ${_X11_CONFIG_VERSION_DEF} -_XF86_PATCH!= \ - ${AWK} '/\#define[ ]*XF86_VERSION_PATCH/ { print $$3 }' \ - ${_X11_CONFIG_VERSION_DEF} -_XF86_SNAP!= \ - ${AWK} '/\#define[ ]*XF86_VERSION_SNAP/ { print $$3 }' \ - ${_X11_CONFIG_VERSION_DEF} -_XF86_TEENY= ${_XF86_PATCH}.${_XF86_SNAP} -. if !empty(_XF86_TEENY:M0.0) -XF86_VERSION= ${_XF86_MAJOR}.${_XF86_MINOR} -. else -XF86_VERSION= ${_XF86_MAJOR}.${_XF86_MINOR}.${_XF86_TEENY} -. endif -. endif -BUILDLINK_VARS+= XF86_VERSION -. endif # defined(XF86_VERSION) -. for _xrandr_version_ in ${_XRANDR_VERSIONS} -. for _pattern_ in ${_XRANDR_${_xrandr_version_}} -. if !empty(XF86_VERSION:M${_pattern_}) -_XRANDR_VERSION?= ${_xrandr_version_} -. endif -. endfor -. endfor -_XRANDR_VERSION?= 1.0 -BUILTIN_PKG.Xrandr= Xrandr-${_XRANDR_VERSION} -BUILDLINK_VARS+= BUILTIN_PKG.Xrandr + ${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config \ + -f ${BUILDLINK_PKGSRCDIR.Xrandr}/builtin-imake.mk \ + -s - | \ + ${MAKE} -f - builtin-test . endif . endif -BUILDLINK_VARS+= IS_BUILTIN.Xrandr -.endif # IS_BUILTIN.Xrandr +.endif +MAKEVARS+= IS_BUILTIN.Xrandr -.if defined(USE_BUILTIN.randrext) && !empty(USE_BUILTIN.randrext:M[nN][oO]) -USE_BUILTIN.Xrandr= no +### +### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to +### a package name to represent the built-in package. +### +.if !defined(BUILTIN_PKG.Xrandr) && \ + !empty(IS_BUILTIN.Xrandr:M[yY][eE][sS]) && \ + exists(${H_XRANDR}) +# +# Xrandr doesn't provide a method of discovering the version number of +# the software. Match up Xrandr versions with X11 versions for an +# approximate determination of the Xrandr version. +# +_BLTN_XRANDR_VERSIONS= 1.0.2 1.0.1 1.0 0.99 +_BLTN_XRANDR_0.99.XFree86= 4.2 4.2.* +_BLTN_XRANDR_1.0.XFree86= 4.3 4.3.[0-9] 4.3.[0-9].* \ + 4.3.[1-8][0-9]* 4.3.9[0-8]* \ + 4.3.99.* 4.[4-9]* 4.[1-9][0-9]* +_BLTN_XRANDR_1.0.xorg= 6.[7-9]* 6.[1-9][0-9]* +. for _version_ in ${_BLTN_XRANDR_VERSIONS} +. for _pattern_ in ${_BLTN_XRANDR_${_version_}.${BUILTIN_X11_TYPE.${X11_TYPE}}} +. if !empty(BUILTIN_X11_VERSION.${X11_TYPE}:M${_pattern_}) +BUILTIN_VERSION.Xrandr?= ${_version_} +. endif +. endfor +. endfor +. if defined(BUILTIN_VERSION.Xrandr) +BUILTIN_PKG.Xrandr= Xrandr-${BUILTIN_VERSION.Xrandr} +. endif .endif +MAKEVARS+= BUILTIN_PKG.Xrandr + +### +### Determine whether we should use the built-in implementation if it +### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no"). +### +# +# These are dependencies of Xrandr. If we need to use the pkgsrc +# versions of any of these, then also use the pkgsrc version of +# Xrandr. +# .if defined(USE_BUILTIN.Xrender) && !empty(USE_BUILTIN.Xrender:M[nN][oO]) -USE_BUILTIN.Xrandr= no +USE_BUILTIN.Xrender= no +.endif +.if defined(USE_BUILTIN.randrext) && !empty(USE_BUILTIN.randrext:M[nN][oO]) +USE_BUILTIN.randrext= no .endif .if !defined(USE_BUILTIN.Xrandr) -USE_BUILTIN.Xrandr?= ${IS_BUILTIN.Xrandr} - -. if defined(BUILTIN_PKG.Xrandr) +. if ${PREFER.Xrandr} == "pkgsrc" +USE_BUILTIN.Xrandr= no +. else +USE_BUILTIN.Xrandr= ${IS_BUILTIN.Xrandr} +. if defined(BUILTIN_PKG.Xrandr) && \ + !empty(IS_BUILTIN.Xrandr:M[yY][eE][sS]) USE_BUILTIN.Xrandr= yes -. for _depend_ in ${BUILDLINK_DEPENDS.Xrandr} -. if !empty(USE_BUILTIN.Xrandr:M[yY][eE][sS]) -USE_BUILTIN.Xrandr!= \ - if ${PKG_ADMIN} pmatch '${_depend_}' ${BUILTIN_PKG.Xrandr}; then \ - ${ECHO} "yes"; \ +. for _dep_ in ${BUILDLINK_DEPENDS.Xrandr} +. if !empty(USE_BUILTIN.Xrandr:M[yY][eE][sS]) +USE_BUILTIN.Xrandr!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.Xrandr:Q}; then \ + ${ECHO} yes; \ else \ - ${ECHO} "no"; \ + ${ECHO} no; \ fi -. endif -. endfor -. endif -.endif # USE_BUILTIN.Xrandr +. endif +. endfor +. endif +. endif # PREFER.Xrandr +.endif +MAKEVARS+= USE_BUILTIN.Xrandr +### +### The section below only applies if we are not including this file +### solely to determine whether a built-in implementation exists. +### CHECK_BUILTIN.Xrandr?= no .if !empty(CHECK_BUILTIN.Xrandr:M[nN][oO]) -.if !empty(USE_BUILTIN.Xrandr:M[nN][oO]) +. if !empty(USE_BUILTIN.Xrandr:M[nN][oO]) BUILDLINK_DEPENDS.Xrandr+= Xrandr>=1.0.1 BUILDLINK_DEPENDS.Xrender+= Xrender>=0.8 -.endif +. endif -.if !empty(USE_BUILTIN.Xrandr:M[yY][eE][sS]) +. if !empty(USE_BUILTIN.Xrandr:M[yY][eE][sS]) BUILDLINK_PREFIX.Xrandr= ${X11BASE} -USE_BUILTIN.randrext= yes USE_BUILTIN.Xrender= yes -.endif +USE_BUILTIN.randrext= yes +. endif .endif # CHECK_BUILTIN.Xrandr diff --git a/x11/Xrender/buildlink3.mk b/x11/Xrender/buildlink3.mk index de28d094ca8..fb35eb2ba7a 100644 --- a/x11/Xrender/buildlink3.mk +++ b/x11/Xrender/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.32 2004/10/03 00:18:28 tv Exp $ +# $NetBSD: buildlink3.mk,v 1.33 2005/06/01 18:03:27 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XRENDER_BUILDLINK3_MK:= ${XRENDER_BUILDLINK3_MK}+ @@ -16,8 +16,6 @@ BUILDLINK_RECOMMENDED.Xrender+= Xrender>=0.8.4nb1 BUILDLINK_PKGSRCDIR.Xrender?= ../../x11/Xrender .endif # XRENDER_BUILDLINK3_MK -USE_X11= yes - .include "../../x11/render/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/Xrender/builtin-imake.mk b/x11/Xrender/builtin-imake.mk new file mode 100644 index 00000000000..0e225d1d135 --- /dev/null +++ b/x11/Xrender/builtin-imake.mk @@ -0,0 +1,12 @@ +XCOMM $NetBSD: builtin-imake.mk,v 1.1 2005/06/01 18:03:27 jlam Exp $ + +/* + * Check the value of BuildRenderLibrary for the presence of + * Xrender in the X11 distribution. + */ +builtin-test: +#if BuildRenderLibrary + @echo yes +#else + @echo no +#endif diff --git a/x11/Xrender/builtin.mk b/x11/Xrender/builtin.mk index 1e9d43b395a..ad709fc6b36 100644 --- a/x11/Xrender/builtin.mk +++ b/x11/Xrender/builtin.mk @@ -1,127 +1,116 @@ -# $NetBSD: builtin.mk,v 1.6 2005/03/01 18:56:43 xtraeme Exp $ +# $NetBSD: builtin.mk,v 1.7 2005/06/01 18:03:27 jlam Exp $ -_X11_TMPL= ${X11BASE}/lib/X11/config/X11.tmpl +BUILTIN_PKG:= Xrender +BUILTIN_FIND_FILES_VAR:= H_XRENDER +BUILTIN_FIND_FILES.H_XRENDER= ${X11BASE}/include/X11/extensions/Xrender.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.Xrender) IS_BUILTIN.Xrender= no -. if exists(${_X11_TMPL}) +. if exists(${H_XRENDER}) +PKGSRC_USE_TOOLS+= imake # XXX +IMAKE?= ${X11BASE}/bin/imake # XXX +. if defined(IMAKE) && exists(${IMAKE}) IS_BUILTIN.Xrender!= \ - if ${GREP} -q BuildRenderLibrary ${_X11_TMPL}; then \ - ${ECHO} "yes"; \ - else \ - ${ECHO} "no"; \ - fi -. if !empty(IS_BUILTIN.Xrender:M[yY][eE][sS]) -# -# Create an appropriate package name for the built-in Xrender distributed -# with the system. This package name can be used to check against -# BUILDLINK_DEPENDS.<pkg> to see if we need to install the pkgsrc version -# or if the built-in one is sufficient. + ${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config \ + -f ${BUILDLINK_PKGSRCDIR.Xrender}/builtin-imake.mk \ + -s - | \ + ${MAKE} -f - builtin-test +. endif +. endif +.endif +MAKEVARS+= IS_BUILTIN.Xrender + +### +### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to +### a package name to represent the built-in package. +### +.if !defined(BUILTIN_PKG.Xrender) && \ + !empty(IS_BUILTIN.Xrender:M[yY][eE][sS]) && \ + exists(${H_XRENDER}) # # Xrender doesn't provide a method of discovering the version number of -# the software. Match up Xrender versions with XFree86 versions for an +# the software. Match up Xrender versions with X11 versions for an # approximate determination of the Xrender version. # -_XRENDER_VERSIONS= 0.8.3 0.8.2 0.8.1 0.8 0.2 0.1 -_XRENDER_0.1= 4.0 4.0.* 4.1 4.1.[0-9] 4.1.[0-9].* 4.1.[1-8][0-9]* 4.1.9[0-8]* -_XRENDER_0.2= 4.1.99.* 4.2 4.2.[0-9] 4.2.[0-9].* 4.2.[1-8][0-9]* 4.2.9[0-8]* -_XRENDER_0.8= 4.2.99.* 4.3 4.3.[0-9] 4.3.[0-9].* 4.3.[1-8][0-9]* 4.3.9[0-8]* -_XRENDER_0.8+= 4.3.99.* 4.[4-9]* 4.[1-9][0-9]* -. if !defined(XF86_VERSION) -XF86_VERSION= 3.3 -. if exists(${X11BASE}/lib/X11/config/xorgversion.def) -_X11_CONFIG_VERSION_DEF= ${X11BASE}/lib/X11/config/xorgversion.def -. elif exists(${X11BASE}/lib/X11/config/xorg.cf) -_X11_CONFIG_VERSION_DEF= ${X11BASE}/lib/X11/config/xorg.cf -_XORG_MAJOR!= \ - ${AWK} '/\#define[ ]*XORG_VERSION_MAJOR/ { print $$3 }' \ - ${_X11_CONFIG_VERSION_DEF} -_XORG_MINOR!= \ - ${AWK} '/\#define[ ]*XORG_VERSION_MINOR/ { print $$3 }' \ - ${_X11_CONFIG_VERSION_DEF} -_XORG_PATCH!= \ - ${AWK} '/\#define[ ]*XORG_VERSION_PATCH/ { print $$3 }' \ - ${_X11_CONFIG_VERSION_DEF} -_XORG_SNAP!= \ - ${AWK} '/\#define[ ]*XORG_VERSION_SNAP/ { print $$3 }' \ - ${_X11_CONFIG_VERSION_DEF} -_XORG_TEENY= ${_XORG_PATCH}.${_XORG_SNAP} -. if !empty(_XORG_TEENY:M0.0) -XF86_VERSION= 4.4 -. else -XF86_VERSION= 4.4.${_XORG_TEENY} -. endif -. elif exists(${X11BASE}/lib/X11/config/version.def) -_X11_CONFIG_VERSION_DEF= ${X11BASE}/lib/X11/config/version.def -_XF86_MAJOR!= \ - ${AWK} '/\#define[ ]*XF86_VERSION_MAJOR/ { print $$3 }' \ - ${_X11_CONFIG_VERSION_DEF} -_XF86_MINOR!= \ - ${AWK} '/\#define[ ]*XF86_VERSION_MINOR/ { print $$3 }' \ - ${_X11_CONFIG_VERSION_DEF} -_XF86_PATCH!= \ - ${AWK} '/\#define[ ]*XF86_VERSION_PATCH/ { print $$3 }' \ - ${_X11_CONFIG_VERSION_DEF} -_XF86_SNAP!= \ - ${AWK} '/\#define[ ]*XF86_VERSION_SNAP/ { print $$3 }' \ - ${_X11_CONFIG_VERSION_DEF} -_XF86_TEENY= ${_XF86_PATCH}.${_XF86_SNAP} -. if !empty(_XF86_TEENY:M0.0) -XF86_VERSION= ${_XF86_MAJOR}.${_XF86_MINOR} -. else -_F86_VERSION= ${_XF86_MAJOR}.${_XF86_MINOR}.${_XF86_TEENY} -. endif -. endif -BUILDLINK_VARS+= XF86_VERSION -. endif # defined(XF86_VERSION) -. for _xrender_version_ in ${_XRENDER_VERSIONS} -. for _pattern_ in ${_XRENDER_${_xrender_version_}} -. if !empty(XF86_VERSION:M${_pattern_}) -_XRENDER_VERSION?= ${_xrender_version_} -. endif -. endfor -. endfor -_XRENDER_VERSION?= 0.1 -BUILTIN_PKG.Xrender= Xrender-${_XRENDER_VERSION} -BUILDLINK_VARS+= BUILTIN_PKG.Xrender -. endif +_BLTN_XRENDER_VERSIONS= 0.8.3 0.8.2 0.8.1 0.8 0.2 0.1 +_BLTN_XRENDER_0.1.XFree86= 4.0 4.0.* 4.1 4.1.[0-9] 4.1.[0-9].* \ + 4.1.[1-8][0-9]* 4.1.9[0-8]* +_BLTN_XRENDER_0.2.XFree86= 4.1.99.* 4.2 4.2.[0-9] 4.2.[0-9].* \ + 4.2.[1-8][0-9]* 4.2.9[0-8]* +_BLTN_XRENDER_0.8.XFree86= 4.2.99.* 4.3 4.3.[0-9] 4.3.[0-9].* \ + 4.3.[1-8][0-9]* 4.3.9[0-8]* \ + 4.3.99.* 4.[4-9]* 4.[1-9][0-9]* +_BLTN_XRENDER_0.8.xorg= 6.[7-9]* 6.[1-9][0-9]* +. for _version_ in ${_BLTN_XRENDER_VERSIONS} +. for _pattern_ in ${_BLTN_XRENDER_${_version_}.${BUILTIN_X11_TYPE.${X11_TYPE}}} +. if !empty(BUILTIN_X11_VERSION.${X11_TYPE}:M${_pattern_}) +BUILTIN_VERSION.Xrender?= ${_version_} +. endif +. endfor +. endfor +. if defined(BUILTIN_VERSION.Xrender) +BUILTIN_PKG.Xrender= Xrender-${BUILTIN_VERSION.Xrender} . endif -BUILDLINK_VARS+= IS_BUILTIN.Xrender -.endif # IS_BUILTIN.Xrender +.endif +MAKEVARS+= BUILTIN_PKG.Xrender +### +### Determine whether we should use the built-in implementation if it +### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no"). +### +# +# These are dependencies of Xrender. If we need to use the pkgsrc +# versions of any of these, then also use the pkgsrc version of +# Xrender. +# #.if defined(USE_BUILTIN.render) && !empty(USE_BUILTIN.render:M[nN][oO]) -#USE_BUILTIN.Xrender= no +#USE_BUILTIN.render= no #.endif .if !defined(USE_BUILTIN.Xrender) -USE_BUILTIN.Xrender?= ${IS_BUILTIN.Xrender} - -. if defined(BUILTIN_PKG.Xrender) +. if ${PREFER.Xrender} == "pkgsrc" +USE_BUILTIN.Xrender= no +. else +USE_BUILTIN.Xrender= ${IS_BUILTIN.Xrender} +. if defined(BUILTIN_PKG.Xrender) && \ + !empty(IS_BUILTIN.Xrender:M[yY][eE][sS]) USE_BUILTIN.Xrender= yes -. for _depend_ in ${BUILDLINK_DEPENDS.Xrender} -. if !empty(USE_BUILTIN.Xrender:M[yY][eE][sS]) -USE_BUILTIN.Xrender!= \ - if ${PKG_ADMIN} pmatch '${_depend_}' ${BUILTIN_PKG.Xrender}; then \ - ${ECHO} "yes"; \ +. for _dep_ in ${BUILDLINK_DEPENDS.Xrender} +. if !empty(USE_BUILTIN.Xrender:M[yY][eE][sS]) +USE_BUILTIN.Xrender!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.Xrender:Q}; then \ + ${ECHO} yes; \ else \ - ${ECHO} "no"; \ + ${ECHO} no; \ fi -. endif -. endfor -. endif -.endif # USE_BUILTIN.Xrender +. endif +. endfor +. endif +. endif # PREFER.Xrender +.endif +MAKEVARS+= USE_BUILTIN.Xrender +### +### The section below only applies if we are not including this file +### solely to determine whether a built-in implementation exists. +### CHECK_BUILTIN.Xrender?= no .if !empty(CHECK_BUILTIN.Xrender:M[nN][oO]) -.if !empty(USE_BUILTIN.Xrender:M[nN][oO]) +. if !empty(USE_BUILTIN.Xrender:M[nN][oO]) BUILDLINK_DEPENDS.Xrender+= Xrender>=0.8.2 -BUILDLINK_DEPENDS.render+= render>=0.8 -.endif +BUILDLINK_DEPENDS.render+= Xrender>=0.8 +. endif -.if !empty(USE_BUILTIN.Xrender:M[yY][eE][sS]) +. if !empty(USE_BUILTIN.Xrender:M[yY][eE][sS]) BUILDLINK_PREFIX.Xrender= ${X11BASE} USE_BUILTIN.render= yes -.endif +. endif .endif # CHECK_BUILTIN.Xrender diff --git a/x11/aterm/Makefile b/x11/aterm/Makefile index 20185fb89e4..b2c4e0fe44f 100644 --- a/x11/aterm/Makefile +++ b/x11/aterm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/04/11 21:48:04 tv Exp $ +# $NetBSD: Makefile,v 1.22 2005/06/01 18:03:27 jlam Exp $ # DISTNAME= aterm-0.4.2 @@ -13,7 +13,6 @@ COMMENT= Aterm (Afterstep XVT) - a VT102 emulator for the X window system PKG_INSTALLATION_TYPES= overwrite pkgviews USE_PKGINSTALL= YES -USE_X11= YES GNU_CONFIGURE= YES BUILD_DEFS+= ATERM_USE_KANJI ATERM_USE_XTERM_SCROLL BUILD_DEFS+= ATERM_USE_BIG5 ATERM_USE_GREEK diff --git a/x11/bbapm/Makefile b/x11/bbapm/Makefile index cd4ccb344ef..184d06bdc4b 100644 --- a/x11/bbapm/Makefile +++ b/x11/bbapm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2003/12/03 17:41:21 gson Exp $ +# $NetBSD: Makefile,v 1.8 2005/06/01 18:03:27 jlam Exp $ # based on # FreeBSD port: # ID: ports/x11-wm/bbapm/Makefile,v 1.5 2002/09/02 01:30:15 lioux Exp @@ -15,7 +15,6 @@ HOMEPAGE= http://bbtools.windsofstorm.net/ COMMENT= APM monitor for Blackbox GNU_CONFIGURE= yes -USE_X11= yes # For now: # We use i386/apmvar.h; other architectures will require modification @@ -23,6 +22,8 @@ USE_X11= yes # patch-ak ONLY_FOR_PLATFORM= NetBSD-*-i386 Linux-*-* +.include "../../mk/x11.buildlink3.mk" + post-patch: ${SED} -e 's,@PREFIX@,${PREFIX},' ${WRKSRC}/data/bbapm.1.tmp > \ ${WRKSRC}/data/bbapm.1 diff --git a/x11/blt/Makefile b/x11/blt/Makefile index a970b3faccd..1a88e004dce 100644 --- a/x11/blt/Makefile +++ b/x11/blt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/04/11 21:48:04 tv Exp $ +# $NetBSD: Makefile,v 1.14 2005/06/01 18:03:27 jlam Exp $ # DISTNAME= BLT2.4z @@ -13,7 +13,6 @@ COMMENT= Extension to Tcl/Tk PKG_INSTALLATION_TYPES= overwrite pkgviews WRKSRC= ${WRKDIR}/blt2.4z -USE_X11= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --exec-prefix=${PREFIX} CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl}/lib diff --git a/x11/compositeext/builtin.mk b/x11/compositeext/builtin.mk index cba6ad6c6c3..af622262ed8 100644 --- a/x11/compositeext/builtin.mk +++ b/x11/compositeext/builtin.mk @@ -1,15 +1,55 @@ -# $NetBSD: builtin.mk,v 1.4 2004/10/09 06:40:48 xtraeme Exp $ +# $NetBSD: builtin.mk,v 1.5 2005/06/01 18:03:27 jlam Exp $ -_COMPOSITE_H= ${X11BASE}/include/X11/extensions/composite.h -_COMPOSITE_PROTO_H= ${X11BASE}/include/X11/extensions/compositeproto.h -_COMPOSITEEXT_PC= ${X11BASE}/lib/pkgconfig/compositeext.pc +BUILTIN_PKG:= compositeext +BUILTIN_FIND_FILES_VAR:= H_COMPOSITE H_COMPOSITEPROTO +BUILTIN_FIND_FILES.H_COMPOSITE= \ + ${X11BASE}/include/X11/extensions/composite.h +BUILTIN_FIND_FILES.H_COMPOSITEPROTO= \ + ${X11BASE}/include/X11/extensions/compositeproto.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.compositeext) -IS_BUILTIN.compositeext= no -. if exists(${_COMPOSITE_H}) && exists(${_COMPOSITE_PROTO_H}) && \ - exists(${_COMPOSITEEXT_PC}) -IS_BUILTIN.compositeext= yes +IS_BUILTIN.compositeext= no +# +# Here, we skip checking whether the files are under ${LOCALBASE} since +# we'll consider this X11 package to be built-in even if it's a part +# of one of the pkgsrc-installed X11 distributions. +# +. if exists(${H_COMPOSITE}) && exists(${H_COMPOSITEPROTO}) +IS_BUILTIN.compositeext= yes . endif -.endif # IS_BUILTIN.compositeext +.endif +MAKEVARS+= IS_BUILTIN.compositeext -USE_BUILTIN.compositeext?= ${IS_BUILTIN.compositeext} +### +### 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.compositeext) +. if ${PREFER.compositeext} == "pkgsrc" +USE_BUILTIN.compositeext= no +. else +USE_BUILTIN.compositeext= ${IS_BUILTIN.compositeext} +. if defined(BUILTIN_PKG.compositeext) && \ + !empty(IS_BUILTIN.compositeext:M[yY][eE][sS]) +USE_BUILTIN.compositeext= yes +. for _dep_ in ${BUILDLINK_DEPENDS.compositeext} +. if !empty(USE_BUILTIN.compositeext:M[yY][eE][sS]) +USE_BUILTIN.compositeext!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.compositeext:Q}; then \ + ${ECHO} yes; \ + else \ + ${ECHO} no; \ + fi +. endif +. endfor +. endif +. endif # PREFER.compositeext +.endif +MAKEVARS+= USE_BUILTIN.compositeext diff --git a/x11/devilspie/Makefile b/x11/devilspie/Makefile index afd4efb38a6..e5f38d6555f 100644 --- a/x11/devilspie/Makefile +++ b/x11/devilspie/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/05/20 20:56:24 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/01 18:03:27 jlam Exp $ DISTNAME= devilspie-0.10 CATEGORIES= x11 @@ -12,7 +12,6 @@ BUILD_DEPENDS+= libxslt>=1.0:../../textproc/libxslt GNU_CONFIGURE= YES USE_PKGLOCALEDIR= YES -USE_X11= YES post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/devilspie @@ -26,5 +25,6 @@ post-install: .include "../../devel/libwnck/buildlink3.mk" .include "../../devel/pkgconfig/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/dfm/Makefile.common b/x11/dfm/Makefile.common index 9174beba0b3..7e0f4417dea 100644 --- a/x11/dfm/Makefile.common +++ b/x11/dfm/Makefile.common @@ -1,11 +1,10 @@ -# $NetBSD: Makefile.common,v 1.11 2005/04/11 21:48:05 tv Exp $ +# $NetBSD: Makefile.common,v 1.12 2005/06/01 18:03:28 jlam Exp $ # DISTNAME= dfm-0.99.9 MASTER_SITES= http://www.kaisersite.de/dfm/ WRKSRC= ${WRKDIR}/dfm -USE_X11= yes USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-imlib-icons diff --git a/x11/dxpc/Makefile b/x11/dxpc/Makefile index 3026af644dc..71ff07c1838 100644 --- a/x11/dxpc/Makefile +++ b/x11/dxpc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/04/11 21:48:05 tv Exp $ +# $NetBSD: Makefile,v 1.23 2005/06/01 18:03:28 jlam Exp $ DISTNAME= dxpc-3.8.2 CATEGORIES= x11 @@ -8,7 +8,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.vigor.nu/dxpc/ COMMENT= Differential X Protocol Compressor -USE_X11= yes GNU_CONFIGURE= yes .include "../../mk/bsd.prefs.mk" @@ -17,4 +16,5 @@ post-install: @strip ${PREFIX}/bin/dxpc .include "../../archivers/liblzo/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/ebuilder/Makefile b/x11/ebuilder/Makefile index 791e164cf99..c39fbf3e373 100644 --- a/x11/ebuilder/Makefile +++ b/x11/ebuilder/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/05/22 20:08:46 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2005/06/01 18:03:28 jlam Exp $ # DISTNAME= ebuilder-0.56d @@ -11,7 +11,6 @@ HOMEPAGE= http://web.inter.nl.net/users/eavdmeer/index.html COMMENT= GUI builder for the Qt library WRKSRC= ${WRKDIR}/${DISTNAME} -USE_X11= yes USE_TOOLS+= gmake MAKEFILE= GNUmakefile diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile index 58b15249f13..dc3b0ea6fed 100644 --- a/x11/eterm/Makefile +++ b/x11/eterm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2005/04/11 21:48:05 tv Exp $ +# $NetBSD: Makefile,v 1.41 2005/06/01 18:03:28 jlam Exp $ DISTNAME= Eterm-0.9.3 PKGNAME= ${DISTNAME:S/^E/e/} @@ -22,7 +22,6 @@ PIXMAP_FILES= Eterm-bg-scale-1.tar.gz Eterm-bg-scale-2.tar.gz \ USE_LIBTOOL= YES USE_PKGINSTALL= YES -USE_X11= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} @@ -58,5 +57,6 @@ post-extract: .include "../../devel/libast/buildlink3.mk" .include "../../graphics/imlib2/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/fbdesk/Makefile b/x11/fbdesk/Makefile index ad94b12b2e5..8eee0060226 100644 --- a/x11/fbdesk/Makefile +++ b/x11/fbdesk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/04/16 01:12:41 kristerw Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 18:03:28 jlam Exp $ # DISTNAME= fbdesk-1.2.1 @@ -12,7 +12,6 @@ COMMENT= Application that creates and manage icons on your desktop USE_LIBTOOL= YES GNU_CONFIGURE= YES -USE_X11= YES post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/fbdesk diff --git a/x11/fixesext/Makefile b/x11/fixesext/Makefile index d8e9e2cdc00..a73005344c0 100644 --- a/x11/fixesext/Makefile +++ b/x11/fixesext/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/04/11 21:48:05 tv Exp $ +# $NetBSD: Makefile,v 1.10 2005/06/01 18:03:28 jlam Exp $ # DISTNAME= fixesext-2.0.1 @@ -12,10 +12,10 @@ COMMENT= X Fixes extension headers and specification PKG_INSTALLATION_TYPES= overwrite pkgviews -USE_X11= yes GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE+= fixesext.pc.in .include "../../devel/pkgconfig/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/fixesext/builtin.mk b/x11/fixesext/builtin.mk index 8f9f7e911d7..5c2be9fd331 100644 --- a/x11/fixesext/builtin.mk +++ b/x11/fixesext/builtin.mk @@ -1,15 +1,55 @@ -# $NetBSD: builtin.mk,v 1.3 2004/10/09 06:40:48 xtraeme Exp $ +# $NetBSD: builtin.mk,v 1.4 2005/06/01 18:03:28 jlam Exp $ -_H_XFIXESPROTO= ${X11BASE}/include/X11/extensions/xfixesproto.h -_H_XFIXESWIRE= ${X11BASE}/include/X11/extensions/xfixeswire.h -_FIXESEXT_PC= ${X11BASE}/lib/pkgconfig/fixesext.pc +BUILTIN_PKG:= fixesext +BUILTIN_FIND_FILES_VAR:= H_XFIXESPROTO H_XFIXESWIRE +BUILTIN_FIND_FILES.H_XFIXESPROTO= \ + ${X11BASE}/include/X11/extensions/xfixesproto.h +BUILTIN_FIND_FILES.H_XFIXESWIRE= \ + ${X11BASE}/include/X11/extensions/xfixeswire.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.fixesext) -IS_BUILTIN.fixesext= no -. if exists(${_H_XFIXESPROTO}) && exists(${_H_XFIXESWIRE}) && \ - exists(${_FIXESEXT_PC}) -IS_BUILTIN.fixesext= yes +IS_BUILTIN.fixesext= no +# +# Here, we skip checking whether the files are under ${LOCALBASE} since +# we'll consider this X11 package to be built-in even if it's a part +# of one of the pkgsrc-installed X11 distributions. +# +. if exists(${H_XFIXESPROTO}) && exists(${H_XFIXESWIRE}) +IS_BUILTIN.fixesext= yes . endif -.endif # IS_BUILTIN.fixesext +.endif +MAKEVARS+= IS_BUILTIN.fixesext -USE_BUILTIN.fixesext?= ${IS_BUILTIN.fixesext} +### +### 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.fixesext) +. if ${PREFER.fixesext} == "pkgsrc" +USE_BUILTIN.fixesext= no +. else +USE_BUILTIN.fixesext= ${IS_BUILTIN.fixesext} +. if defined(BUILTIN_PKG.fixesext) && \ + !empty(IS_BUILTIN.fixesext:M[yY][eE][sS]) +USE_BUILTIN.fixesext= yes +. for _dep_ in ${BUILDLINK_DEPENDS.fixesext} +. if !empty(USE_BUILTIN.fixesext:M[yY][eE][sS]) +USE_BUILTIN.fixesext!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.fixesext:Q}; then \ + ${ECHO} yes; \ + else \ + ${ECHO} no; \ + fi +. endif +. endfor +. endif +. endif # PREFER.fixesext +.endif +MAKEVARS+= USE_BUILTIN.fixesext diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile index 574a49e0b33..59c5e565a24 100644 --- a/x11/fltk/Makefile +++ b/x11/fltk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2005/05/22 20:08:46 jlam Exp $ +# $NetBSD: Makefile,v 1.47 2005/06/01 18:03:28 jlam Exp $ DISTNAME= fltk-1.1.6-source PKGNAME= ${DISTNAME:S/-source//} @@ -21,7 +21,6 @@ WRKSRC= ${WRKDIR}/${DISTNAME:S/-source//} USE_LANGUAGES= c c++ USE_TOOLS+= gmake USE_LIBTOOL= yes -USE_X11= yes TEST_TARGET= test GNU_CONFIGURE= yes @@ -31,4 +30,5 @@ CONFIGURE_ARGS+= --enable-libtool=${LIBTOOL} .include "../../graphics/glu/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/x11/fltk/buildlink3.mk b/x11/fltk/buildlink3.mk index 38de9df5065..972b83b765c 100644 --- a/x11/fltk/buildlink3.mk +++ b/x11/fltk/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2004/10/03 00:18:29 tv Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2005/06/01 18:03:28 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ FLTK_BUILDLINK3_MK:= ${FLTK_BUILDLINK3_MK}+ @@ -19,5 +19,6 @@ BUILDLINK_FILES.fltk+= include/Fl/* .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/fox/Makefile b/x11/fox/Makefile index 739da3b46c4..d3b4c067bc1 100644 --- a/x11/fox/Makefile +++ b/x11/fox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/04/11 21:48:06 tv Exp $ +# $NetBSD: Makefile,v 1.24 2005/06/01 18:03:28 jlam Exp $ # DISTNAME= fox-1.0.43 @@ -10,7 +10,6 @@ MAINTAINER= sakamoto@NetBSD.org HOMEPAGE= http://www.fox-toolkit.org/ COMMENT= Fast and extensive C++ GUI toolkit -USE_X11= # defined USE_LIBTOOL= # defined GNU_CONFIGURE= # defined USE_LANGUAGES= c c++ @@ -25,4 +24,5 @@ CONFIGURE_ARGS+= --enable-release .include "../../graphics/tiff/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/fspanel/Makefile b/x11/fspanel/Makefile index 2453f0b2146..160e2721ab7 100644 --- a/x11/fspanel/Makefile +++ b/x11/fspanel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/04/11 21:48:06 tv Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/01 18:03:28 jlam Exp $ # DISTNAME= fspanel-0.8beta1 @@ -13,7 +13,6 @@ COMMENT= F***ing Small Panel for listing X11 windows PKG_INSTALLATION_TYPES= overwrite pkgviews -USE_X11= YES HAS_CONFIGURE= YES CFLAGS+= -DHAVE_XPM -DXFT diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index aa72e73ee62..9956f1c6019 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.78 2005/05/31 11:24:33 dillo Exp $ +# $NetBSD: Makefile,v 1.79 2005/06/01 18:03:28 jlam Exp $ # DISTNAME= gdm-2.6.0.9 @@ -23,7 +23,6 @@ USE_DIRS+= gnome2-1.5 USE_PKGINSTALL= YES USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES -USE_X11= YES USE_LIBTOOL= YES PKG_OPTIONS_VAR= PKG_OPTIONS.gdm diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile index d6537516fba..30894c3d4b3 100644 --- a/x11/gnome-desktop/Makefile +++ b/x11/gnome-desktop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2005/05/22 20:08:47 jlam Exp $ +# $NetBSD: Makefile,v 1.37 2005/06/01 18:03:28 jlam Exp $ # DISTNAME= gnome-desktop-2.10.1 @@ -17,7 +17,6 @@ USE_DIRS+= gnome2-1.5 USE_PKGLOCALEDIR= yes USE_TOOLS+= gmake USE_PERL5= yes -USE_X11= yes USE_LIBTOOL= yes BUILDLINK_DEPENDS.glib2+= glib2>=2.6.0 diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile index 01cd63333ae..8210f1c0077 100644 --- a/x11/gnome-libs/Makefile +++ b/x11/gnome-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.109 2005/05/22 20:08:47 jlam Exp $ +# $NetBSD: Makefile,v 1.110 2005/06/01 18:03:28 jlam Exp $ DISTNAME= gnome-libs-1.4.2 PKGREVISION= 4 @@ -14,7 +14,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews BUILD_USES_MSGFMT= YES USE_DIRS+= gnome1-1.5 -USE_X11= YES USE_TOOLS+= gmake USE_LIBTOOL= YES diff --git a/x11/gnome-mag/Makefile b/x11/gnome-mag/Makefile index d337102e0df..9e003accbea 100644 --- a/x11/gnome-mag/Makefile +++ b/x11/gnome-mag/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/05/22 20:08:47 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2005/06/01 18:03:28 jlam Exp $ # DISTNAME= gnome-mag-0.12.0 @@ -14,7 +14,6 @@ USE_DIRS+= gnome2-1.5 USE_TOOLS+= gmake USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes -USE_X11= yes GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE+= gnome-mag-1.0.pc.in diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile index 5a1b044f149..3d077dfbdfd 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2005/05/22 20:08:47 jlam Exp $ +# $NetBSD: Makefile,v 1.52 2005/06/01 18:03:28 jlam Exp $ # DISTNAME= gnome-panel-2.10.1 @@ -15,7 +15,6 @@ USE_DIRS+= gnome2-1.5 USE_TOOLS+= gmake USE_PERL5= YES USE_PKGLOCALEDIR= YES -USE_X11= YES USE_LIBTOOL= YES PKGCONFIG_OVERRIDE= libpanel-applet/libpanelapplet-2.0.pc.in diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile index c84ec1d3e95..9d0d687c7d2 100644 --- a/x11/gnome-session/Makefile +++ b/x11/gnome-session/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2005/05/22 20:08:47 jlam Exp $ +# $NetBSD: Makefile,v 1.51 2005/06/01 18:03:28 jlam Exp $ # DISTNAME= gnome-session-2.10.0 @@ -19,7 +19,6 @@ GNU_CONFIGURE= yes USE_DIRS+= gnome2-1.5 USE_PKGLOCALEDIR= yes USE_TOOLS+= gmake -USE_X11= yes USE_PERL5= build USE_LIBTOOL= yes diff --git a/x11/gnome-themes-extras/Makefile b/x11/gnome-themes-extras/Makefile index 6b7679dcd9d..2529a71bd7b 100644 --- a/x11/gnome-themes-extras/Makefile +++ b/x11/gnome-themes-extras/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:47 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 18:03:28 jlam Exp $ # DISTNAME= gnome-themes-extras-0.8.1 @@ -21,7 +21,6 @@ USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes USE_TOOLS+= gmake -USE_X11= yes BUILDLINK_TRANSFORM+= rm:-DG_DISABLE_DEPRECATED BUILDLINK_TRANSFORM+= rm:-DGTK_DISABLE_DEPRECATED diff --git a/x11/gnome-themes/Makefile b/x11/gnome-themes/Makefile index d345fecaffc..07724e1779d 100644 --- a/x11/gnome-themes/Makefile +++ b/x11/gnome-themes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2005/05/22 20:08:47 jlam Exp $ +# $NetBSD: Makefile,v 1.30 2005/06/01 18:03:28 jlam Exp $ # DISTNAME= gnome-themes-2.10.1 @@ -16,7 +16,6 @@ USE_DIRS+= gnome2-1.5 theme-1.0 USE_TOOLS+= gmake USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes -USE_X11= yes GNU_CONFIGURE= yes .include "../../devel/libgnomeui/buildlink3.mk" diff --git a/x11/gnome2-applets/Makefile b/x11/gnome2-applets/Makefile index 0262354bd0a..52359b65abd 100644 --- a/x11/gnome2-applets/Makefile +++ b/x11/gnome2-applets/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2005/05/22 20:08:47 jlam Exp $ +# $NetBSD: Makefile,v 1.43 2005/06/01 18:03:28 jlam Exp $ # DISTNAME= gnome-applets-2.10.1 @@ -14,7 +14,6 @@ BUILD_USES_MSGFMT= YES GNU_CONFIGURE= yes USE_DIRS+= gnome2-1.5 -USE_X11= yes USE_TOOLS+= gmake USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes diff --git a/x11/gnome2-control-center/Makefile b/x11/gnome2-control-center/Makefile index cc7c578d146..629682d24d6 100644 --- a/x11/gnome2-control-center/Makefile +++ b/x11/gnome2-control-center/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2005/05/22 20:08:47 jlam Exp $ +# $NetBSD: Makefile,v 1.45 2005/06/01 18:03:28 jlam Exp $ # DISTNAME= control-center-2.10.1 @@ -20,7 +20,6 @@ USE_PKGINSTALL= yes USE_PKGLOCALEDIR= yes USE_TOOLS+= gmake USE_LIBTOOL= yes -USE_X11= yes CONFIGURE_ARGS+= --disable-alsa CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} diff --git a/x11/gnome2-terminal/Makefile b/x11/gnome2-terminal/Makefile index 99140b77cf0..6cf94fc5fe6 100644 --- a/x11/gnome2-terminal/Makefile +++ b/x11/gnome2-terminal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2005/05/22 20:08:47 jlam Exp $ +# $NetBSD: Makefile,v 1.39 2005/06/01 18:03:28 jlam Exp $ # DISTNAME= gnome-terminal-2.10.0 @@ -20,7 +20,6 @@ GNU_CONFIGURE= YES USE_DIRS+= gnome2-1.5 USE_PKGLOCALEDIR= YES USE_TOOLS+= gmake -USE_X11= YES USE_LIBTOOL= YES GCONF2_SCHEMAS= gnome-terminal.schemas diff --git a/x11/gnopernicus/Makefile b/x11/gnopernicus/Makefile index e857d8d5a4c..130929a1e88 100644 --- a/x11/gnopernicus/Makefile +++ b/x11/gnopernicus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2005/05/22 20:08:47 jlam Exp $ +# $NetBSD: Makefile,v 1.27 2005/06/01 18:03:28 jlam Exp $ # DISTNAME= gnopernicus-0.10.6 @@ -15,7 +15,6 @@ USE_TOOLS+= gmake USE_PKGINSTALL= yes USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes -USE_X11= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} diff --git a/x11/gnustep-back/Makefile b/x11/gnustep-back/Makefile index 1b105c08d30..32e51a7034d 100644 --- a/x11/gnustep-back/Makefile +++ b/x11/gnustep-back/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/05/16 08:59:57 rh Exp $ +# $NetBSD: Makefile,v 1.26 2005/06/01 18:03:28 jlam Exp $ DISTNAME= gnustep-back-0.9.6 CATEGORIES= x11 gnustep @@ -8,7 +8,6 @@ MAINTAINER= rh@NetBSD.org HOMEPAGE= http://www.gnustep.org/ COMMENT= X11 AppKit backend for GNUstep -USE_X11= yes CONFIGURE_ARGS+= --exec-prefix=${PREFIX}/libexec/GNUstep pre-install: diff --git a/x11/gnustep-gui/Makefile b/x11/gnustep-gui/Makefile index 9e9db59fc43..1abff14cdb6 100644 --- a/x11/gnustep-gui/Makefile +++ b/x11/gnustep-gui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/04/12 15:54:21 adam Exp $ +# $NetBSD: Makefile,v 1.23 2005/06/01 18:03:29 jlam Exp $ DISTNAME= gnustep-gui-0.9.5 CATEGORIES= x11 gnustep @@ -8,7 +8,6 @@ MAINTAINER= rh@NetBSD.org HOMEPAGE= http://www.gnustep.org/ COMMENT= GNUstep AppKit Implementation -USE_X11= yes CONFIGURE_ARGS+= --exec-prefix=${PREFIX}/libexec/GNUstep .include "../../audio/libaudiofile/buildlink3.mk" @@ -29,4 +28,5 @@ PLIST_SUBST+= GSND= .endif .include "../../mk/pthread.buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gnustep-preferences/Makefile b/x11/gnustep-preferences/Makefile index 1bdc4c43ff4..15fd72ff74f 100644 --- a/x11/gnustep-preferences/Makefile +++ b/x11/gnustep-preferences/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/05/22 20:08:47 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2005/06/01 18:03:29 jlam Exp $ # DISTNAME= Preferences-1.2.0 @@ -14,7 +14,6 @@ COMMENT= Application for setting preferences for the GNUstep system NO_CONFIGURE= YES USE_TOOLS+= gmake -USE_X11= YES MAKEFILE= GNUmakefile .include "../../x11/gnustep-back/buildlink3.mk" diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile index 4c308930624..6964f741f52 100644 --- a/x11/gtk/Makefile +++ b/x11/gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.107 2005/05/22 20:08:48 jlam Exp $ +# $NetBSD: Makefile,v 1.108 2005/06/01 18:03:29 jlam Exp $ DISTNAME= gtk+-1.2.10 PKGREVISION= 8 @@ -73,4 +73,5 @@ pre-configure: .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gtk/buildlink3.mk b/x11/gtk/buildlink3.mk index 5b9a35b5c4f..98bd873830f 100644 --- a/x11/gtk/buildlink3.mk +++ b/x11/gtk/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2004/10/03 00:18:33 tv Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2005/06/01 18:03:29 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GTK_BUILDLINK3_MK:= ${GTK_BUILDLINK3_MK}+ @@ -16,9 +16,8 @@ BUILDLINK_RECOMMENDED.gtk+= gtk+>=1.2.10nb8 BUILDLINK_PKGSRCDIR.gtk?= ../../x11/gtk .endif # GTK_BUILDLINK3_MK -USE_X11= yes - .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/gtk2-engines/Makefile b/x11/gtk2-engines/Makefile index d65e34cd3ec..9b5b19cceea 100644 --- a/x11/gtk2-engines/Makefile +++ b/x11/gtk2-engines/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2005/05/10 20:24:07 jmmv Exp $ +# $NetBSD: Makefile,v 1.31 2005/06/01 18:03:29 jlam Exp $ DISTNAME= gtk-engines-2.6.3 PKGNAME= ${DISTNAME:S/gtk/gtk2/} @@ -19,7 +19,6 @@ BUILDLINK_DEPENDS.gtk2+= gtk2+>=2.6.4 GNU_CONFIGURE= yes USE_DIRS+= theme-1.1 xdg-1.1 -USE_X11= yes USE_LIBTOOL= yes PKGCONFIG_OVERRIDE= gtk-engines-2.pc.in diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile index 1219f61c1c3..e07511411e1 100644 --- a/x11/gtk2/Makefile +++ b/x11/gtk2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.83 2005/05/22 20:08:48 jlam Exp $ +# $NetBSD: Makefile,v 1.84 2005/06/01 18:03:29 jlam Exp $ # DISTNAME= gtk+-2.6.7 @@ -24,7 +24,6 @@ BUILDLINK_DEPENDS.Xft2+= Xft2>=2.1.2nb2 USE_DIRS+= xdg-1.1 USE_PKGINSTALL= yes USE_PKGLOCALEDIR= yes -USE_X11= yes USE_TOOLS+= gmake USE_LIBTOOL= yes PTHREAD_AUTO_VARS= yes diff --git a/x11/gtk2/buildlink3.mk b/x11/gtk2/buildlink3.mk index dc012fad48a..f3acf212f1d 100644 --- a/x11/gtk2/buildlink3.mk +++ b/x11/gtk2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.17 2005/04/01 10:51:50 salo Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2005/06/01 18:03:29 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GTK2_BUILDLINK3_MK:= ${GTK2_BUILDLINK3_MK}+ @@ -23,8 +23,6 @@ PRINT_PLIST_AWK+= /^@dirrm lib\/gtk-2.0\/2.4.0\/(engines|filesystems|immodules|l { print "@comment in gtk2: " $$0; next; } .endif # GTK2_BUILDLINK3_MK -USE_X11= yes - .include "../../devel/atk/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" diff --git a/x11/gtkmm/Makefile b/x11/gtkmm/Makefile index b96da9e6516..03096cc817c 100644 --- a/x11/gtkmm/Makefile +++ b/x11/gtkmm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/05/22 20:08:48 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2005/06/01 18:03:29 jlam Exp $ # DISTNAME= gtkmm-2.2.12 @@ -14,7 +14,6 @@ GNU_CONFIGURE= YES USE_LIBTOOL= YES USE_TOOLS+= gmake USE_PERL5= YES -USE_X11= YES USE_LANGUAGES= c c++ PKGCONFIG_OVERRIDE= atk/atkmm-1.0.pc.in diff --git a/x11/gtkmm24/Makefile b/x11/gtkmm24/Makefile index 7f55f46b062..3e84382aebe 100644 --- a/x11/gtkmm24/Makefile +++ b/x11/gtkmm24/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:48 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:29 jlam Exp $ DISTNAME= gtkmm-2.4.8 PKGNAME= gtkmm24-2.4.8 @@ -14,7 +14,6 @@ USE_TOOLS+= gmake USE_LANGUAGES= c c++ USE_LIBTOOL= yes USE_PERL5= yes -USE_X11= yes GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE= atk/atkmm-1.6.pc.in diff --git a/x11/gtkterm2/Makefile b/x11/gtkterm2/Makefile index 3aea7a190b6..c8a876dd740 100644 --- a/x11/gtkterm2/Makefile +++ b/x11/gtkterm2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/04/11 21:48:08 tv Exp $ +# $NetBSD: Makefile,v 1.5 2005/06/01 18:03:29 jlam Exp $ DISTNAME= gtkterm2-0.2.3 CATEGORIES= x11 @@ -10,7 +10,6 @@ COMMENT= Simple GTK-2 terminal with tabs USE_LIBTOOL= YES GNU_CONFIGURE= YES -USE_X11= YES USE_PKGLOCALEDIR= YES .include "../../devel/pkgconfig/buildlink3.mk" diff --git a/x11/gtoolkit/Makefile.common b/x11/gtoolkit/Makefile.common index 85cefd1b21f..fa2d5c97961 100644 --- a/x11/gtoolkit/Makefile.common +++ b/x11/gtoolkit/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.10 2005/04/11 21:48:08 tv Exp $ +# $NetBSD: Makefile.common,v 1.11 2005/06/01 18:03:29 jlam Exp $ # DISTNAME= gtoolkit-0.9.5 @@ -8,7 +8,8 @@ MASTER_SITES?= ftp://ftp.inf.uos.de/pub/elmar/gtk/objc-gtoolkit/ MAINTAINER?= tech-pkg@NetBSD.org HOMEPAGE?= http://www.informatik.uni-osnabrueck.de/elmar/projects/gtoolkit/ -USE_X11= yes USE_LIBTOOL= yes CONFIGURE_ARGS+= --with-gnustep GNUSTEP_MAKEFILE= Makefile.gnustep + +.include "../../mk/x11.buildlink3.mk" diff --git a/x11/hot-babe/Makefile b/x11/hot-babe/Makefile index fb00bd109d6..3480c3bf14a 100644 --- a/x11/hot-babe/Makefile +++ b/x11/hot-babe/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/04/11 21:48:08 tv Exp $ +# $NetBSD: Makefile,v 1.14 2005/06/01 18:03:29 jlam Exp $ DISTNAME= hot-babe-0.1.2 PKGREVISION= 7 @@ -9,7 +9,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://dindinx.net/hotbabe/ COMMENT= System load monitor -USE_X11= yes .include "../../x11/gtk/buildlink3.mk" .include "../../graphics/gdk-pixbuf/buildlink3.mk" diff --git a/x11/hsetroot/Makefile b/x11/hsetroot/Makefile index 7b5d1d83d67..32f4be76bfa 100644 --- a/x11/hsetroot/Makefile +++ b/x11/hsetroot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2005/05/22 09:16:28 jmmv Exp $ +# $NetBSD: Makefile,v 1.2 2005/06/01 18:03:29 jlam Exp $ # DISTNAME= hsetroot-1.0.2 @@ -10,7 +10,7 @@ HOMEPAGE= http://thegraveyard.org/hsetroot.php COMMENT= Allows you to compose wallpapers for X GNU_CONFIGURE= yes -USE_X11= yes .include "../../graphics/imlib2/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/imwheel/Makefile b/x11/imwheel/Makefile index 12486c099ab..2bd1ca22f2f 100644 --- a/x11/imwheel/Makefile +++ b/x11/imwheel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/04/11 21:48:08 tv Exp $ +# $NetBSD: Makefile,v 1.9 2005/06/01 18:03:29 jlam Exp $ # DISTNAME= imwheel-0.9.9 @@ -14,4 +14,5 @@ USE_X11BASE= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --disable-gpm +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/keylaunch/Makefile b/x11/keylaunch/Makefile index 59172d44c1c..4ef4cfcbea9 100644 --- a/x11/keylaunch/Makefile +++ b/x11/keylaunch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:48 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 18:03:29 jlam Exp $ # DISTNAME= keylaunch-1.3.0 @@ -10,9 +10,10 @@ HOMEPAGE= http://www.kensden.pwp.blueyonder.co.uk/Oroborus/download.htm COMMENT= X utility for binding commands to a hot key WRKSRC= ${WRKDIR}/keylaunch -USE_X11= YES USE_TOOLS+= gmake +.include "../../mk/x11.buildlink3.mk" + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/keylaunch ${PREFIX}/bin ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/keylaunch diff --git a/x11/lablgtk/Makefile b/x11/lablgtk/Makefile index 5d348fbd684..854d93a1138 100644 --- a/x11/lablgtk/Makefile +++ b/x11/lablgtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:48 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2005/06/01 18:03:29 jlam Exp $ DISTNAME= lablgtk-1.2.7 CATEGORIES= x11 @@ -9,7 +9,6 @@ HOMEPAGE= http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html COMMENT= GTK+ bindings for ocaml USE_TOOLS+= gmake -USE_X11= YES BUILDLINK_DEPMETHOD.ocaml= full BUILDLINK_DEPENDS.ocaml+= ocaml>=3.0.5 diff --git a/x11/labltk/Makefile b/x11/labltk/Makefile index 8f13f0cdeb8..bab3b8e6cde 100644 --- a/x11/labltk/Makefile +++ b/x11/labltk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2004/12/24 17:19:06 jmmv Exp $ +# $NetBSD: Makefile,v 1.2 2005/06/01 18:03:29 jlam Exp $ .include "../../lang/ocaml/Makefile.common" @@ -6,7 +6,6 @@ PKGNAME= ${DISTNAME:S/ocaml/labltk/} COMMENT= Tk bindings for ocaml -USE_X11= yes CONFIGURE_ARGS+= -x11include ${X11BASE}/include CONFIGURE_ARGS+= -x11lib ${X11BASE}/lib diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile index a26a1274e84..95c30262834 100644 --- a/x11/libxklavier/Makefile +++ b/x11/libxklavier/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/04/11 21:48:11 tv Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 18:03:29 jlam Exp $ # DISTNAME= libxklavier-2.0 @@ -13,7 +13,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews GNU_CONFIGURE= YES USE_LIBTOOL= YES -USE_X11= YES PKGCONFIG_OVERRIDE= libxklavier.pc.in @@ -24,4 +23,5 @@ BUILDLINK_TRANSFORM+= rm:-Werror .include "../../devel/pkgconfig/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/libzvt/Makefile b/x11/libzvt/Makefile index 07f0e180f95..c756ae9076b 100644 --- a/x11/libzvt/Makefile +++ b/x11/libzvt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:48 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2005/06/01 18:03:29 jlam Exp $ # DISTNAME= libzvt-2.0.1 @@ -13,7 +13,6 @@ COMMENT= Virtual Terminal Widget Library for GNOME2 GNU_CONFIGURE= YES USE_TOOLS+= gmake -USE_X11= YES USE_LIBTOOL= YES PKGCONFIG_OVERRIDE= libzvt/libzvt-2.0.pc.in diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile index a6544fe6eac..083acaab824 100644 --- a/x11/mlterm/Makefile +++ b/x11/mlterm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2005/04/11 21:48:11 tv Exp $ +# $NetBSD: Makefile,v 1.31 2005/06/01 18:03:29 jlam Exp $ DISTNAME= mlterm-2.9.2 CATEGORIES= x11 @@ -11,7 +11,6 @@ COMMENT= Multilingual terminal emulator # CODESET is only supported on NetBSD in 1.5T and later - see <langinfo.h> NOT_FOR_PLATFORM= NetBSD-1.[0-4]*-* NetBSD-1.5[A-S]-* -USE_X11= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes diff --git a/x11/mowitz/Makefile b/x11/mowitz/Makefile index 9643ed6ad0b..d9006d10de4 100644 --- a/x11/mowitz/Makefile +++ b/x11/mowitz/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/04/11 21:48:11 tv Exp $ +# $NetBSD: Makefile,v 1.9 2005/06/01 18:03:29 jlam Exp $ DISTNAME= Mowitz-0.2.2 PKGREVISION= 1 @@ -11,7 +11,6 @@ COMMENT= "More widgets" library USE_LIBTOOL= yes GNU_CONFIGURE= yes -USE_X11= yes .include "../../mk/bsd.prefs.mk" diff --git a/x11/mrxvt/Makefile b/x11/mrxvt/Makefile index c0aaa1d0b46..31f8b81a2a1 100644 --- a/x11/mrxvt/Makefile +++ b/x11/mrxvt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/05/28 07:09:59 minskim Exp $ +# $NetBSD: Makefile,v 1.3 2005/06/01 18:03:29 jlam Exp $ # DISTNAME= mrxvt-0.4.1 @@ -13,7 +13,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews GNU_CONFIGURE= YES USE_PKGINSTALL= YES -USE_X11= YES USE_TOOLS+= gmake CONFIGURE_ARGS+= --enable-xft diff --git a/x11/multi-aterm/Makefile b/x11/multi-aterm/Makefile index c1ac42a055e..c22ad3533c4 100644 --- a/x11/multi-aterm/Makefile +++ b/x11/multi-aterm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/04/11 21:48:11 tv Exp $ +# $NetBSD: Makefile,v 1.6 2005/06/01 18:03:29 jlam Exp $ # DISTNAME= multi-aterm-0.0.4 @@ -10,7 +10,6 @@ HOMEPAGE= http://www.materm.tuxfamily.org/ COMMENT= Multi-terminal for the X Window System based on aterm GNU_CONFIGURE= YES -USE_X11= YES CONFIGURE_ARGS+= --enable-mousewheel CONFIGURE_ARGS+= --enable-swapscreen diff --git a/x11/neXtaw/Makefile b/x11/neXtaw/Makefile index 7c2c7791dbc..065ba28dd36 100644 --- a/x11/neXtaw/Makefile +++ b/x11/neXtaw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/04/11 21:48:11 tv Exp $ +# $NetBSD: Makefile,v 1.19 2005/06/01 18:03:29 jlam Exp $ DISTNAME= neXtaw-0.15.1 PKGREVISION= 1 @@ -22,6 +22,8 @@ EGDIR= ${PREFIX}/share/examples/${PKGBASE} GCC_REQD+= 2.95 .endif +.include "../../mk/x11.buildlink3.mk" + post-install: ${INSTALL_DATA_DIR} ${DOCDIR} ${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR} diff --git a/x11/neXtaw/buildlink3.mk b/x11/neXtaw/buildlink3.mk index dd239ea0ef1..35936e76428 100644 --- a/x11/neXtaw/buildlink3.mk +++ b/x11/neXtaw/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:18:36 tv Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2005/06/01 18:03:29 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ NEXTAW_BUILDLINK3_MK:= ${NEXTAW_BUILDLINK3_MK}+ @@ -17,6 +17,7 @@ BUILDLINK_PKGSRCDIR.neXtaw?= ../../x11/neXtaw .endif # NEXTAW_BUILDLINK3_MK .include "../../mk/bsd.prefs.mk" +.include "../../mk/x11.buildlink3.mk" LIBXAW?= -L${BUILDLINK_PREFIX.neXtaw}/lib \ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.neXtaw}/lib \ diff --git a/x11/numlockx/Makefile b/x11/numlockx/Makefile index f687ff91b47..5b950a176ed 100644 --- a/x11/numlockx/Makefile +++ b/x11/numlockx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/04/11 21:48:12 tv Exp $ +# $NetBSD: Makefile,v 1.3 2005/06/01 18:03:29 jlam Exp $ # DISTNAME= numlockx-1.0 @@ -10,7 +10,8 @@ HOMEPAGE= http://ktown.kde.org/~seli/numlockx/ COMMENT= Allows you to start X with numlock turned on GNU_CONFIGURE= yes -USE_X11= yes + +.include "../../mk/x11.buildlink3.mk" post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/numlockx diff --git a/x11/ocaml-graphics/Makefile b/x11/ocaml-graphics/Makefile index bcaa7c73186..76b2b45eb46 100644 --- a/x11/ocaml-graphics/Makefile +++ b/x11/ocaml-graphics/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/03/24 11:33:24 adam Exp $ +# $NetBSD: Makefile,v 1.4 2005/06/01 18:03:30 jlam Exp $ .include "../../lang/ocaml/Makefile.common" @@ -6,7 +6,6 @@ PKGNAME= ${DISTNAME:S/ocaml/ocaml-graphics/} COMMENT+= (graphics library) -USE_X11= yes CONFIGURE_ARGS+= -x11include ${X11BASE}/include CONFIGURE_ARGS+= -x11lib ${X11BASE}/lib CONFIGURE_ARGS+= -no-tk @@ -38,6 +37,7 @@ SUBST_SED.depend= -e 's,/usr/X11R6,${X11BASE},g' SUBST_MESSAGE.depend= "Fixing .depend in otherlibs/graph" .include "../../lang/ocaml/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" post-build: @${CP} ${PKGDIR}/PLIST ${WRKDIR}/.PLIST_SRC diff --git a/x11/openmotif/Makefile b/x11/openmotif/Makefile index a20ccf24619..7ce8bff7569 100644 --- a/x11/openmotif/Makefile +++ b/x11/openmotif/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2005/05/22 21:04:42 jlam Exp $ +# $NetBSD: Makefile,v 1.36 2005/06/01 18:03:30 jlam Exp $ PKGVER= 2.1.30 DISTNAME= openmotif${PKGVER} @@ -49,6 +49,8 @@ USE_TOOLS+= gmake INSTALLATION_DIRS= lib/X11/config man/man1 man/man3 man/man5 +.include "../../mk/x11.buildlink3.mk" + post-extract: ${CP} ${FILESDIR}/NoInstall.rules ${WRKSRC}/config/cf/NoInstall.rules ${CP} ${FILESDIR}/OpenMotif.def ${WRKSRC}/config/cf/Motif.def diff --git a/x11/p5-Tk/Makefile b/x11/p5-Tk/Makefile index ab10a40444c..622a7130ede 100644 --- a/x11/p5-Tk/Makefile +++ b/x11/p5-Tk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2005/04/11 21:48:12 tv Exp $ +# $NetBSD: Makefile,v 1.45 2005/06/01 18:03:30 jlam Exp $ DISTNAME= Tk-804.027 PKGNAME= p5-Tk-804.027 @@ -15,7 +15,6 @@ BUILD_DEPENDS= p5-HTML-Parser>=3.19:../../www/p5-HTML-Parser PKG_INSTALLATION_TYPES= overwrite pkgviews -USE_X11= YES PERL5_REQD= 5.8 PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Tk/.packlist @@ -24,4 +23,5 @@ MAKE_PARAMS= X11=${X11BASE} .include "../../lang/perl5/module.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/p5-gtk/Makefile.common b/x11/p5-gtk/Makefile.common index ae87eeb252f..a3072f13c5d 100644 --- a/x11/p5-gtk/Makefile.common +++ b/x11/p5-gtk/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.4 2005/04/11 21:48:12 tv Exp $ +# $NetBSD: Makefile.common,v 1.5 2005/06/01 18:03:30 jlam Exp $ # # common things for p5-gtk based packages @@ -12,4 +12,4 @@ MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Gtk/} \ BUILD_DEPENDS+= p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser BUILD_DEPENDS+= p5-XML-Writer-[0-9]*:../../textproc/p5-XML-Writer -USE_X11= YES +.include "../../mk/x11.buildlink3.mk" diff --git a/x11/p5-gtk2/Makefile b/x11/p5-gtk2/Makefile index de66a750c28..89b31f1d672 100644 --- a/x11/p5-gtk2/Makefile +++ b/x11/p5-gtk2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:49 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/06/01 18:03:30 jlam Exp $ DISTNAME= Gtk2-1.042 PKGNAME= p5-gtk2-1.042 @@ -14,7 +14,6 @@ DEPENDS+= p5-ExtUtils-Depends>=0.2:../../devel/p5-ExtUtils-Depends DEPENDS+= p5-ExtUtils-PkgConfig>=1.03:../../devel/p5-ExtUtils-PkgConfig USE_TOOLS+= gmake -USE_X11= yes PERL5_REQD= 5.8 PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Gtk2/.packlist diff --git a/x11/py-Tk/Makefile b/x11/py-Tk/Makefile index 2d7784b1e52..474d4c3760d 100644 --- a/x11/py-Tk/Makefile +++ b/x11/py-Tk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2005/04/11 21:48:12 tv Exp $ +# $NetBSD: Makefile,v 1.35 2005/06/01 18:03:30 jlam Exp $ # PKGNAME= ${PYPKGPREFIX}-Tk-0 @@ -9,7 +9,6 @@ MAINTAINER= tsarna@NetBSD.org HOMEPAGE= http://www.python.org/topics/tkinter/ COMMENT= Tkinter -- Python interface to Tcl/Tk -USE_X11= yes EXTRACT_ELEMENTS= ${PYSUBDIR}/Modules/_tkinter.c \ ${PYSUBDIR}/Modules/tkappinit.c diff --git a/x11/py-qt2-sip/Makefile b/x11/py-qt2-sip/Makefile index 491e64367a1..64b3aa23b94 100644 --- a/x11/py-qt2-sip/Makefile +++ b/x11/py-qt2-sip/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/04/11 21:48:12 tv Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 18:03:30 jlam Exp $ # DISTNAME= sip-3.1 @@ -11,7 +11,6 @@ MAINTAINER= drochner@NetBSD.org HOMEPAGE= http://www.riverbankcomputing.co.uk/sip/index.php COMMENT= Tool to create Python bindings for C++ libraries -USE_X11= # defined USE_LIBTOOL= # defined GNU_CONFIGURE= # defined diff --git a/x11/py-qt2/Makefile b/x11/py-qt2/Makefile index 89e90f68e6f..d19890a1f20 100644 --- a/x11/py-qt2/Makefile +++ b/x11/py-qt2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/04/16 00:42:38 kristerw Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/01 18:03:30 jlam Exp $ # DISTNAME= PyQt-3.1-Qt-2.3.1 @@ -12,7 +12,6 @@ HOMEPAGE= http://www.riverbankcomputing.co.uk/pyqt/index.php COMMENT= Python bindings for the Qt toolkit WRKSRC= ${WRKDIR}/PyQt-3.1 -USE_X11= # defined USE_LIBTOOL= # defined GNU_CONFIGURE= # defined diff --git a/x11/py-qt3-base/Makefile b/x11/py-qt3-base/Makefile index ae060e0ae5c..a7f540d28c4 100644 --- a/x11/py-qt3-base/Makefile +++ b/x11/py-qt3-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:49 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2005/06/01 18:03:30 jlam Exp $ # DISTNAME= PyQt-x11-gpl-3.14.1 @@ -10,7 +10,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.riverbankcomputing.co.uk/pyqt/ COMMENT= Python binding for qt3 -USE_X11= yes USE_LIBTOOL= yes USE_TOOLS+= gmake USE_LANGUAGES= c c++ diff --git a/x11/py-qt3-modules/Makefile b/x11/py-qt3-modules/Makefile index e820e477d12..ba1e4647429 100644 --- a/x11/py-qt3-modules/Makefile +++ b/x11/py-qt3-modules/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/05/22 20:08:49 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2005/06/01 18:03:30 jlam Exp $ # DISTNAME= PyQt-x11-gpl-3.14.1 @@ -10,7 +10,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.riverbankcomputing.co.uk/pyqt/ COMMENT= Python binding for qt3 -USE_X11= yes USE_LIBTOOL= yes USE_TOOLS+= gmake USE_LANGUAGES= c c++ diff --git a/x11/py-qt3-qscintilla/Makefile b/x11/py-qt3-qscintilla/Makefile index 76db0b29929..73394abd0d5 100644 --- a/x11/py-qt3-qscintilla/Makefile +++ b/x11/py-qt3-qscintilla/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:49 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2005/06/01 18:03:30 jlam Exp $ # DISTNAME= PyQt-x11-gpl-3.14.1 @@ -10,7 +10,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.riverbankcomputing.co.uk/pyqt/ COMMENT= Python binding for qt3 -USE_X11= yes USE_LIBTOOL= yes USE_TOOLS+= gmake USE_LANGUAGES= c c++ diff --git a/x11/py-qt3-sip/Makefile b/x11/py-qt3-sip/Makefile index 3b26a5aead1..5984fde1b76 100644 --- a/x11/py-qt3-sip/Makefile +++ b/x11/py-qt3-sip/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:49 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2005/06/01 18:03:30 jlam Exp $ # DISTNAME= sip-4.2.1 @@ -15,7 +15,6 @@ CONFLICTS+= ${PYPKGPREFIX}-qt2-sip-* # needs qmake BUILD_DEPENDS+= qt3-tools-3.*:../../x11/qt3-tools -USE_X11= yes USE_LIBTOOL= yes USE_TOOLS+= gmake USE_LANGUAGES= c c++ diff --git a/x11/qt1/Makefile b/x11/qt1/Makefile index 5b6831cc153..f13e0607bb8 100644 --- a/x11/qt1/Makefile +++ b/x11/qt1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/05/22 20:08:49 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2005/06/01 18:03:30 jlam Exp $ # DISTNAME= qt-1.44 @@ -25,6 +25,8 @@ BUILD_TARGET= src .include "../../mk/bsd.prefs.mk" +.include "../../mk/x11.buildlink3.mk" + do-configure: @cd ${WRKSRC} && ${MAKE} QTDIR=${WRKSRC} ${LOWER_OPSYS}-g++-static diff --git a/x11/qt1/buildlink3.mk b/x11/qt1/buildlink3.mk index 90364c40eaa..85df8e1e8d0 100644 --- a/x11/qt1/buildlink3.mk +++ b/x11/qt1/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:18:37 tv Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2005/06/01 18:03:30 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ QT1_BUILDLINK3_MK:= ${QT1_BUILDLINK3_MK}+ @@ -22,4 +22,6 @@ BUILDLINK_TRANSFORM.qt1+= -e s,/qt1/bin/,/bin/, QT1DIR= ${LOCALBASE}/qt1 .endif # QT1_BUILDLINK3_MK +.include "../../mk/x11.buildlink3.mk" + BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/qt2-libs/Makefile.common b/x11/qt2-libs/Makefile.common index b670b3e3a56..10fc4e3bade 100644 --- a/x11/qt2-libs/Makefile.common +++ b/x11/qt2-libs/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.22 2005/05/22 20:08:50 jlam Exp $ +# $NetBSD: Makefile.common,v 1.23 2005/06/01 18:03:30 jlam Exp $ # DISTNAME= qt-x11-${QTVERSION} @@ -46,6 +46,8 @@ FILES_SUBST+= QTDIR=${QTPREFIX} FILES_SUBST+= X11BASE=${X11BASE} FILES_SUBST_SED= ${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/} +.include "../../mk/x11.buildlink3.mk" + post-extract: cd ${WRKSRC}/configs; \ for file in netbsd-g++-static solaris-g++-static; do \ diff --git a/x11/qt2/Makefile.common b/x11/qt2/Makefile.common index 70bf3fa16b4..35c26e7a0f8 100644 --- a/x11/qt2/Makefile.common +++ b/x11/qt2/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.7 2004/03/09 21:00:09 skrll Exp $ +# $NetBSD: Makefile.common,v 1.8 2005/06/01 18:03:30 jlam Exp $ # QTVERSION= 2.3.1 @@ -7,3 +7,4 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.trolltech.com/products/qt.html USE_X11BASE= yes +.include "../../mk/x11.buildlink3.mk" diff --git a/x11/qt3-libs/Makefile.common b/x11/qt3-libs/Makefile.common index f5c94003aaf..251e4594f51 100644 --- a/x11/qt3-libs/Makefile.common +++ b/x11/qt3-libs/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.48 2005/05/22 22:06:28 jlam Exp $ +# $NetBSD: Makefile.common,v 1.49 2005/06/01 18:03:30 jlam Exp $ # DISTNAME= qt-x11-free-${QTVERSION} CATEGORIES= x11 @@ -13,7 +13,6 @@ FILESDIR= ${.CURDIR}/../../x11/qt3-libs/files PATCHDIR= ${.CURDIR}/../../x11/qt3-libs/patches HAS_CONFIGURE= yes -USE_X11= yes USE_TOOLS+= gmake USE_LANGUAGES= c c++ USE_LIBTOOL= yes @@ -87,6 +86,8 @@ BUILD_DEFS+= USE_CUPS CXXFLAGS+= -DQ_INLINE_TEMPLATES=inline .endif +.include "../../mk/x11.buildlink3.mk" + post-patch: ${SED} \ -e 's:@LOCALBASE@:${LOCALBASE}:g' \ diff --git a/x11/qt3/Makefile b/x11/qt3/Makefile index a7f16046845..a4c2e8aca1f 100644 --- a/x11/qt3/Makefile +++ b/x11/qt3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2005/04/11 21:48:13 tv Exp $ +# $NetBSD: Makefile,v 1.31 2005/06/01 18:03:30 jlam Exp $ DISTNAME= qt3-${QTVERSION} CATEGORIES= x11 @@ -13,7 +13,6 @@ DEPENDS+= qt3-libs-${QTVERSION}{,nb[0-9]*}:../../x11/qt3-libs DEPENDS+= qt3-tools-${QTVERSION}{,nb[0-9]*}:../../x11/qt3-tools DEPENDS+= qt3-docs-${QTVERSION}{,nb[0-9]*}:../../x11/qt3-docs -USE_X11= yes EXTRACT_ONLY= # empty NO_CHECKSUM= yes NO_CONFIGURE= yes diff --git a/x11/qtarch/Makefile b/x11/qtarch/Makefile index b42d7d5f300..6fa8e912b1d 100644 --- a/x11/qtarch/Makefile +++ b/x11/qtarch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2005/05/22 20:08:50 jlam Exp $ +# $NetBSD: Makefile,v 1.27 2005/06/01 18:03:30 jlam Exp $ # DISTNAME= qtarch-2.2-1 @@ -13,7 +13,6 @@ HOMEPAGE= http://qtarch.sourceforge.net/ COMMENT= Graphical dialog editor for the Qt widget set WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} -USE_X11= yes USE_TOOLS+= gmake do-install: diff --git a/x11/qwspritefield/Makefile b/x11/qwspritefield/Makefile index 31388d25d5c..79b9ae60462 100644 --- a/x11/qwspritefield/Makefile +++ b/x11/qwspritefield/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/05/22 20:08:50 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2005/06/01 18:03:30 jlam Exp $ DISTNAME= QwSpriteField1.6 PKGNAME= qwspritefield-1.6 @@ -12,7 +12,6 @@ COMMENT= Efficiently redrawn sprites in the Qt GUI Toolkit CONFLICTS= kdesupport-1.0 WRKSRC= ${WRKDIR}/QwSpriteField -USE_X11= yes USE_TOOLS+= gmake USE_LIBTOOL= yes diff --git a/x11/randrext/buildlink3.mk b/x11/randrext/buildlink3.mk index 21a4efa2d03..bbb82b174ac 100644 --- a/x11/randrext/buildlink3.mk +++ b/x11/randrext/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2005/03/05 18:16:21 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2005/06/01 18:03:30 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ RANDREXT_BUILDLINK3_MK:= ${RANDREXT_BUILDLINK3_MK}+ @@ -14,11 +14,9 @@ BUILDLINK_PACKAGES+= randrext BUILDLINK_DEPENDS.randrext+= randrext>=1.0 BUILDLINK_PKGSRCDIR.randrext?= ../../x11/randrext BUILDLINK_DEPMETHOD.randrext?= build +.endif # RANDREXT_BUILDLINK3_MK .include "../../x11/xextensions/buildlink3.mk" - -USE_X11= yes - -.endif # RANDREXT_BUILDLINK3_MK +.include "../../mk/x11.buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/randrext/builtin.mk b/x11/randrext/builtin.mk index 1ccb6e9655c..f4604f81fa8 100644 --- a/x11/randrext/builtin.mk +++ b/x11/randrext/builtin.mk @@ -1,58 +1,87 @@ -# $NetBSD: builtin.mk,v 1.2 2004/03/29 05:43:36 jlam Exp $ +# $NetBSD: builtin.mk,v 1.3 2005/06/01 18:03:30 jlam Exp $ -_X11_EXTENSIONS_RANDR_H= ${X11BASE}/include/X11/extensions/randr.h +BUILTIN_PKG:= randrext +BUILTIN_FIND_FILES_VAR:= H_RANDR +BUILTIN_FIND_FILES.H_RANDR= ${X11BASE}/include/X11/extensions/randr.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.randrext) IS_BUILTIN.randrext= no -. if exists(${_X11_EXTENSIONS_RANDR_H}) -IS_BUILTIN.randrext= yes -# -# Create an appropriate package name for the built-in randr distributed -# with the system. This package name can be used to check against -# BUILDLINK_DEPENDS.<pkg> to see if we need to install the pkgsrc version -# or if the built-in one is sufficient. # -_RANDR_MAJOR!= \ - ${AWK} '/\#define[ ]*RANDR_MAJOR/ { print $$3 }' \ - ${_X11_EXTENSIONS_RANDR_H} -_RANDR_MINOR!= \ - ${AWK} '/\#define[ ]*RANDR_MINOR/ { print "."$$3 }' \ - ${_X11_EXTENSIONS_RANDR_H} -_RANDR_VERSION= ${_RANDR_MAJOR}${_RANDR_MINOR} -BUILTIN_PKG.randrext= randrext-${_RANDR_VERSION} -BUILDLINK_VARS+= BUILTIN_PKG.randrext +# Here, we skip checking whether the files are under ${LOCALBASE} since +# we'll consider this X11 package to be built-in even if it's a part +# of one of the pkgsrc-installed X11 distributions. +# +. if exists(${H_RANDR}) +IS_BUILTIN.randrext= yes . endif -BUILDLINK_VARS+= IS_BUILTIN.randrext -.endif # IS_BUILTIN.randrext +.endif +MAKEVARS+= IS_BUILTIN.randrext -.if !defined(USE_BUILTIN.randrext) -USE_BUILTIN.randrext?= ${IS_BUILTIN.randrext} +### +### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to +### a package name to represent the built-in package. +### +.if !defined(BUILTIN_PKG.randrext) && \ + !empty(IS_BUILTIN.randrext:M[yY][eE][sS]) && \ + exists(${H_RANDR}) +BUILTIN_VERSION.randrext!= \ + ${AWK} '/\#define[ ]*RANDR_MAJOR/ { M = $$3 } \ + /\#define[ ]*RANDR_MINOR/ { m = "."$$3 } \ + END { printf "%s%s\n", M, m }' \ + ${H_RANDR} +BUILTIN_PKG.randrext= randrext-${BUILTIN_VERSION.randrext} +.endif +MAKEVARS+= BUILTIN_PKG.randrext -. if defined(BUILTIN_PKG.randrext) +### +### 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.randrext) +. if ${PREFER.randrext} == "pkgsrc" +USE_BUILTIN.randrext= no +. else +USE_BUILTIN.randrext= ${IS_BUILTIN.randrext} +. if defined(BUILTIN_PKG.randrext) && \ + !empty(IS_BUILTIN.randrext:M[yY][eE][sS]) USE_BUILTIN.randrext= yes -. for _depend_ in ${BUILDLINK_DEPENDS.randrext} -. if !empty(USE_BUILTIN.randrext:M[yY][eE][sS]) -USE_BUILTIN.randrext!= \ - if ${PKG_ADMIN} pmatch '${_depend_}' ${BUILTIN_PKG.randrext}; then \ - ${ECHO} "yes"; \ +. for _dep_ in ${BUILDLINK_DEPENDS.randrext} +. if !empty(USE_BUILTIN.randrext:M[yY][eE][sS]) +USE_BUILTIN.randrext!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.randrext:Q}; then \ + ${ECHO} yes; \ else \ - ${ECHO} "no"; \ + ${ECHO} no; \ fi -. endif -. endfor -. endif -.endif # USE_BUILTIN.randrext +. endif +. endfor +. endif +. endif # PREFER.randrext +.endif +MAKEVARS+= USE_BUILTIN.randrext +### +### The section below only applies if we are not including this file +### solely to determine whether a built-in implementation exists. +### CHECK_BUILTIN.randrext?= no .if !empty(CHECK_BUILTIN.randrext:M[nN][oO]) -.if !empty(USE_BUILTIN.randrext:M[nN][oO]) +. if !empty(USE_BUILTIN.randrext:M[nN][oO]) BUILDLINK_DEPENDS.randrext+= randrext>=1.0 -.endif +. endif -.if !empty(USE_BUILTIN.randrext:M[yY][eE][sS]) +. if !empty(USE_BUILTIN.randrext:M[yY][eE][sS]) BUILDLINK_PREFIX.randrext= ${X11BASE} -USE_X11= yes -.endif +. include "../../mk/x11.buildlink3.mk" +. include "../../mk/x11.builtin.mk" +. endif .endif # CHECK_BUILTIN.randrext diff --git a/x11/render/buildlink3.mk b/x11/render/buildlink3.mk index 4698900316e..ecf6422bf62 100644 --- a/x11/render/buildlink3.mk +++ b/x11/render/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2004/03/10 17:57:15 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2005/06/01 18:03:30 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ RENDER_BUILDLINK3_MK:= ${RENDER_BUILDLINK3_MK}+ @@ -14,9 +14,8 @@ BUILDLINK_PACKAGES+= render BUILDLINK_DEPENDS.render+= render>=0.2 BUILDLINK_PKGSRCDIR.render?= ../../x11/render BUILDLINK_DEPMETHOD.render?= build - -USE_X11= yes - .endif # RENDER_BUILDLINK3_MK +.include "../../mk/x11.buildlink3.mk" + BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/render/builtin.mk b/x11/render/builtin.mk index e80d1e3e2f1..fbbe9b7338c 100644 --- a/x11/render/builtin.mk +++ b/x11/render/builtin.mk @@ -1,58 +1,87 @@ -# $NetBSD: builtin.mk,v 1.2 2004/03/29 05:43:36 jlam Exp $ +# $NetBSD: builtin.mk,v 1.3 2005/06/01 18:03:30 jlam Exp $ -_X11_EXTENSIONS_RENDER_H= ${X11BASE}/include/X11/extensions/render.h +BUILTIN_PKG:= render +BUILTIN_FIND_FILES_VAR:= H_RENDER +BUILTIN_FIND_FILES.H_RENDER= ${X11BASE}/include/X11/extensions/render.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.render) IS_BUILTIN.render= no -. if exists(${_X11_EXTENSIONS_RENDER_H}) -IS_BUILTIN.render= yes -# -# Create an appropriate package name for the built-in render distributed -# with the system. This package name can be used to check against -# BUILDLINK_DEPENDS.<pkg> to see if we need to install the pkgsrc version -# or if the built-in one is sufficient. # -_RENDER_MAJOR!= \ - ${AWK} '/\#define[ ]*RENDER_MAJOR/ { print $$3 }' \ - ${_X11_EXTENSIONS_RENDER_H} -_RENDER_MINOR!= \ - ${AWK} '/\#define[ ]*RENDER_MINOR/ { print "."$$3 }' \ - ${_X11_EXTENSIONS_RENDER_H} -_RENDER_VERSION= ${_RENDER_MAJOR}${_RENDER_MINOR} -BUILTIN_PKG.render= render-${_RENDER_VERSION} -BUILDLINK_VARS+= BUILTIN_PKG.render +# Here, we skip checking whether the files are under ${LOCALBASE} since +# we'll consider this X11 package to be built-in even if it's a part +# of one of the pkgsrc-installed X11 distributions. +# +. if exists(${H_RENDER}) +IS_BUILTIN.render= yes . endif -BUILDLINK_VARS+= IS_BUILTIN.render -.endif # IS_BUILTIN.render +.endif +MAKEVARS+= IS_BUILTIN.render -.if !defined(USE_BUILTIN.render) -USE_BUILTIN.render?= ${IS_BUILTIN.render} +### +### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to +### a package name to represent the built-in package. +### +.if !defined(BUILTIN_PKG.render) && \ + !empty(IS_BUILTIN.render:M[yY][eE][sS]) && \ + exists(${H_RENDER}) +BUILTIN_VERSION.render!= \ + ${AWK} '/\#define[ ]*RENDER_MAJOR/ { M = $$3 } \ + /\#define[ ]*RENDER_MINOR/ { m = "."$$3 } \ + END { printf "%s%s\n", M, m }' \ + ${H_RENDER} +BUILTIN_PKG.render= render-${BUILTIN_VERSION.render} +.endif +MAKEVARS+= BUILTIN_PKG.render -. if defined(BUILTIN_PKG.render) +### +### 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.render) +. if ${PREFER.render} == "pkgsrc" +USE_BUILTIN.render= no +. else +USE_BUILTIN.render= ${IS_BUILTIN.render} +. if defined(BUILTIN_PKG.render) && \ + !empty(IS_BUILTIN.render:M[yY][eE][sS]) USE_BUILTIN.render= yes -. for _depend_ in ${BUILDLINK_DEPENDS.render} -. if !empty(USE_BUILTIN.render:M[yY][eE][sS]) -USE_BUILTIN.render!= \ - if ${PKG_ADMIN} pmatch '${_depend_}' ${BUILTIN_PKG.render}; then \ - ${ECHO} "yes"; \ +. for _dep_ in ${BUILDLINK_DEPENDS.render} +. if !empty(USE_BUILTIN.render:M[yY][eE][sS]) +USE_BUILTIN.render!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.render:Q}; then \ + ${ECHO} yes; \ else \ - ${ECHO} "no"; \ + ${ECHO} no; \ fi -. endif -. endfor -. endif -.endif # USE_BUILTIN.render +. endif +. endfor +. endif +. endif # PREFER.render +.endif +MAKEVARS+= USE_BUILTIN.render +### +### The section below only applies if we are not including this file +### solely to determine whether a built-in implementation exists. +### CHECK_BUILTIN.render?= no .if !empty(CHECK_BUILTIN.render:M[nN][oO]) -.if !empty(USE_BUILTIN.render:M[nN][oO]) +. if !empty(USE_BUILTIN.render:M[nN][oO]) BUILDLINK_DEPENDS.render+= render>=0.8 -.endif +. endif -.if !empty(USE_BUILTIN.render:M[yY][eE][sS]) +. if !empty(USE_BUILTIN.render:M[yY][eE][sS]) BUILDLINK_PREFIX.render= ${X11BASE} -USE_X11= yes -.endif +. include "../../mk/x11.buildlink3.mk" +. include "../../mk/x11.builtin.mk" +. endif .endif # CHECK_BUILTIN.render diff --git a/x11/ruby-fox/Makefile b/x11/ruby-fox/Makefile index 29683375266..ed59a526cda 100644 --- a/x11/ruby-fox/Makefile +++ b/x11/ruby-fox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/04/11 21:48:13 tv Exp $ +# $NetBSD: Makefile,v 1.25 2005/06/01 18:03:30 jlam Exp $ DISTNAME= FXRuby-1.0.29 PKGNAME= ${RUBY_PKGPREFIX}-fox-1.0.29 @@ -15,7 +15,6 @@ DEPENDS+= ${RUBY_PKGPREFIX}-opengl>=0.32:../../graphics/ruby-opengl RUBY_HAS_ARCHLIB= yes USE_RUBY_EXTCONF= yes -USE_X11= yes INSTALL_TARGET= site-install WRKDIST= ${WRKDIR}/${DISTNAME} WRKSRC= ${WRKDIST}/ext/fox @@ -45,4 +44,5 @@ post-install: .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../lang/ruby/modules.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/ruby-gtk/Makefile b/x11/ruby-gtk/Makefile index 8b108b32a7f..d4b01b871a4 100644 --- a/x11/ruby-gtk/Makefile +++ b/x11/ruby-gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2005/04/11 21:48:13 tv Exp $ +# $NetBSD: Makefile,v 1.33 2005/06/01 18:03:31 jlam Exp $ DISTNAME= ruby-gtk-${VERSION} PKGNAME= ${RUBY_PKGPREFIX}-gtk-${VERSION} @@ -13,7 +13,6 @@ COMMENT= Ruby interface to Gtk+ toolkits VERSION= 0.34 RUBY_HAS_ARCHLIB= yes USE_RUBY_EXTCONF= yes -USE_X11= yes INSTALL_TARGET= site-install DOCS_EN= README README.EXT doc/rbbr.rb DOCS_JA= README.ja README.EXT.ja diff --git a/x11/ruby-tcltklib/Makefile b/x11/ruby-tcltklib/Makefile index b407a8a9eef..130e62e0c3f 100644 --- a/x11/ruby-tcltklib/Makefile +++ b/x11/ruby-tcltklib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/04/11 21:48:13 tv Exp $ +# $NetBSD: Makefile,v 1.18 2005/06/01 18:03:31 jlam Exp $ DISTNAME= ${RUBY_DISTNAME} PKGNAME= ${RUBY_PKGPREFIX}-tcltklib-${RUBY_VERSION} @@ -13,7 +13,6 @@ COMMENT= Ruby interface to Tcl/Tk libraries RUBY_HAS_ARCHLIB= yes RUBY_VERSION_SUPPORTED= 18 USE_RUBY_EXTCONF= yes -USE_X11= yes EXTRACT_ELEMENTS= ${RUBY_DISTNAME}/ext/tcltklib WRKSRC= ${RUBY_WRKSRC}/ext/tcltklib diff --git a/x11/ruby-tk/Makefile b/x11/ruby-tk/Makefile index fed5344d942..7e2bf13a074 100644 --- a/x11/ruby-tk/Makefile +++ b/x11/ruby-tk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/04/11 21:48:13 tv Exp $ +# $NetBSD: Makefile,v 1.18 2005/06/01 18:03:31 jlam Exp $ DISTNAME= ${RUBY_DISTNAME} PKGNAME= ${RUBY_PKGPREFIX}-tk-${RUBY_VERSION} @@ -15,7 +15,6 @@ DEPENDS+= ${RUBY_PKGPREFIX}-tcltklib>=${RUBY_VERSION}:../../x11/ruby-tcltklib RUBY_HAS_ARCHLIB= yes RUBY_VERSION_SUPPORTED= 18 USE_RUBY_EXTCONF= yes -USE_X11= yes EXTRACT_ELEMENTS= ${RUBY_DISTNAME}/ext/tk WRKSRC= ${RUBY_WRKSRC}/ext/tk diff --git a/x11/ruby16-tcltklib/Makefile b/x11/ruby16-tcltklib/Makefile index e222fa5d650..e265259a8d4 100644 --- a/x11/ruby16-tcltklib/Makefile +++ b/x11/ruby16-tcltklib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/04/11 21:48:13 tv Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:31 jlam Exp $ DISTNAME= ${RUBY_DISTNAME} PKGNAME= ${RUBY_PKGPREFIX}-tcltklib-${RUBY_VERSION} @@ -13,7 +13,6 @@ COMMENT= Ruby interface to Tcl/Tk libraries RUBY_HAS_ARCHLIB= yes RUBY_VERSION= ${RUBY16_VERSION} USE_RUBY_EXTCONF= yes -USE_X11= yes DISTINFO_FILE= ${RUBY_DISTINFO_FILE} EXTRACT_ELEMENTS= ${RUBY_DISTNAME}/ext/tcltklib WRKSRC= ${RUBY_WRKSRC}/ext/tcltklib diff --git a/x11/ruby16-tk/Makefile b/x11/ruby16-tk/Makefile index 4c52e5b3c96..a3e20bb4756 100644 --- a/x11/ruby16-tk/Makefile +++ b/x11/ruby16-tk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/04/11 21:48:13 tv Exp $ +# $NetBSD: Makefile,v 1.8 2005/06/01 18:03:31 jlam Exp $ DISTNAME= ${RUBY_DISTNAME} PKGNAME= ${RUBY_PKGPREFIX}-tk-${RUBY_VERSION} @@ -15,7 +15,6 @@ DEPENDS+= ${RUBY_PKGPREFIX}-tcltklib>=${RUBY_VERSION}:../../x11/${RUBY_PKGPREFIX RUBY_HAS_ARCHLIB= yes RUBY_VERSION= ${RUBY16_VERSION} USE_RUBY_EXTCONF= yes -USE_X11= yes EXTRACT_ELEMENTS= ${RUBY_DISTNAME}/ext/tk WRKSRC= ${RUBY_WRKSRC}/ext/tk diff --git a/x11/ssystem/Makefile b/x11/ssystem/Makefile index 13eb729d2cb..93787b9a654 100644 --- a/x11/ssystem/Makefile +++ b/x11/ssystem/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/04/11 21:48:13 tv Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/01 18:03:31 jlam Exp $ # DISTNAME= ssystem-1.6 @@ -31,4 +31,5 @@ do-install: .include "../../graphics/Mesa/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/startup-notification/Makefile b/x11/startup-notification/Makefile index 79527613063..6a339a59bd5 100644 --- a/x11/startup-notification/Makefile +++ b/x11/startup-notification/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/04/11 21:48:13 tv Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 18:03:31 jlam Exp $ DISTNAME= startup-notification-0.8 CATEGORIES= x11 gnome @@ -13,7 +13,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews GNU_CONFIGURE= yes USE_LIBTOOL= yes -USE_X11= yes PKGCONFIG_OVERRIDE= libstartup-notification-1.0.pc.in @@ -24,4 +23,5 @@ post-install: ${PREFIX}/share/doc/startup-notification/ .include "../../devel/pkgconfig/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/tk-Tix/Makefile b/x11/tk-Tix/Makefile index 39d03eeb7f9..a99b2f06349 100644 --- a/x11/tk-Tix/Makefile +++ b/x11/tk-Tix/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/04/11 21:48:14 tv Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/01 18:03:32 jlam Exp $ # DISTNAME= tix8.2.0b1 @@ -12,7 +12,6 @@ HOMEPAGE= http://tixlibrary.sourceforge.net/ COMMENT= Powerful widget library for Tcl/Tk WRKSRC= ${WRKDIR}/tix8.2.0/unix -USE_X11= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-shared --with-tcl=${BUILDLINK_PREFIX.tcl}/lib \ --with-tk=${BUILDLINK_PREFIX.tk}/lib \ diff --git a/x11/tk/Makefile b/x11/tk/Makefile index 2f77d69e382..28dd8f77ca4 100644 --- a/x11/tk/Makefile +++ b/x11/tk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2005/04/13 20:41:03 jschauma Exp $ +# $NetBSD: Makefile,v 1.46 2005/06/01 18:03:31 jlam Exp $ DISTNAME= tk8.4.9-src PKGNAME= tk-8.4.9 @@ -13,7 +13,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews WRKSRC= ${WRKDIR}/${DISTNAME:C/-src//}/unix -USE_X11= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl}/lib @@ -30,6 +29,7 @@ CONFIGURE_ARGS+= --mandir=${WRKDIR:Q}/man .include "../../lang/tcl/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" post-build: ${SED} -e "s|^\(.*\)='\(.*\)'|\1=\"\2\"|" \ diff --git a/x11/tk/buildlink3.mk b/x11/tk/buildlink3.mk index c4d2457551f..4a100846d09 100644 --- a/x11/tk/buildlink3.mk +++ b/x11/tk/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.13 2004/10/03 00:18:38 tv Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2005/06/01 18:03:31 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ TK_BUILDLINK3_MK:= ${TK_BUILDLINK3_MK}+ @@ -22,12 +22,11 @@ BUILDLINK_FILES.tk= bin/wish* # BUILDLINK_TRANSFORM+= l:tk:tk84 BUILDLINK_TRANSFORM+= l:tk8.4:tk84 - .endif # TK_BUILDLINK3_MK -USE_X11= yes TKCONFIG_SH?= ${BUILDLINK_PREFIX.tk}/lib/tkConfig.sh .include "../../lang/tcl/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/tk83/Makefile b/x11/tk83/Makefile index 2b24a85b47c..5ce3e178868 100644 --- a/x11/tk83/Makefile +++ b/x11/tk83/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/04/13 20:41:03 jschauma Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:32 jlam Exp $ DISTNAME= tk8.3.4 PKGNAME= tk-8.3.4 @@ -17,7 +17,6 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl}/lib MAKE_ENV+= TOUCH="${TOUCH}" -USE_X11= yes USE_LIBTOOL= yes TEST_TARGET= test @@ -96,4 +95,5 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/../unix/tkUnixPort.h ${PREFIX}/include/tk/unix .include "../../lang/tcl83/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/tk83/buildlink3.mk b/x11/tk83/buildlink3.mk index d52bb997c47..2ef5dd24f40 100644 --- a/x11/tk83/buildlink3.mk +++ b/x11/tk83/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/04/24 22:41:21 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2005/06/01 18:03:32 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ TK_BUILDLINK3_MK:= ${TK_BUILDLINK3_MK}+ @@ -20,12 +20,11 @@ BUILDLINK_FILES.tk= bin/wish* # many Makefiles. # BUILDLINK_TRANSFORM+= l:tk:tk83 - .endif # TK_BUILDLINK3_MK -USE_X11= yes TKCONFIG_SH?= ${BUILDLINK_PREFIX.tk}/lib/tkConfig.sh .include "../../lang/tcl83/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/tkman/Makefile b/x11/tkman/Makefile index e4c9be919c4..803081514b6 100644 --- a/x11/tkman/Makefile +++ b/x11/tkman/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2005/03/24 21:13:04 wiz Exp $ +# $NetBSD: Makefile,v 1.38 2005/06/01 18:03:32 jlam Exp $ DISTNAME= tkman PKGNAME= tkman-2.1 @@ -15,7 +15,8 @@ DEPENDS+= tk>=8.3.2:../../x11/tk83 WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} USE_RMAN= yes -USE_X11= yes + +.include "../../mk/x11.buildlink3.mk" post-install: ${SED} -e 's|@@LOCALBASE@@|${LOCALBASE}|' \ diff --git a/x11/vte/Makefile b/x11/vte/Makefile index 4aec2b06dd4..23b30638ada 100644 --- a/x11/vte/Makefile +++ b/x11/vte/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/05/22 20:08:51 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2005/06/01 18:03:32 jlam Exp $ # DISTNAME= vte-0.11.13 @@ -17,7 +17,6 @@ USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes USE_TOOLS+= gmake -USE_X11= yes CONFIGURE_ARGS+= --disable-gtk-doc CONFIGURE_ARGS+= --disable-python diff --git a/x11/wmfire/Makefile b/x11/wmfire/Makefile index 2f6d6cef4f5..56f8f0e879e 100644 --- a/x11/wmfire/Makefile +++ b/x11/wmfire/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/04/11 21:48:14 tv Exp $ +# $NetBSD: Makefile,v 1.17 2005/06/01 18:03:32 jlam Exp $ # DISTNAME= wmfire-0.0.3.9pre4 @@ -9,7 +9,6 @@ MASTER_SITES= http://staff.xmms.org/zinx/misc/ MAINTAINER= tech-pkg@NetBSD.org COMMENT= Displays generated fire according to system load -USE_X11= YES GNU_CONFIGURE= YES post-install: diff --git a/x11/wmfstatus/Makefile b/x11/wmfstatus/Makefile index ca08e0a111d..2a3128d8f97 100644 --- a/x11/wmfstatus/Makefile +++ b/x11/wmfstatus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/04/11 21:48:14 tv Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 18:03:32 jlam Exp $ DISTNAME= wmfstatus-0.4 CATEGORIES= x11 @@ -9,7 +9,6 @@ HOMEPAGE= http://www.finik.net/software.html COMMENT= General purpose 8x5 LCD screen for WindowMaker WRKSRC= ${WRKDIR}/${DISTNAME}/wmfstatus -USE_X11= YES do-install: ${INSTALL_PROGRAM} ${WRKSRC}/wmfstatus ${PREFIX}/bin diff --git a/x11/wmweather/Makefile b/x11/wmweather/Makefile index c9a45b535f3..dd84ae47733 100644 --- a/x11/wmweather/Makefile +++ b/x11/wmweather/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/05/22 20:08:52 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2005/06/01 18:03:32 jlam Exp $ # DISTNAME= wmweather-2.4.2 @@ -11,7 +11,6 @@ HOMEPAGE= http://www.godisch.de/debian/wmweather/ COMMENT= WindowMaker DockApp showing local weather conditions WRKSRC= ${WRKDIR}/${DISTNAME}/src -USE_X11= yes GNU_CONFIGURE= yes USE_TOOLS+= gmake diff --git a/x11/wxGTK/Makefile b/x11/wxGTK/Makefile index dd655d01937..2f41bfe1f3d 100644 --- a/x11/wxGTK/Makefile +++ b/x11/wxGTK/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2005/04/11 21:48:14 tv Exp $ +# $NetBSD: Makefile,v 1.39 2005/06/01 18:03:32 jlam Exp $ # DISTNAME= wxGTK-2.4.2 @@ -12,7 +12,6 @@ HOMEPAGE= http://www.wxwidgets.org/ COMMENT= GTK-based implementation of the wxWidgets GUI library USE_PKGLOCALEDIR= YES -USE_X11= YES USE_LIBTOOL= YES USE_LANGUAGES= c c++ GNU_CONFIGURE= YES diff --git a/x11/wxhaskell/Makefile b/x11/wxhaskell/Makefile index 89b3b615067..827d726a8f7 100644 --- a/x11/wxhaskell/Makefile +++ b/x11/wxhaskell/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:52 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/06/01 18:03:32 jlam Exp $ DISTNAME= wxhaskell-src-0.9.4 PKGNAME= ${DISTNAME:S/-src//} @@ -11,7 +11,6 @@ HOMEPAGE= http://wxhaskell.sourceforge.net/index.html COMMENT= wxGTK binding for Haskell USE_TOOLS+= gmake -USE_X11= yes WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} diff --git a/x11/xbindkeys/Makefile.common b/x11/xbindkeys/Makefile.common index 5ed123de70c..29868937c0d 100644 --- a/x11/xbindkeys/Makefile.common +++ b/x11/xbindkeys/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.6 2005/04/11 21:48:14 tv Exp $ +# $NetBSD: Makefile.common,v 1.7 2005/06/01 18:03:32 jlam Exp $ # DISTNAME= xbindkeys-1.7.1 @@ -12,5 +12,6 @@ COMMENT= Launches shell commands with your keyboard or your mouse DISTINFO_FILE= ${.CURDIR}/../../x11/xbindkeys/distinfo PATCHDIR= ${.CURDIR}/../../x11/xbindkeys/patches -USE_X11= yes GNU_CONFIGURE= yes + +.include "../../mk/x11.buildlink3.mk" diff --git a/x11/xcompmgr/Makefile b/x11/xcompmgr/Makefile index ea6fac2846d..83018f184f6 100644 --- a/x11/xcompmgr/Makefile +++ b/x11/xcompmgr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/04/11 21:48:14 tv Exp $ +# $NetBSD: Makefile,v 1.9 2005/06/01 18:03:32 jlam Exp $ # DISTNAME= xcompmgr-1.1.1 @@ -10,7 +10,6 @@ HOMEPAGE= http://www.freedesktop.org/ COMMENT= Sample compositing manager for X.org >= 6.8.0 GNU_CONFIGURE= yes -USE_X11= yes .include "../../mk/bsd.prefs.mk" diff --git a/x11/xcursor/Makefile b/x11/xcursor/Makefile index 367e5a024e8..7f756483cc7 100644 --- a/x11/xcursor/Makefile +++ b/x11/xcursor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/04/11 21:48:14 tv Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 18:03:32 jlam Exp $ # DISTNAME= libXcursor-1.1.2 @@ -13,7 +13,6 @@ COMMENT= Client-side cursor loading library for X PKG_INSTALLATION_TYPES= overwrite pkgviews -USE_X11= yes USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes diff --git a/x11/xcursor/buildlink3.mk b/x11/xcursor/buildlink3.mk index 73c8f36a284..bc979ef3dd9 100644 --- a/x11/xcursor/buildlink3.mk +++ b/x11/xcursor/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.14 2004/10/03 00:18:39 tv Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2005/06/01 18:03:32 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XCURSOR_BUILDLINK3_MK:= ${XCURSOR_BUILDLINK3_MK}+ @@ -16,8 +16,6 @@ BUILDLINK_RECOMMENDED.xcursor+= xcursor>=1.1.1nb2 BUILDLINK_PKGSRCDIR.xcursor?= ../../x11/xcursor .endif # XCURSOR_BUILDLINK3_MK -USE_X11= yes - # Xfixes/buildlink3.mk is included by xcursor/builtin.mk #.include "../../x11/Xfixes/buildlink3.mk" diff --git a/x11/xcursor/builtin-imake.mk b/x11/xcursor/builtin-imake.mk new file mode 100644 index 00000000000..0d398fd827a --- /dev/null +++ b/x11/xcursor/builtin-imake.mk @@ -0,0 +1,12 @@ +XCOMM $NetBSD: builtin-imake.mk,v 1.1 2005/06/01 18:03:32 jlam Exp $ + +/* + * Check the value of BuildXcursorLibrary for the presence of + * Xcursor in the X11 distribution. + */ +builtin-test: +#if BuildXcursorLibrary + @echo yes +#else + @echo no +#endif diff --git a/x11/xcursor/builtin.mk b/x11/xcursor/builtin.mk index efb56f4eb37..f4ceddfe964 100644 --- a/x11/xcursor/builtin.mk +++ b/x11/xcursor/builtin.mk @@ -1,33 +1,53 @@ -# $NetBSD: builtin.mk,v 1.4 2004/07/24 06:48:51 grant Exp $ +# $NetBSD: builtin.mk,v 1.5 2005/06/01 18:03:32 jlam Exp $ -_X11_XCURSOR_XCURSOR_H= ${X11BASE}/include/X11/Xcursor/Xcursor.h +BUILTIN_PKG:= xcursor +BUILTIN_FIND_FILES_VAR:= H_XCURSOR +BUILTIN_FIND_FILES.H_XCURSOR= ${X11BASE}/include/X11/Xcursor/Xcursor.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.xcursor) IS_BUILTIN.xcursor= no -. if exists(${_X11_XCURSOR_XCURSOR_H}) -IS_BUILTIN.xcursor= yes -# -# Create an appropriate package name for the built-in Xcursor distributed -# with the system. This package name can be used to check against -# BUILDLINK_DEPENDS.<pkg> to see if we need to install the pkgsrc version -# or if the built-in one is sufficient. -# -_XCURSOR_MAJOR!= \ - ${AWK} '/\#define[ ]*XCURSOR_(LIB_)?MAJOR/ { print $$3 }' \ - ${_X11_XCURSOR_XCURSOR_H} -_XCURSOR_MINOR!= \ - ${AWK} '/\#define[ ]*XCURSOR_(LIB_)?MINOR/ { print "."$$3 }' \ - ${_X11_XCURSOR_XCURSOR_H} -_XCURSOR_REVISION!= \ - ${AWK} '/\#define[ ]*XCURSOR_(LIB_)?MINOR/ { print "."$$3 }' \ - ${_X11_XCURSOR_XCURSOR_H} -_XCURSOR_VERSION= ${_XCURSOR_MAJOR}${_XCURSOR_MINOR}${_XCURSOR_REVISION} -BUILTIN_PKG.xcursor= xcursor-${_XCURSOR_VERSION} -BUILDLINK_VARS+= BUILTIN_PKG.xcursor +. if exists(${H_XCURSOR}) +PKGSRC_USE_TOOLS+= imake # XXX +IMAKE?= ${X11BASE}/bin/imake # XXX +. if defined(IMAKE) && exists(${IMAKE}) +IS_BUILTIN.xcursor!= \ + ${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config \ + -f ${BUILDLINK_PKGSRCDIR.xcursor}/builtin-imake.mk \ + -s - | \ + ${MAKE} -f - builtin-test +. endif . endif -BUILDLINK_VARS+= IS_BUILTIN.xcursor -.endif # IS_BUILTIN.xcursor +.endif +MAKEVARS+= IS_BUILTIN.xcursor +### +### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to +### a package name to represent the built-in package. +### +.if !defined(BUILTIN_PKG.xcursor) && \ + !empty(IS_BUILTIN.xcursor:M[yY][eE][sS]) && \ + exists(${H_XCURSOR}) +BUILTIN_VERSION.xcursor!= \ + ${AWK} '/\#define[ ]*XCURSOR_(LIB_)?MAJOR/ { M = $$3 } \ + /\#define[ ]*XCURSOR_(LIB_)?MINOR/ { m = "."$$3 } \ + /\#define[ ]*XCURSOR_(LIB_)?REVISION/ { r = "."$$3 } \ + END { printf "%s%s%s\n", M, m, r }' \ + ${H_XCURSOR} +BUILTIN_PKG.xcursor= xcursor-${BUILTIN_VERSION.xcursor} +.endif +MAKEVARS+= BUILTIN_PKG.xcursor + +### +### 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.Xfixes) && !empty(USE_BUILTIN.Xfixes:M[nN][oO]) USE_BUILTIN.xcursor= no .endif @@ -36,42 +56,49 @@ USE_BUILTIN.xcursor= no .endif .if !defined(USE_BUILTIN.xcursor) -USE_BUILTIN.xcursor?= ${IS_BUILTIN.xcursor} - -. if defined(BUILTIN_PKG.xcursor) +. if ${PREFER.xcursor} == "pkgsrc" +USE_BUILTIN.xcursor= no +. else +USE_BUILTIN.xcursor= ${IS_BUILTIN.xcursor} +. if defined(BUILTIN_PKG.xcursor) && \ + !empty(IS_BUILTIN.xcursor:M[yY][eE][sS]) USE_BUILTIN.xcursor= yes -. for _depend_ in ${BUILDLINK_DEPENDS.xcursor} -. if !empty(USE_BUILTIN.xcursor:M[yY][eE][sS]) -USE_BUILTIN.xcursor!= \ - if ${PKG_ADMIN} pmatch '${_depend_}' ${BUILTIN_PKG.xcursor}; then \ - ${ECHO} "yes"; \ +. for _dep_ in ${BUILDLINK_DEPENDS.xcursor} +. if !empty(USE_BUILTIN.xcursor:M[yY][eE][sS]) +USE_BUILTIN.xcursor!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.xcursor:Q}; then \ + ${ECHO} yes; \ else \ - ${ECHO} "no"; \ + ${ECHO} no; \ fi -. endif -. endfor -. endif -.endif # USE_BUILTIN.xcursor +. endif +. endfor +. endif +. endif # PREFER.xcursor +.endif +MAKEVARS+= USE_BUILTIN.xcursor +### +### The section below only applies if we are not including this file +### solely to determine whether a built-in implementation exists. +### CHECK_BUILTIN.xcursor?= no .if !empty(CHECK_BUILTIN.xcursor:M[nN][oO]) -.if !empty(USE_BUILTIN.xcursor:M[nN][oO]) +. if !empty(USE_BUILTIN.xcursor:M[nN][oO]) BUILDLINK_DEPENDS.xcursor+= xcursor>=1.1.1 BUILDLINK_DEPENDS.Xrender+= Xrender>=0.8 -. for _mkfile_ in buildlink3.mk builtin.mk -. if exists(../../x11/Xfixes/${_mkfile_}) +. for _mkfile_ in buildlink3.mk builtin.mk BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -. include "../../x11/Xfixes/${_mkfile_}" +. sinclude "../../x11/Xfixes/${_mkfile_}" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} -. endif -. endfor -.endif +. endfor +. endif -.if !empty(USE_BUILTIN.xcursor:M[yY][eE][sS]) +. if !empty(USE_BUILTIN.xcursor:M[yY][eE][sS]) BUILDLINK_PREFIX.xcursor= ${X11BASE} BUILDLINK_FILES.xcursor+= lib/pkgconfig/xcursor.pc USE_BUILTIN.Xrender= yes -.endif +. endif .endif # CHECK_BUILTIN.xcursor diff --git a/x11/xdesktopwaves/Makefile b/x11/xdesktopwaves/Makefile index 127d9125c9b..9e9e67f8681 100644 --- a/x11/xdesktopwaves/Makefile +++ b/x11/xdesktopwaves/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/04/11 21:48:15 tv Exp $ +# $NetBSD: Makefile,v 1.4 2005/06/01 18:03:32 jlam Exp $ # DISTNAME= xdesktopwaves-1.1 @@ -10,13 +10,14 @@ HOMEPAGE= http://xdesktopwaves.sourceforge.net/ COMMENT= Simulates water waves on the X Windows desktop USE_DIRS+= xdg-1.1 -USE_X11= YES MAKE_FLAGS+= CFLAGS="${CFLAGS}" MAKE_FLAGS+= LFLAGS="${LDFLAGS}" INSTALLATION_DIRS= bin man/man1 share/doc/xdesktopwaves +.include "../../mk/x11.buildlink3.mk" + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xdesktopwaves ${PREFIX}/bin/ ${INSTALL_MAN} ${WRKSRC}/xdesktopwaves.1 ${PREFIX}/man/man1/ diff --git a/x11/xdialog/Makefile b/x11/xdialog/Makefile index 8768cc03d57..bc835ed8e5d 100644 --- a/x11/xdialog/Makefile +++ b/x11/xdialog/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/04/11 21:48:15 tv Exp $ +# $NetBSD: Makefile,v 1.15 2005/06/01 18:03:32 jlam Exp $ # DISTNAME= Xdialog-2.1.1 @@ -17,7 +17,6 @@ BUILD_USES_MSGFMT= YES USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES -USE_X11= YES DOCDIR= ${PREFIX}/share/doc/html/xdialog EGDIR= ${PREFIX}/share/examples/xdialog @@ -35,5 +34,4 @@ post-install: done .include "../../x11/gtk/buildlink3.mk" - .include "../../mk/bsd.pkg.mk" diff --git a/x11/xextensions/builtin.mk b/x11/xextensions/builtin.mk index a6032c4747e..b4fbc38c006 100644 --- a/x11/xextensions/builtin.mk +++ b/x11/xextensions/builtin.mk @@ -1,47 +1,68 @@ -# $NetBSD: builtin.mk,v 1.2 2005/03/22 15:52:35 jmmv Exp $ +# $NetBSD: builtin.mk,v 1.3 2005/06/01 18:03:32 jlam Exp $ -_X11_EXTENSIONS_EXTUTIL_H= ${X11BASE}/include/X11/extensions/extutil.h -_X11_EXTENSIONS_PC= ${X11BASE}/lib/pkgconfig/xextensions.pc +BUILTIN_PKG:= xextensions +BUILTIN_FIND_FILES_VAR:= H_XEXTENSIONS +BUILTIN_FIND_FILES.H_XEXTENSIONS= \ + ${X11BASE}/include/X11/extensions/extutil.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.xextensions) IS_BUILTIN.xextensions= no -. if exists(${_X11_EXTENSIONS_EXTUTIL_H}) && exists(${_X11_EXTENSIONS_PC}) +# +# Here, we skip checking whether the files are under ${LOCALBASE} since +# we'll consider this X11 package to be built-in even if it's a part +# of one of the pkgsrc-installed X11 distributions. +# +. if exists(${H_XEXTENSIONS}) IS_BUILTIN.xextensions= yes -# hardcode version for now, since there currently is only one, really -BUILTIN_PKG.xextensions= xextensions-1.0.1 -BUILDLINK_VARS+= BUILTIN_PKG.xextensions . endif -BUILDLINK_VARS+= IS_BUILTIN.xextensions -.endif # IS_BUILTIN.xextensions +.endif +MAKEVARS+= IS_BUILTIN.xextensions +### +### 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.xextensions) -USE_BUILTIN.xextensions?= ${IS_BUILTIN.xextensions} - -. if defined(BUILTIN_PKG.xextensions) +. if ${PREFER.xextensions} == "pkgsrc" +USE_BUILTIN.xextensions= no +. else +USE_BUILTIN.xextensions= ${IS_BUILTIN.xextensions} +. if defined(BUILTIN_PKG.xextensions) && \ + !empty(IS_BUILTIN.xextensions:M[yY][eE][sS]) USE_BUILTIN.xextensions= yes -. for _depend_ in ${BUILDLINK_DEPENDS.xextensions} -. if !empty(USE_BUILTIN.xextensions:M[yY][eE][sS]) -USE_BUILTIN.xextensions!= \ - if ${PKG_ADMIN} pmatch '${_depend_}' ${BUILTIN_PKG.xextensions}; then \ - ${ECHO} "yes"; \ +. for _dep_ in ${BUILDLINK_DEPENDS.xextensions} +. if !empty(USE_BUILTIN.xextensions:M[yY][eE][sS]) +USE_BUILTIN.xextensions!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.xextensions:Q}; then \ + ${ECHO} yes; \ else \ - ${ECHO} "no"; \ + ${ECHO} no; \ fi -. endif -. endfor -. endif -.endif # USE_BUILTIN.xextensions +. endif +. endfor +. endif +. endif # PREFER.xextensions +.endif +MAKEVARS+= USE_BUILTIN.xextensions +### +### The section below only applies if we are not including this file +### solely to determine whether a built-in implementation exists. +### CHECK_BUILTIN.xextensions?= no .if !empty(CHECK_BUILTIN.xextensions:M[nN][oO]) -.if !empty(USE_BUILTIN.xextensions:M[nN][oO]) -BUILDLINK_DEPENDS.xextensions+= xextensions>=1.0 -.endif - -.if !empty(USE_BUILTIN.xextensions:M[yY][eE][sS]) +. if !empty(USE_BUILTIN.xextensions:M[yY][eE][sS]) BUILDLINK_PREFIX.xextensions= ${X11BASE} -USE_X11= yes -.endif +. include "../../mk/x11.buildlink3.mk" +. include "../../mk/x11.builtin.mk" +. endif .endif # CHECK_BUILTIN.xextensions diff --git a/x11/xfstt/Makefile b/x11/xfstt/Makefile index 313c1adb3bc..cfce1dcbb9f 100644 --- a/x11/xfstt/Makefile +++ b/x11/xfstt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/05/22 20:08:52 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2005/06/01 18:03:32 jlam Exp $ # DISTNAME= xfstt-1.6 @@ -22,6 +22,8 @@ CXXFLAGS+= -fomit-frame-pointer -ffast-math RCD_SCRIPTS= xfstt +.include "../../mk/x11.buildlink3.mk" + post-patch: @( \ cd ${WRKSRC} ; \ diff --git a/x11/xjman/Makefile b/x11/xjman/Makefile index 27ab13a6ab1..e79448600a9 100644 --- a/x11/xjman/Makefile +++ b/x11/xjman/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/03/24 21:13:04 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:32 jlam Exp $ DISTNAME= xjman-0.5 CATEGORIES= japanese x11 @@ -22,6 +22,7 @@ NO_CONFIGURE= yes MANCOMPRESSED_IF_MANZ= yes .include "../../mk/bsd.prefs.mk" +.include "../../mk/x11.buildlink3.mk" post-extract: .for f in Makefile Makefile.inc diff --git a/x11/xkbd/Makefile b/x11/xkbd/Makefile index 0361db39316..90997d34f5a 100644 --- a/x11/xkbd/Makefile +++ b/x11/xkbd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/04/11 21:48:15 tv Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:32 jlam Exp $ # DISTNAME= xkbd-0.8.5 @@ -13,7 +13,6 @@ COMMENT= On-screen keyboard for X, useful for palmtops CONFIGURE_ARGS+=--enable-xpm GNU_CONFIGURE= YES -USE_X11= YES .include "../../graphics/xpm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xkbset/Makefile b/x11/xkbset/Makefile index 26cfbcc6a42..6846c3a6bde 100644 --- a/x11/xkbset/Makefile +++ b/x11/xkbset/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/04/11 21:48:15 tv Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:32 jlam Exp $ # DISTNAME= xkbset-0.3 @@ -14,4 +14,5 @@ USE_PERL5= build USE_X11BASE= yes REPLACE_PERL= mskacc-gui +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xlockmore/Makefile.common b/x11/xlockmore/Makefile.common index c79e2cb2163..6a3bf649dce 100644 --- a/x11/xlockmore/Makefile.common +++ b/x11/xlockmore/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.27 2005/05/30 23:34:49 hubertf Exp $ +# $NetBSD: Makefile.common,v 1.28 2005/06/01 18:03:32 jlam Exp $ # # This Makefile.common is included by: # @@ -61,6 +61,8 @@ CONFIGURE_ARGS+= --enable-def-play="${XLOCK_AUDIOPLAY}" CONFIGURE_ARGS+= --without-dpms .endif +.include "../../mk/x11.buildlink3.mk" + # Set the complete paths to the sound files and set the default xlock # mode/screensaver. # diff --git a/x11/xmindpath/Makefile b/x11/xmindpath/Makefile index 53a540be241..8a9994bc6fb 100644 --- a/x11/xmindpath/Makefile +++ b/x11/xmindpath/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/01/20 12:28:28 agc Exp $ +# $NetBSD: Makefile,v 1.9 2005/06/01 18:03:32 jlam Exp $ DISTNAME= magicpoint-1.09a PKGNAME= xmindpath-1.09a @@ -10,6 +10,6 @@ COMMENT= MindPath PocketPoint user-level driver for X11 WRKSRC= ${WRKDIR}/${DISTNAME}/contrib/xmindpath GNU_CONFIGURE= yes -USE_X11= yes +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xneko/Makefile b/x11/xneko/Makefile index d97d1fdfa40..cc0a1d69fff 100644 --- a/x11/xneko/Makefile +++ b/x11/xneko/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/03/24 21:13:04 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2005/06/01 18:03:33 jlam Exp $ DISTNAME= xneko PKGNAME= xneko-4.4 @@ -10,7 +10,6 @@ MAINTAINER= tech-pkg@NetBSD.org COMMENT= Classic BSD4.4 cat-and-mouse WRKSRC= ${WRKDIR}/pub/bsd-sources/4.4BSD-Lite/usr/src/games/xneko -USE_X11= yes MANCOMPRESSED_IF_MANZ= yes PLIST_SRC= ${WRKDIR}/PLIST @@ -19,6 +18,8 @@ PLIST_SRC= ${WRKDIR}/PLIST BUILD_DEFS+= MANINSTALL +.include "../../mk/x11.buildlink3.mk" + post-install: @${CP} ${PKGDIR}/PLIST ${PLIST_SRC} @for OPT in ${MANINSTALL} x; do \ diff --git a/x11/xnodecor/Makefile b/x11/xnodecor/Makefile index 0a250074b10..853caa9f55d 100644 --- a/x11/xnodecor/Makefile +++ b/x11/xnodecor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/04/11 21:48:15 tv Exp $ +# $NetBSD: Makefile,v 1.6 2005/06/01 18:03:33 jlam Exp $ DISTNAME= xnodecor-0.1 CATEGORIES= x11 @@ -12,6 +12,8 @@ COMMENT= Borderless or undecorated window support utility USE_X11BASE= yes NO_CONFIGURE= yes +.include "../../mk/x11.buildlink3.mk" + do-extract: @${MKDIR} ${WRKSRC} ${CP} ${FILESDIR}/Makefile ${WRKSRC} diff --git a/x11/xorg-clients/Makefile b/x11/xorg-clients/Makefile index 2008b29abf6..19b89791483 100644 --- a/x11/xorg-clients/Makefile +++ b/x11/xorg-clients/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/04/15 15:31:14 hira Exp $ +# $NetBSD: Makefile,v 1.15 2005/06/01 18:03:33 jlam Exp $ DISTNAME= ${DISTFILES} PKGNAME= xorg-clients-${XORG_VER} @@ -13,7 +13,6 @@ HOMEPAGE= http://www.x.org/ COMMENT= X.org client programs and related files USE_PKGINSTALL= yes -USE_X11= yes DISTINFO_FILE= ${.CURDIR}/../../x11/xorg-libs/distinfo PATCHDIR= ${.CURDIR}/../../x11/xorg-libs/patches diff --git a/x11/xorg-libs/builtin.mk b/x11/xorg-libs/builtin.mk new file mode 100644 index 00000000000..f600b89da58 --- /dev/null +++ b/x11/xorg-libs/builtin.mk @@ -0,0 +1,81 @@ +# $NetBSD: builtin.mk,v 1.1 2005/06/01 18:03:33 jlam Exp $ + +BUILTIN_PKG:= xorg-libs + +BUILTIN_FIND_FILES_VAR:= CF_XORG +BUILTIN_FIND_FILES.CF_XORG= ${X11BASE}/lib/X11/config/xorg.cf + +.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.xorg-libs) +IS_BUILTIN.xorg-libs= no +. if exists(${CF_XORG}) +IS_BUILTIN.xorg-libs= yes +. endif +.endif +MAKEVARS+= IS_BUILTIN.xorg-libs + +### +### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to +### a package name to represent the built-in package. +### +.if !defined(BUILTIN_PKG.xorg-libs) && \ + !empty(IS_BUILTIN.xorg-libs:M[yY][eE][sS]) && \ + exists(${CF_XORG}) +. include "${BUILDLINK_PKGSRCDIR.xorg-libs}/version.mk" +BUILTIN_PKG.xorg-libs= xorg-libs-${BUILTIN_X11_VERSION.xorg} +.endif +MAKEVARS+= BUILTIN_PKG.xorg-libs + +### +### 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.xorg-libs) +. if ${PREFER.xorg-libs} == "pkgsrc" +USE_BUILTIN.xorg-libs= no +. else +USE_BUILTIN.xorg-libs= ${IS_BUILTIN.xorg-libs} +. if defined(BUILTIN_PKG.xorg-libs) && \ + !empty(IS_BUILTIN.xorg-libs:M[yY][eE][sS]) +USE_BUILTIN.xorg-libs= yes +. for _dep_ in ${BUILDLINK_DEPENDS.xorg-libs} +. if !empty(USE_BUILTIN.xorg-libs:M[yY][eE][sS]) +USE_BUILTIN.xorg-libs!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.xorg-libs:Q}; then \ + ${ECHO} yes; \ + else \ + ${ECHO} no; \ + fi +. endif +. endfor +. endif +. endif # PREFER.xorg-libs +.endif +MAKEVARS+= USE_BUILTIN.xorg-libs + +### +### The section below only applies if we are not including this file +### solely to determine whether a built-in implementation exists. +### +CHECK_BUILTIN.xorg-libs?= no +.if !empty(CHECK_BUILTIN.xorg-libs:M[nN][oO]) + +. if !empty(USE_BUILTIN.xorg-libs:M[yY][eE][sS]) +BUILDLINK_PREFIX.xorg-libs= ${X11BASE} +BUILDLINK_FILES.xorg-libs+= lib/pkgconfig/xorg-libs.pc +. endif + +# XXX +# XXX xorg-libs provides some X11 pieces that pkgsrc should currently +# XXX treat as "built-in" so that extra dependencies on the pkgsrc +# XXX versions aren't pulled in. +# XXX +USE_BUILTIN.Xfixes= yes +USE_BUILTIN.Xcomposite= yes + +.endif # CHECK_BUILTIN.xorg-libs diff --git a/x11/xorg-libs/version.mk b/x11/xorg-libs/version.mk new file mode 100644 index 00000000000..0ee5141cb8f --- /dev/null +++ b/x11/xorg-libs/version.mk @@ -0,0 +1,44 @@ +# $NetBSD: version.mk,v 1.1 2005/06/01 18:03:33 jlam Exp $ +# +# This Makefile fragment is included by Makefiles that need to access +# the X11_TYPE and version number of an X.org distribution. +# +# The following variables are provided by this file: +# +# BUILTIN_X11_TYPE.xorg is the X11_TYPE of the X.org distribution +# and is simply "xorg". +# +# BUILTIN_X11_VERSION.xorg is the version number of the X.org +# distribution detected on the system. +# + +BUILTIN_X11_TYPE.xorg= xorg + +BUILTIN_FILES_VAR:= CF_XORGVERSION CF_XORG +BUILTIN_FILES.CF_XORGVERSION= ${X11BASE}/lib/X11/config/xorgversion.def +BUILTIN_FILES.CF_XORG= ${X11BASE}/lib/X11/config/xorg.cf +.include "../../mk/buildlink3/find-files.mk" + +.if !defined(BUILTIN_XORG_VERSION_FILE) +BUILTIN_XORG_VERSION_FILE= __nonexistent__ +. if exists(${BUILTIN_X11_CONFIG_XORGVERSION_DEF}) +BUILTIN_XORG_VERSION_FILE= ${BUILTIN_X11_CONFIG_XORGVERSION_DEF} +. elif exists(${BUILTIN_X11_CONFIG_XORG_CF}) +BUILTIN_XORG_VERSION_FILE= ${BUILTIN_X11_CONFIG_XORG_CF} +. endif +.endif +MAKEVARS+= BUILTIN_XORG_VERSION_FILE + +.if !defined(BUILTIN_X11_VERSION.xorg) && \ + exists(${BUILTIN_XORG_VERSION_FILE}) +BUILTIN_X11_VERSION.xorg!= \ + ${AWK} '/\#define[ ]*XORG_VERSION_MAJOR/ { M = $$3 } \ + /\#define[ ]*XORG_VERSION_MINOR/ { m = "."$$3 } \ + /\#define[ ]*XORG_VERSION_PATCH/ { p = "."$$3 } \ + /\#define[ ]*XORG_VERSION_SNAP/ { s = "."$$3 } \ + END { if (s == ".0") s = ""; \ + if (p == ".0" && s == "") p = ""; \ + printf "%s%s%s%s\n", M, m, p, s }' \ + ${BUILTIN_XORG_VERSION_FILE} +.endif +MAKEVARS+= BUILTIN_X11_VERSION.xorg diff --git a/x11/xorg-server/Makefile b/x11/xorg-server/Makefile index d02a800087f..7d8ca477188 100644 --- a/x11/xorg-server/Makefile +++ b/x11/xorg-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/04/15 21:53:38 hira Exp $ +# $NetBSD: Makefile,v 1.26 2005/06/01 18:03:33 jlam Exp $ DISTNAME= ${DISTFILES} PKGNAME= xorg-server-${XORG_VER} @@ -13,7 +13,6 @@ MAINTAINER= xtraeme@NetBSD.org HOMEPAGE= http://www.x.org/ COMMENT= X.org X server and related programs -USE_X11= yes DISTINFO_FILE= ${.CURDIR}/../../x11/xorg-libs/distinfo PATCHDIR= ${.CURDIR}/../../x11/xorg-libs/patches @@ -90,4 +89,5 @@ BUILDLINK_DEPENDS.xorg-libs+= xorg-libs>=6.8.2nb1 .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../meta-pkgs/xorg/Makefile.common" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xosd/Makefile.common b/x11/xosd/Makefile.common index 0c772b4bb85..002249a89d1 100644 --- a/x11/xosd/Makefile.common +++ b/x11/xosd/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.18 2005/04/11 21:48:15 tv Exp $ +# $NetBSD: Makefile.common,v 1.19 2005/06/01 18:03:33 jlam Exp $ DISTNAME= xosd-2.2.12 CATEGORIES= x11 @@ -13,7 +13,6 @@ PATCHDIR= ${.CURDIR}/../../x11/xosd/patches GNU_CONFIGURE= yes USE_LIBTOOL= yes -USE_X11= yes SHLIBTOOL_OVERRIDE= libtool-disable-static @@ -30,3 +29,4 @@ SUBST_SED.fixme= -e "s|-lpthread|${PTHREAD_LIBS}|g" PTHREAD_AUTO_VARS= yes .include "../../mk/pthread.buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" diff --git a/x11/xpad/Makefile b/x11/xpad/Makefile index 4ac1ea13341..042908e7fd3 100644 --- a/x11/xpad/Makefile +++ b/x11/xpad/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/05/22 20:08:52 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2005/06/01 18:03:33 jlam Exp $ # DISTNAME= xpad-1.12 @@ -17,7 +17,6 @@ GNU_CONFIGURE= yes USE_DIRS+= xdg-1.1 USE_TOOLS+= gmake USE_PKGLOCALEDIR= yes -USE_X11= yes LIBS.SunOS= -lX11 diff --git a/x11/xpenguins/Makefile b/x11/xpenguins/Makefile index de1252fd9f3..b499e7f41cb 100644 --- a/x11/xpenguins/Makefile +++ b/x11/xpenguins/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/04/11 21:48:16 tv Exp $ +# $NetBSD: Makefile,v 1.17 2005/06/01 18:03:33 jlam Exp $ # DISTNAME= xpenguins-2.2 @@ -9,7 +9,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://xpenguins.seul.org/ COMMENT= Little penguins walking along the tops of your windows -USE_X11= YES GNU_CONFIGURE= YES .include "../../graphics/xpm/buildlink3.mk" diff --git a/x11/xplanet/Makefile b/x11/xplanet/Makefile index 5a50f281e53..a3a7ffd9374 100644 --- a/x11/xplanet/Makefile +++ b/x11/xplanet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/05/22 20:08:52 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2005/06/01 18:03:33 jlam Exp $ DISTNAME= xplanet-1.1.2 CATEGORIES= x11 @@ -9,7 +9,6 @@ HOMEPAGE= http://xplanet.sourceforge.net/ COMMENT= Rotating rendered map of the Earth in X11 root window USE_TOOLS+= gmake -USE_X11= yes GNU_CONFIGURE= yes # directory creation should be fixed in the future release of xplanet diff --git a/x11/xpmicons/Makefile b/x11/xpmicons/Makefile index a1634426536..f5b3290718b 100644 --- a/x11/xpmicons/Makefile +++ b/x11/xpmicons/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/01/20 12:28:29 agc Exp $ +# $NetBSD: Makefile,v 1.9 2005/06/01 18:03:33 jlam Exp $ DISTNAME= xpmicons-1.0 CATEGORIES= x11 @@ -21,6 +21,8 @@ DIST_SUBDIR= icons USE_X11BASE= yes NO_BUILD= yes +.include "../../mk/x11.buildlink3.mk" + post-extract: ${FIND} ${WRKSRC} -type d -name .xvpics -exec ${RM} -rf {} \; -prune diff --git a/x11/xpns/Makefile b/x11/xpns/Makefile index 2dcb76c2413..9b17be89fa4 100644 --- a/x11/xpns/Makefile +++ b/x11/xpns/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/04/11 21:48:16 tv Exp $ +# $NetBSD: Makefile,v 1.18 2005/06/01 18:03:33 jlam Exp $ DISTNAME= pns_source PKGNAME= xpns-1.0 @@ -15,6 +15,8 @@ USE_X11BASE= yes MAKEFILE= makefile BUILD_TARGET= pns +.include "../../mk/x11.buildlink3.mk" + do-install: ${INSTALL_DATA_DIR} ${PREFIX}/lib/xpns ${INSTALL_PROGRAM} ${WRKSRC}/pns ${PREFIX}/lib/xpns/ diff --git a/x11/xrestop/Makefile b/x11/xrestop/Makefile index 1971de98f6a..95ba1a5b6ed 100644 --- a/x11/xrestop/Makefile +++ b/x11/xrestop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2005/05/04 20:03:40 reed Exp $ +# $NetBSD: Makefile,v 1.2 2005/06/01 18:03:33 jlam Exp $ # DISTNAME= xrestop-0.3 @@ -9,8 +9,8 @@ MAINTAINER= reed@reedmedia.net HOMEPAGE= http://www.freedesktop.org/Software/xrestop COMMENT= X11 clients' server-side resource usage monitor -USE_X11= yes GNU_CONFIGURE= yes .include "../../devel/ncurses/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xservers/Makefile b/x11/xservers/Makefile index 14e760c85fb..30281ab810b 100644 --- a/x11/xservers/Makefile +++ b/x11/xservers/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/05/25 11:54:55 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2005/06/01 18:03:33 jlam Exp $ DISTNAME= xservers-3.3.6.3 CATEGORIES= x11 @@ -33,6 +33,7 @@ X11_SRCS= Imakefile Makefile config fonts include lib nls \ MESSAGE_SUBST+= X11_SUBDIR=${X11_SUBDIR} .include "../../mk/bsd.prefs.mk" +.include "../../mk/x11.buildlink3.mk" do-fetch: .if defined(BSDXSRCDIR) diff --git a/x11/xteddy/Makefile b/x11/xteddy/Makefile index b53930bddb0..6ded9bcc261 100644 --- a/x11/xteddy/Makefile +++ b/x11/xteddy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/04/11 21:48:16 tv Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 18:03:33 jlam Exp $ DISTNAME= xteddy-1.1 CATEGORIES= x11 games @@ -8,7 +8,6 @@ MAINTAINER= johnam@mail.kemper.org HOMEPAGE= http://www.ITN.LiU.SE/~stegu/xteddy COMMENT= Xteddy is a cuddly teddy bear for your X Windows desktop -USE_X11= YES GNU_CONFIGURE= YES pre-install: @@ -16,5 +15,4 @@ pre-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/xteddy/pixmaps .include "../../graphics/xpm/buildlink3.mk" - .include "../../mk/bsd.pkg.mk" diff --git a/x11/xteddy2/Makefile b/x11/xteddy2/Makefile index cd4ef2b3558..3b77d27163a 100644 --- a/x11/xteddy2/Makefile +++ b/x11/xteddy2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/04/11 21:48:16 tv Exp $ +# $NetBSD: Makefile,v 1.19 2005/06/01 18:03:33 jlam Exp $ DISTNAME= xteddy-2.0.1 PKGREVISION= 6 @@ -11,7 +11,6 @@ COMMENT= Teddy bear for your desktop CONFLICT+= xteddy-1.* -USE_X11= yes GNU_CONFIGURE= yes pre-configure: diff --git a/x11/xterm/Makefile b/x11/xterm/Makefile index 7dd56a90c56..d72db05e149 100644 --- a/x11/xterm/Makefile +++ b/x11/xterm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/04/11 21:48:16 tv Exp $ +# $NetBSD: Makefile,v 1.19 2005/06/01 18:03:33 jlam Exp $ DISTNAME= xterm-200 PKGREVISION= 1 @@ -11,10 +11,10 @@ HOMEPAGE= http://dickey.his.com/xterm/xterm.html COMMENT= Latest terminal emulator for the X Window System GNU_CONFIGURE= yes -USE_X11= yes WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} .include "../../mk/bsd.prefs.mk" +.include "../../mk/x11.buildlink3.mk" .if ${OPSYS} == "SunOS" INSTALL_FILE= ${WRKDIR}/INSTALL diff --git a/x11/xtermset/Makefile b/x11/xtermset/Makefile index 35fd1a7167b..8108dabefea 100644 --- a/x11/xtermset/Makefile +++ b/x11/xtermset/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/04/11 21:48:16 tv Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 18:03:33 jlam Exp $ # DISTNAME= xtermset-0.5.2 @@ -12,6 +12,8 @@ COMMENT= Change things like foreground color, size etc. on an xterm #USE_X11BASE= YES GNU_CONFIGURE= yes +.include "../../mk/x11.buildlink3.mk" + xpost-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xtermset ${INSTALL_DATA} ${WRKSRC}/ctlseqs.ms ${PREFIX}/share/doc/xtermset diff --git a/x11/xvattr/Makefile b/x11/xvattr/Makefile index 94087cdf970..104b0387a8c 100644 --- a/x11/xvattr/Makefile +++ b/x11/xvattr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/04/11 21:48:17 tv Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/01 18:03:33 jlam Exp $ DISTNAME= xvattr-1.3 PKGREVISION= 3 @@ -9,7 +9,6 @@ MAINTAINER= veego@NetBSD.org HOMEPAGE= http://www.dtek.chalmers.se/groups/dvd/ COMMENT= Modify Xv attributes -USE_X11= # defined GNU_CONFIGURE= # defined .include "../../mk/bsd.prefs.mk" diff --git a/x11/xvidcap/Makefile.common b/x11/xvidcap/Makefile.common index 82a2c5b0f3c..bd89b0f0add 100644 --- a/x11/xvidcap/Makefile.common +++ b/x11/xvidcap/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.2 2005/04/11 21:48:17 tv Exp $ +# $NetBSD: Makefile.common,v 1.3 2005/06/01 18:03:33 jlam Exp $ # # Note: when upgrading version, be sure to update distinfo in xvidcap-gtk2 also @@ -9,7 +9,6 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xvidcap/} MAINTAINER= reed@reedmedia.net HOMEPAGE= http://xvidcap.sourceforge.net/ -USE_X11= yes GNU_CONFIGURE= yes .include "../../devel/zlib/buildlink3.mk" @@ -17,3 +16,4 @@ GNU_CONFIGURE= yes .include "../../graphics/png/buildlink3.mk" .include "../../multimedia/ffmpeg/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" diff --git a/x11/xworld/Makefile b/x11/xworld/Makefile index 29dae3c15ad..8553120e700 100644 --- a/x11/xworld/Makefile +++ b/x11/xworld/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/04/11 21:48:17 tv Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 18:03:33 jlam Exp $ # DISTNAME= xworld-2.0 @@ -11,7 +11,6 @@ MAINTAINER= wennmach@NetBSD.org COMMENT= Earth as seen from the direction of the sun HAS_CONFIGURE= yes -USE_X11= yes CONFIGURE_ENV+= PREFIX="${PREFIX}" CONFIGURE_ENV+= LDLIBS="-lm ${LDFLAGS} -lX11" @@ -23,4 +22,5 @@ SUBST_STAGE.install= post-patch SUBST_FILES.install= Makefile.in SUBST_SED.install= -e 's,-g bin -o bin,-g ${BINGRP} -o ${BINOWN},g' +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xwrits/Makefile b/x11/xwrits/Makefile index 139d5a7efb2..a88ae95c64e 100644 --- a/x11/xwrits/Makefile +++ b/x11/xwrits/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/04/11 21:48:17 tv Exp $ +# $NetBSD: Makefile,v 1.16 2005/06/01 18:03:33 jlam Exp $ DISTNAME= xwrits-2.21 CATEGORIES= x11 @@ -9,6 +9,6 @@ HOMEPAGE= http://www.lcdf.org/~eddietwo/xwrits/ COMMENT= Wrist break reminder for prevention of repetitive stress injuries GNU_CONFIGURE= YES -USE_X11= YES +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile index 22a9c006af1..01adede0eaa 100644 --- a/x11/zenity/Makefile +++ b/x11/zenity/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/05/22 20:08:52 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2005/06/01 18:03:33 jlam Exp $ # DISTNAME= zenity-2.10.0 @@ -16,7 +16,6 @@ USE_DIRS+= gnome2-1.5 USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes USE_TOOLS+= gmake -USE_X11= yes BUILDLINK_DEPENDS.glib2+= glib2>=2.6.0 |