diff options
author | joerg <joerg@pkgsrc.org> | 2006-12-27 13:37:35 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2006-12-27 13:37:35 +0000 |
commit | d26cf36e5784f5b648404b8d68c21adb4398f33f (patch) | |
tree | cbd8d2123ffe05331db8b76b38b2de8182524736 /geography/xrmap-base/patches | |
parent | 6432f76116c5a27e6f554145314e47d93eeec7a9 (diff) | |
download | pkgsrc-d26cf36e5784f5b648404b8d68c21adb4398f33f.tar.gz |
- fine grained X11 dependencies for packages which have either USE_IMAKE
or USE_X11BASE set, but don't include mk/x11.buildlink3.mk directly or
via buildlink3.mks
- introduce BUILDLINK_PREFIX.libXpm as alias for BUILDLINK_PREFIX.xpm
in the !modular case
- fix some cases where the check for libX11 couldn't work at all by using
C++ for compilation without including the proper headers
Verified using a full X11_TYPE=xorg bulk build without additional
breakage. Discussed with salo@, wiz@ and send to packages@ for feedback.
Diffstat (limited to 'geography/xrmap-base/patches')
-rw-r--r-- | geography/xrmap-base/patches/patch-aa | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/geography/xrmap-base/patches/patch-aa b/geography/xrmap-base/patches/patch-aa index 3ef7f4ab28c..956b6153f76 100644 --- a/geography/xrmap-base/patches/patch-aa +++ b/geography/xrmap-base/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.2 2004/09/09 10:26:27 drochner Exp $ +$NetBSD: patch-aa,v 1.3 2006/12/27 13:37:37 joerg Exp $ --- Imakefile.orig 2003-05-18 20:53:02.000000000 +0200 +++ Imakefile @@ -18,21 +18,3 @@ $NetBSD: patch-aa,v 1.2 2004/09/09 10:26:27 drochner Exp $ XCOMM Default external utilities : XCOMM PostScript viewer, image viewer, HTML viewer, Print command -@@ -68,7 +60,7 @@ install.man:: - - all:: - strip xrmap ; ls -al xrmap -- cd editkit ; xmkmf ; make -+ cd editkit ; pkgxmkmf ; make - - install:: install.man - $(MKDIRHIER) $(DESTDIR)$(SHAREDIR) -@@ -88,7 +80,7 @@ install:: install.man - EXAMPLE.rc midi_cfg/README.midi $(DESTDIR)$(SHAREDIR)/doc - cd rc ; rm -f *~ - cp -fR rc $(DESTDIR)$(SHAREDIR) -- cd editkit ; xmkmf ; make install -+ cd editkit ; pkgxmkmf ; make install - cat WARNING - - clean:: |