diff options
author | tron <tron> | 2007-12-15 17:53:39 +0000 |
---|---|---|
committer | tron <tron> | 2007-12-15 17:53:39 +0000 |
commit | 74768efd182c7b940152d6fd1b07f25034e9cd6e (patch) | |
tree | 7b1d3b65c2510bd584998d67f04166b9f3ec2eac /pkgtools | |
parent | cc5e78463ce6d28250a9f6584f80647b175b3bef (diff) | |
download | pkgsrc-74768efd182c7b940152d6fd1b07f25034e9cd6e.tar.gz |
Update "x11-links" package to version 0.32:
- Update X.org support to support systems with modular X.org in the
base distribution.
- Add support Mac OS X Leopard.
Diffstat (limited to 'pkgtools')
-rw-r--r-- | pkgtools/x11-links/Makefile | 13 | ||||
-rw-r--r-- | pkgtools/x11-links/buildlink3.mk | 4 | ||||
-rw-r--r-- | pkgtools/x11-links/files/xorg | 56 | ||||
-rw-r--r-- | pkgtools/x11-links/files/xorg.expat | 8 | ||||
-rw-r--r-- | pkgtools/x11-links/files/xorg.fontconfig | 11 | ||||
-rw-r--r-- | pkgtools/x11-links/files/xorg.freetype2 | 54 | ||||
-rw-r--r-- | pkgtools/x11-links/files/xorg.kbproto | 8 | ||||
-rw-r--r-- | pkgtools/x11-links/files/xorg.libX11 | 25 | ||||
-rw-r--r-- | pkgtools/x11-links/files/xorg.libXau | 12 | ||||
-rw-r--r-- | pkgtools/x11-links/files/xorg.libXdmcp | 12 | ||||
-rw-r--r-- | pkgtools/x11-links/files/xorg.renderproto | 5 | ||||
-rw-r--r-- | pkgtools/x11-links/files/xorg.xproto | 28 | ||||
-rw-r--r-- | pkgtools/x11-links/xorg.mk | 11 |
13 files changed, 185 insertions, 62 deletions
diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile index 2b039f4e436..6095cf1b569 100644 --- a/pkgtools/x11-links/Makefile +++ b/pkgtools/x11-links/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.85 2007/11/11 11:35:50 martti Exp $ +# $NetBSD: Makefile,v 1.86 2007/12/15 17:53:39 tron 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, # usually the most recent. -DISTNAME= x11-links-0.31 +DISTNAME= x11-links-0.32 CATEGORIES= pkgtools x11 MASTER_SITES= # empty DISTFILES= # empty @@ -65,6 +65,9 @@ do-build: if [ -d ${X11BASE}/$$dir ]; then \ ${MKDIR} ${X11_LINKS_BUILD_DIR}/$$dir; \ ${CHMOD} ${PKGDIRMODE} ${X11_LINKS_BUILD_DIR}/$$dir; \ + elif [ -d /usr/$$dir ]; then \ + ${MKDIR} ${X11_LINKS_BUILD_DIR}/$$dir; \ + ${CHMOD} ${PKGDIRMODE} ${X11_LINKS_BUILD_DIR}/$$dir; \ fi; \ done ${RM} -f ${PLIST_SRC.files} @@ -76,6 +79,12 @@ do-build: ${CREATE_X11LINK}; \ ${ECHO} "${X11_LINKS_SUBDIR}/$$file" \ >> ${PLIST_SRC.files}; \ + elif ${TEST} -r /usr/$$file; then \ + src="/usr/$$file"; \ + dest="${X11_LINKS_BUILD_DIR}/$$file"; \ + ${CREATE_X11LINK}; \ + ${ECHO} "${X11_LINKS_SUBDIR}/$$file" \ + >> ${PLIST_SRC.files}; \ fi; \ done ${RM} -f ${PLIST_SRC.dirs} diff --git a/pkgtools/x11-links/buildlink3.mk b/pkgtools/x11-links/buildlink3.mk index 0131bfaa361..d215a623010 100644 --- a/pkgtools/x11-links/buildlink3.mk +++ b/pkgtools/x11-links/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2007/01/17 03:11:19 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2007/12/15 17:53:40 tron Exp $ # # Don't include this file manually! It will be included as necessary # by bsd.buildlink3.mk. @@ -18,7 +18,7 @@ BUILDLINK_PACKAGES:= x11-links ${BUILDLINK_PACKAGES} BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}x11-links .if !empty(X11_LINKS_BUILDLINK3_MK:M+) -BUILDLINK_API_DEPENDS.x11-links+= x11-links>=0.25 +BUILDLINK_API_DEPENDS.x11-links+= x11-links>=0.32 BUILDLINK_PKGSRCDIR.x11-links?= ../../pkgtools/x11-links BUILDLINK_DEPMETHOD.x11-links?= build diff --git a/pkgtools/x11-links/files/xorg b/pkgtools/x11-links/files/xorg index 76ff25e7db8..e2f594f15ef 100644 --- a/pkgtools/x11-links/files/xorg +++ b/pkgtools/x11-links/files/xorg @@ -1,4 +1,4 @@ -# $NetBSD: xorg,v 1.2 2006/01/19 01:05:24 reed Exp $ +# $NetBSD: xorg,v 1.3 2007/12/15 17:53:40 tron Exp $ # # The files listed below are the union of the sets of files installed by # the supported Xorg (and some XFree) distributions, minus the set of files @@ -37,8 +37,6 @@ include/X11/ConstrainP.h include/X11/Constraint.h include/X11/Core.h include/X11/CoreP.h -include/X11/DECkeysym.h -include/X11/HPkeysym.h include/X11/ICE/ICE.h include/X11/ICE/ICEconn.h include/X11/ICE/ICElib.h @@ -64,18 +62,9 @@ include/X11/SM/SMproto.h include/X11/Shell.h include/X11/ShellP.h include/X11/StringDefs.h -include/X11/Sunkeysym.h include/X11/Vendor.h include/X11/VendorP.h -include/X11/X.h include/X11/X10.h -include/X11/XF86keysym.h -include/X11/XKBlib.h -include/X11/XWDFile.h -include/X11/Xalloca.h -include/X11/Xarch.h -include/X11/Xatom.h -include/X11/Xauth.h include/X11/Xaw/AllWidgets.h include/X11/Xaw/AsciiSink.h include/X11/Xaw/AsciiSinkP.h @@ -149,17 +138,7 @@ include/X11/Xaw/Viewport.h include/X11/Xaw/ViewportP.h include/X11/Xaw/XawImP.h include/X11/Xaw/XawInit.h -include/X11/Xcms.h -include/X11/Xdefs.h -include/X11/Xdmcp.h include/X11/Xft/XftFreetype.h -include/X11/Xfuncproto.h -include/X11/Xfuncs.h -include/X11/Xlib.h -include/X11/XlibConf.h -include/X11/Xlibint.h -include/X11/Xlocale.h -include/X11/Xmd.h include/X11/Xmu/Atoms.h include/X11/Xmu/CharSet.h include/X11/Xmu/CloseHook.h @@ -182,18 +161,8 @@ include/X11/Xmu/WidgetNode.h include/X11/Xmu/WinUtil.h include/X11/Xmu/Xct.h include/X11/Xmu/Xmu.h -include/X11/Xos.h -include/X11/Xos_r.h -include/X11/Xosdefs.h -include/X11/Xpoll.h include/X11/XprintAppUtil/xpapputil.h include/X11/XprintUtil/xprintutil.h -include/X11/Xproto.h -include/X11/Xprotostr.h -include/X11/Xresource.h -include/X11/Xthreads.h -include/X11/Xutil.h -include/X11/ap_keysym.h include/X11/bitmaps/1x1 include/X11/bitmaps/2x2 include/X11/bitmaps/Dashes @@ -292,7 +261,6 @@ include/X11/bitmaps/xlogo16 include/X11/bitmaps/xlogo32 include/X11/bitmaps/xlogo64 include/X11/bitmaps/xsnow -include/X11/cursorfont.h include/X11/extensions/Print.h include/X11/extensions/Printstr.h include/X11/extensions/XIE.h @@ -356,8 +324,6 @@ include/X11/fonts/codeconv/xttcommon.h include/X11/fonts/codeconv/xttversion.h include/X11/fonts/fontenc.h include/X11/fonts/fsmasks.h -include/X11/keysym.h -include/X11/keysymdef.h include/X11/pixmaps/card.xpm include/X11/pixmaps/computer.xpm include/X11/pixmaps/deny-always.xpm @@ -398,15 +364,6 @@ lib/libSM.dylib lib/libSM.so lib/libSM.so.6 lib/libSM.so.6.0 -lib/libX11.6.1.dylib -lib/libX11.6.2.dylib -lib/libX11.6.dylib -lib/libX11.a -lib/libX11.dylib -lib/libX11.so -lib/libX11.so.6 -lib/libX11.so.6.1 -lib/libX11.so.6.2 lib/libXIE.6.0.dylib lib/libXIE.6.dylib lib/libXIE.a @@ -425,10 +382,6 @@ lib/libXTrap.dylib lib/libXTrap.so lib/libXTrap.so.6 lib/libXTrap.so.6.4 -lib/libXau.a -lib/libXau.so -lib/libXau.so.6 -lib/libXau.so.6.0 lib/libXaw.6.1.dylib lib/libXaw.6.dylib lib/libXaw.7.0.dylib @@ -443,11 +396,6 @@ lib/libXaw.so.7.0 lib/libXaw.so.8.0 lib/libXdamage.a lib/libXdamage.so.1.0 -lib/libXdmcp.a -lib/libXdmcp.so -lib/libXdmcp.so.6 -lib/libXdmcp.so.6.0 -lib/libXdpms.a lib/libXevie.a lib/libXevie.so.1.0 lib/libXext.6.3.dylib @@ -476,6 +424,8 @@ lib/libXfontcache.so.1.2 lib/libXft.1.0.dylib lib/libXft.1.1.dylib lib/libXft.1.dylib +lib/libXft.2.1.2.dylib +lib/libXft.2.dylib lib/libXft.dylib lib/libXft.so.1 lib/libXft.so.1.0 diff --git a/pkgtools/x11-links/files/xorg.expat b/pkgtools/x11-links/files/xorg.expat new file mode 100644 index 00000000000..40ade3c36b0 --- /dev/null +++ b/pkgtools/x11-links/files/xorg.expat @@ -0,0 +1,8 @@ +# $NetBSD: xorg.expat,v 1.1 2007/12/15 17:53:40 tron Exp $ +# +include/expat.h +include/expat_external.h +lib/libexpat.1.5.0.dylib +lib/libexpat.1.dylib +lib/libexpat.dylib +lib/libexpat.la diff --git a/pkgtools/x11-links/files/xorg.fontconfig b/pkgtools/x11-links/files/xorg.fontconfig new file mode 100644 index 00000000000..731dceb318a --- /dev/null +++ b/pkgtools/x11-links/files/xorg.fontconfig @@ -0,0 +1,11 @@ +# $NetBSD: xorg.fontconfig,v 1.1 2007/12/15 17:53:40 tron Exp $ +# +include/fontconfig/fcfreetype.h +include/fontconfig/fcprivate.h +include/fontconfig/fontconfig.h +lib/libfontconfig.la +lib/libfontconfig.1.1.0.dylib +lib/libfontconfig.1.dylib +lib/libfontconfig.dylib +lib/libfontconfig.la +lib/pkgconfig/fontconfig.pc diff --git a/pkgtools/x11-links/files/xorg.freetype2 b/pkgtools/x11-links/files/xorg.freetype2 new file mode 100644 index 00000000000..232807415ad --- /dev/null +++ b/pkgtools/x11-links/files/xorg.freetype2 @@ -0,0 +1,54 @@ +# $NetBSD: xorg.freetype2,v 1.1 2007/12/15 17:53:40 tron Exp $ +# +bin/freetype-config +include/freetype2/freetype/config/ftconfig.h +include/freetype2/freetype/config/ftheader.h +include/freetype2/freetype/config/ftmodule.h +include/freetype2/freetype/config/ftoption.h +include/freetype2/freetype/config/ftstdlib.h +include/freetype2/freetype/freetype.h +include/freetype2/freetype/ftbbox.h +include/freetype2/freetype/ftbdf.h +include/freetype2/freetype/ftbitmap.h +include/freetype2/freetype/ftcache.h +include/freetype2/freetype/ftchapters.h +include/freetype2/freetype/fterrdef.h +include/freetype2/freetype/fterrors.h +include/freetype2/freetype/ftgasp.h +include/freetype2/freetype/ftglyph.h +include/freetype2/freetype/ftgxval.h +include/freetype2/freetype/ftgzip.h +include/freetype2/freetype/ftimage.h +include/freetype2/freetype/ftincrem.h +include/freetype2/freetype/ftlcdfil.h +include/freetype2/freetype/ftlist.h +include/freetype2/freetype/ftlzw.h +include/freetype2/freetype/ftmac.h +include/freetype2/freetype/ftmm.h +include/freetype2/freetype/ftmodapi.h +include/freetype2/freetype/ftmoderr.h +include/freetype2/freetype/ftotval.h +include/freetype2/freetype/ftoutln.h +include/freetype2/freetype/ftpfr.h +include/freetype2/freetype/ftrender.h +include/freetype2/freetype/ftsizes.h +include/freetype2/freetype/ftsnames.h +include/freetype2/freetype/ftstroke.h +include/freetype2/freetype/ftsynth.h +include/freetype2/freetype/ftsystem.h +include/freetype2/freetype/fttrigon.h +include/freetype2/freetype/fttypes.h +include/freetype2/freetype/ftwinfnt.h +include/freetype2/freetype/ftxf86.h +include/freetype2/freetype/t1tables.h +include/freetype2/freetype/ttnameid.h +include/freetype2/freetype/tttables.h +include/freetype2/freetype/tttags.h +include/freetype2/freetype/ttunpat.h +include/ft2build.h +lib/libfreetype.la +lib/libfreetype.6.3.16.dylib +lib/libfreetype.6.dylib +lib/libfreetype.dylib +lib/pkgconfig/freetype2.pc +share/aclocal/freetype2.m4 diff --git a/pkgtools/x11-links/files/xorg.kbproto b/pkgtools/x11-links/files/xorg.kbproto new file mode 100644 index 00000000000..0541b10df16 --- /dev/null +++ b/pkgtools/x11-links/files/xorg.kbproto @@ -0,0 +1,8 @@ +# $NetBSD: xorg.kbproto,v 1.1 2007/12/15 17:53:40 tron Exp $ +# +include/X11/extensions/XKB.h +include/X11/extensions/XKBgeom.h +include/X11/extensions/XKBproto.h +include/X11/extensions/XKBsrv.h +include/X11/extensions/XKBstr.h +lib/pkgconfig/kbproto.pc diff --git a/pkgtools/x11-links/files/xorg.libX11 b/pkgtools/x11-links/files/xorg.libX11 new file mode 100644 index 00000000000..145e46af992 --- /dev/null +++ b/pkgtools/x11-links/files/xorg.libX11 @@ -0,0 +1,25 @@ +# $NetBSD: xorg.libX11,v 1.1 2007/12/15 17:53:41 tron Exp $ +# +include/X11/ImUtil.h +include/X11/XKBlib.h +include/X11/Xcms.h +include/X11/Xlib.h +include/X11/XlibConf.h +include/X11/Xlibint.h +include/X11/Xlocale.h +include/X11/Xregion.h +include/X11/Xresource.h +include/X11/Xutil.h +include/X11/cursorfont.h +lib/libX11.la +lib/libX11.6.1.dylib +lib/libX11.6.2.0.dylib +lib/libX11.6.2.dylib +lib/libX11.6.dylib +lib/libX11.a +lib/libX11.dylib +lib/libX11.so +lib/libX11.so.6 +lib/libX11.so.6.1 +lib/libX11.so.6.2 +lib/pkgconfig/x11.pc diff --git a/pkgtools/x11-links/files/xorg.libXau b/pkgtools/x11-links/files/xorg.libXau new file mode 100644 index 00000000000..e10b0b03523 --- /dev/null +++ b/pkgtools/x11-links/files/xorg.libXau @@ -0,0 +1,12 @@ +# $NetBSD: xorg.libXau,v 1.1 2007/12/15 17:53:41 tron Exp $ +# +include/X11/Xauth.h +lib/libXau.6.0.0.dylib +lib/libXau.6.dylib +lib/libXau.a +lib/libXau.dylib +lib/libXau.la +lib/libXau.so +lib/libXau.so.6 +lib/libXau.so.6.0 +lib/pkgconfig/xau.pc diff --git a/pkgtools/x11-links/files/xorg.libXdmcp b/pkgtools/x11-links/files/xorg.libXdmcp new file mode 100644 index 00000000000..8e3e720fd39 --- /dev/null +++ b/pkgtools/x11-links/files/xorg.libXdmcp @@ -0,0 +1,12 @@ +# $NetBSD: xorg.libXdmcp,v 1.1 2007/12/15 17:53:41 tron Exp $ +# +include/X11/Xdmcp.h +lib/libXdmcp.a +lib/libXdmcp.6.0.0.dylib +lib/libXdmcp.6.0.0.dylib +lib/libXdmcp.6.dylib +lib/libXdmcp.dylib +lib/libXdmcp.la +lib/libXdmcp.so +lib/libXdmcp.so.6 +lib/pkgconfig/xdmcp.pc diff --git a/pkgtools/x11-links/files/xorg.renderproto b/pkgtools/x11-links/files/xorg.renderproto new file mode 100644 index 00000000000..2908bb67714 --- /dev/null +++ b/pkgtools/x11-links/files/xorg.renderproto @@ -0,0 +1,5 @@ +# $NetBSD: xorg.renderproto,v 1.1 2007/12/15 17:53:41 tron Exp $ +# +include/X11/extensions/render.h +include/X11/extensions/renderproto.h +lib/pkgconfig/renderproto.pc diff --git a/pkgtools/x11-links/files/xorg.xproto b/pkgtools/x11-links/files/xorg.xproto new file mode 100644 index 00000000000..456de1fca14 --- /dev/null +++ b/pkgtools/x11-links/files/xorg.xproto @@ -0,0 +1,28 @@ +# $NetBSD: xorg.xproto,v 1.1 2007/12/15 17:53:41 tron Exp $ +include/X11/DECkeysym.h +include/X11/HPkeysym.h +include/X11/Sunkeysym.h +include/X11/X.h +include/X11/XF86keysym.h +include/X11/XWDFile.h +include/X11/Xalloca.h +include/X11/Xarch.h +include/X11/Xatom.h +include/X11/Xdefs.h +include/X11/Xfuncproto.h +include/X11/Xfuncs.h +include/X11/Xmd.h +include/X11/Xos.h +include/X11/Xos_r.h +include/X11/Xosdefs.h +include/X11/Xpoll.h +include/X11/Xproto.h +include/X11/Xprotostr.h +include/X11/Xthreads.h +include/X11/Xw32defs.h +include/X11/Xwindows.h +include/X11/Xwinsock.h +include/X11/ap_keysym.h +include/X11/keysym.h +include/X11/keysymdef.h +lib/pkgconfig/xproto.pc diff --git a/pkgtools/x11-links/xorg.mk b/pkgtools/x11-links/xorg.mk index 95bb2781e3b..9286e8fe7fd 100644 --- a/pkgtools/x11-links/xorg.mk +++ b/pkgtools/x11-links/xorg.mk @@ -1,4 +1,4 @@ -# $NetBSD: xorg.mk,v 1.5 2007/02/10 15:45:21 tonio Exp $ +# $NetBSD: xorg.mk,v 1.6 2007/12/15 17:53:40 tron Exp $ # # This is for X.org, but use "xfree" files also. @@ -11,20 +11,21 @@ FILES_LIST= ${FILESDIR}/xorg .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" -.include "../../x11/libXft/buildlink3.mk" -.include "../../x11/libXpm/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" .include "../../x11/compositeproto/buildlink3.mk" .include "../../x11/fixesproto/buildlink3.mk" -.include "../../x11/xextproto/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" .include "../../x11/libXcomposite/buildlink3.mk" .include "../../x11/libXcursor/buildlink3.mk" .include "../../x11/libXfixes/buildlink3.mk" +.include "../../x11/libXft/buildlink3.mk" +.include "../../x11/libXpm/buildlink3.mk" .include "../../x11/libXrandr/buildlink3.mk" .include "../../x11/libXrender/buildlink3.mk" +.include "../../x11/libX11/buildlink3.mk" .include "../../x11/renderproto/buildlink3.mk" .include "../../x11/randrproto/buildlink3.mk" +.include "../../x11/xextproto/buildlink3.mk" +.include "../../x11/xproto/buildlink3.mk" # XXX what is ${X11_MODULES} ? |