pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/pkgtools/x11-links Update "x11-links" package to versi...
details: https://anonhg.NetBSD.org/pkgsrc/rev/dcb865c2304d
branches: trunk
changeset: 536487:dcb865c2304d
user: tron <tron%pkgsrc.org@localhost>
date: Sat Dec 15 17:53:39 2007 +0000
description:
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:
pkgtools/x11-links/Makefile | 13 ++++++-
pkgtools/x11-links/buildlink3.mk | 4 +-
pkgtools/x11-links/files/xorg | 56 +-----------------------------
pkgtools/x11-links/files/xorg.expat | 8 ++++
pkgtools/x11-links/files/xorg.fontconfig | 11 ++++++
pkgtools/x11-links/files/xorg.freetype2 | 54 +++++++++++++++++++++++++++++
pkgtools/x11-links/files/xorg.kbproto | 8 ++++
pkgtools/x11-links/files/xorg.libX11 | 25 +++++++++++++
pkgtools/x11-links/files/xorg.libXau | 12 ++++++
pkgtools/x11-links/files/xorg.libXdmcp | 12 ++++++
pkgtools/x11-links/files/xorg.renderproto | 5 ++
pkgtools/x11-links/files/xorg.xproto | 28 +++++++++++++++
pkgtools/x11-links/xorg.mk | 11 +++--
13 files changed, 185 insertions(+), 62 deletions(-)
diffs (truncated from 430 to 300 lines):
diff -r c601b0474463 -r dcb865c2304d pkgtools/x11-links/Makefile
--- a/pkgtools/x11-links/Makefile Sat Dec 15 16:42:51 2007 +0000
+++ b/pkgtools/x11-links/Makefile Sat Dec 15 17:53:39 2007 +0000
@@ -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 @@
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 @@
${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 -r c601b0474463 -r dcb865c2304d pkgtools/x11-links/buildlink3.mk
--- a/pkgtools/x11-links/buildlink3.mk Sat Dec 15 16:42:51 2007 +0000
+++ b/pkgtools/x11-links/buildlink3.mk Sat Dec 15 17:53:39 2007 +0000
@@ -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_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 -r c601b0474463 -r dcb865c2304d pkgtools/x11-links/files/xorg
--- a/pkgtools/x11-links/files/xorg Sat Dec 15 16:42:51 2007 +0000
+++ b/pkgtools/x11-links/files/xorg Sat Dec 15 17:53:39 2007 +0000
@@ -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/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/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/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/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/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/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.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.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.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/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 -r c601b0474463 -r dcb865c2304d pkgtools/x11-links/files/xorg.expat
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/pkgtools/x11-links/files/xorg.expat Sat Dec 15 17:53:39 2007 +0000
@@ -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 -r c601b0474463 -r dcb865c2304d pkgtools/x11-links/files/xorg.fontconfig
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/pkgtools/x11-links/files/xorg.fontconfig Sat Dec 15 17:53:39 2007 +0000
@@ -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 -r c601b0474463 -r dcb865c2304d pkgtools/x11-links/files/xorg.freetype2
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/pkgtools/x11-links/files/xorg.freetype2 Sat Dec 15 17:53:39 2007 +0000
@@ -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 -r c601b0474463 -r dcb865c2304d pkgtools/x11-links/files/xorg.kbproto
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/pkgtools/x11-links/files/xorg.kbproto Sat Dec 15 17:53:39 2007 +0000
@@ -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 -r c601b0474463 -r dcb865c2304d pkgtools/x11-links/files/xorg.libX11
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/pkgtools/x11-links/files/xorg.libX11 Sat Dec 15 17:53:39 2007 +0000
@@ -0,0 +1,25 @@
+# $NetBSD: xorg.libX11,v 1.1 2007/12/15 17:53:41 tron Exp $
+#
+include/X11/ImUtil.h
Home |
Main Index |
Thread Index |
Old Index