pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Update pkgtools/x11-links to 0.13. This package now u...
details: https://anonhg.NetBSD.org/pkgsrc/rev/19975b358dcc
branches: trunk
changeset: 460630:19975b358dcc
user: jlam <jlam%pkgsrc.org@localhost>
date: Tue Sep 02 07:14:39 2003 +0000
description:
Update pkgtools/x11-links to 0.13. This package now uses buildlink3
to build. I'm bumping the version number just in case the installed
package is different from version 0.12 (I can't test on different
systems).
diffstat:
doc/CHANGES | 3 +-
pkgtools/x11-links/DESCR | 13 +-
pkgtools/x11-links/Makefile | 87 +-
pkgtools/x11-links/files/openwin | 1001 +++++++++++++++++++++++++++++
pkgtools/x11-links/files/xfree | 599 +++++++++++++++++
pkgtools/x11-links/files/xfree.MesaLib | 19 +
pkgtools/x11-links/files/xfree.Xrender | 9 +
pkgtools/x11-links/files/xfree.freetype2 | 59 +
pkgtools/x11-links/files/xfree.xpm | 7 +
pkgtools/x11-links/files/xsgi | 646 +++++++++++++++++++
pkgtools/x11-links/openwin.buildlink2.mk | 1013 ------------------------------
pkgtools/x11-links/openwin.mk | 3 +
pkgtools/x11-links/xfree.buildlink2.mk | 615 ------------------
pkgtools/x11-links/xfree.mk | 20 +
pkgtools/x11-links/xsgi.buildlink2.mk | 662 -------------------
pkgtools/x11-links/xsgi.mk | 3 +
16 files changed, 2437 insertions(+), 2322 deletions(-)
diffs (truncated from 4856 to 300 lines):
diff -r 477e1702f10c -r 19975b358dcc doc/CHANGES
--- a/doc/CHANGES Tue Sep 02 07:12:16 2003 +0000
+++ b/doc/CHANGES Tue Sep 02 07:14:39 2003 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.3196 2003/09/02 06:16:33 taca Exp $
+$NetBSD: CHANGES,v 1.3197 2003/09/02 07:14:40 jlam Exp $
Changes to the packages collection and infrastructure in 2003:
@@ -3459,3 +3459,4 @@
Updated nethack-x11 to 3.4.2 [pooka 2003-09-02]
Updated nethack-qt to 3.4.2 [pooka 2003-09-02]
Updated ruby-rd-mode to 0.6.13 [taca 2003-09-02]
+ Updated x11-links to 0.13 [jlam 2003-09-02]
diff -r 477e1702f10c -r 19975b358dcc pkgtools/x11-links/DESCR
--- a/pkgtools/x11-links/DESCR Tue Sep 02 07:12:16 2003 +0000
+++ b/pkgtools/x11-links/DESCR Tue Sep 02 07:14:39 2003 +0000
@@ -1,9 +1,12 @@
x11-links creates a shadow directory of symbolic links for X11 headers and
-libraries to ${X11BASE} under ${LOCALBASE}/share/x11-links. It is intended
-for use by buildlink code to cleanly separate out the true X11 code files
-from any installed X11 package code files. The X11 hierarchies supported
-are:
+libraries to ${X11BASE} under ${PREFIX}/share/x11-links.
+
+It is intended for use by buildlink code to cleanly separate out the true
+X11 code files from any installed X11 package code files. The X11
+hierarchies supported are:
+
XFree86-3.3.x
XFree86-4.0.x
XFree86-4.1.x
- XFree86-4.2.0
+ XFree86-4.2.x
+ XFree86-4.3.0
diff -r 477e1702f10c -r 19975b358dcc pkgtools/x11-links/Makefile
--- a/pkgtools/x11-links/Makefile Tue Sep 02 07:12:16 2003 +0000
+++ b/pkgtools/x11-links/Makefile Tue Sep 02 07:14:39 2003 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.35 2003/08/26 01:43:48 jschauma Exp $
+# $NetBSD: Makefile,v 1.36 2003/09/02 07:14:39 jlam Exp $
#
# NOTE: If you update this package, then you'll likely need to also update
-# the x11-links dependency in mk/buildlink2/bsd.buildlink2.mk to the
-# correct version, usually the most recent.
+# the x11-links dependency in mk/buildlink[23]/bsd.buildlink[23].mk
+# to the correct version, usually the most recent.
-DISTNAME= x11-links-0.12
+DISTNAME= x11-links-0.13
WRKSRC= ${WRKDIR}
CATEGORIES= pkgtools x11
MASTER_SITES= # empty
@@ -12,37 +12,72 @@
MAINTAINER= jlam%NetBSD.org@localhost
HOMEPAGE= ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/Packages.txt
-COMMENT= Shadow tree of links to X11R6 headers and libraries
+COMMENT= Shadow tree of links to ${X11BASE} headers and libraries
+
+PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_BUILDLINK2= # defined
-EXTRACT_ONLY= # empty
-NO_CHECKSUM= # defined
-NO_BUILD= # defined
-NO_MTREE= # defined
-USE_X11= # defined
-
-USE_X11_LINKS= NO
-_REQUIRE_BUILTIN_FREETYPE2= YES
-_REQUIRE_BUILTIN_XPM= YES
-_REQUIRE_BUILTIN_XRENDER= YES
+USE_BUILDLINK3= yes
+EXTRACT_ONLY= yes
+NO_CHECKSUM= yes
+NO_MTREE= yes
+USE_X11= yes
+USE_X11_LINKS= no
PLIST_SRC= ${WRKDIR}/.PLIST_SRC
-BUILDLINK_X11_SUBDIR= share/x11-links
+PLIST_SRC.dirs= ${PLIST_SRC}.dirs
+PLIST_SRC.files= ${PLIST_SRC}.files
.include "../../mk/bsd.prefs.mk"
.if !exists(${X11BASE}/include/X11/X.h)
-PKG_FAIL_REASON= "${PKGNAME} requires X headers to be installed"
+PKG_FAIL_REASON= "${PKGNAME} requires X headers to be installed"
+.endif
+
+.if ${OPSYS} == "IRIX"
+. include "xsgi.mk"
+.elif !empty(X11BASE:M*openwin)
+. include "openwin.mk"
+.else
+. include "xfree.mk"
.endif
+X11_LINKS_SUBDIR= share/x11-links
+X11_LINKS_BUILD_DIR= ${WRKSRC}/${X11_LINKS_SUBDIR}
+X11_LINKS_DIR= ${PREFIX}/${X11_LINKS_SUBDIR}
+
+FILES_LIST_CMD= ${CAT} ${FILES_LIST} | ${GREP} -v "^\#"
+
+do-build:
+ ${MKDIR} ${X11_LINKS_BUILD_DIR}
+ ${RM} -f ${PLIST_SRC.dirs}
+ ${FILES_LIST_CMD} | ${SED} -e "s,/[^/]*$$,," | ${SORT} -u | \
+ while read dir; do \
+ if [ -d ${X11BASE}/$$dir ]; then \
+ ${MKDIR} ${X11_LINKS_BUILD_DIR}/$$dir; \
+ ${ECHO} "@dirrm ${X11_LINKS_SUBDIR}/$$dir" \
+ >> ${PLIST_SRC.dirs}; \
+ fi; \
+ done
+ ${RM} -f ${PLIST_SRC.files}
+ ${FILES_LIST_CMD} | ${SORT} -u | \
+ while read file; do \
+ if [ -e ${X11BASE}/$$file ]; then \
+ ${LN} -fs ${X11BASE}/$$file \
+ ${X11_LINKS_BUILD_DIR}/$$file; \
+ ${ECHO} "${X11_LINKS_SUBDIR}/$$file" \
+ >> ${PLIST_SRC.files}; \
+ fi; \
+ done
+
+post-build:
+ ( ${CAT} ${PKGDIR}/PLIST; \
+ ${SORT} -u ${PLIST_SRC.files}; \
+ ${SORT} -ur ${PLIST_SRC.dirs}; \
+ ${ECHO} "@dirrm ${X11_LINKS_SUBDIR}"; \
+ ) > ${PLIST_SRC}
+
do-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/${BUILDLINK_X11_SUBDIR}
- cd ${BUILDLINK_DIR} && { ${ECHO} include ; ${ECHO} lib${ABI} ; } | \
- ${PAX} -rw ${PREFIX}/${BUILDLINK_X11_SUBDIR}
- ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/${BUILDLINK_X11_SUBDIR}
- ${CAT} ${PKGDIR}/PLIST > ${PLIST_SRC}
- cd ${PREFIX}; ${FIND} ${BUILDLINK_X11_SUBDIR} \! -type d -print \
- | ${SED} "s|^\./||g" | ${SORT} -u >> ${PLIST_SRC}
- ${ECHO} "@unexec ${RM} -rf %D/${BUILDLINK_X11_SUBDIR}" >> ${PLIST_SRC}
+ ${INSTALL_DATA_DIR} ${X11_LINKS_DIR:H}
+ cd ${WRKSRC}; ${CP} -R ${X11_LINKS_BUILD_DIR} ${X11_LINKS_DIR}
.include "../../mk/bsd.pkg.mk"
diff -r 477e1702f10c -r 19975b358dcc pkgtools/x11-links/files/openwin
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/pkgtools/x11-links/files/openwin Tue Sep 02 07:14:39 2003 +0000
@@ -0,0 +1,1001 @@
+# $NetBSD: openwin,v 1.1 2003/09/02 07:14:46 jlam Exp $
+#
+# Filelist for Solaris based on files existing in Solaris 9.
+#
+include/X11/bitmaps/1x1
+include/X11/bitmaps/2x2
+include/X11/bitmaps/Dashes
+include/X11/bitmaps/Down
+include/X11/bitmaps/Excl
+include/X11/bitmaps/FlipHoriz
+include/X11/bitmaps/FlipVert
+include/X11/bitmaps/Fold
+include/X11/bitmaps/Left
+include/X11/bitmaps/Right
+include/X11/bitmaps/RotateLeft
+include/X11/bitmaps/RotateRight
+include/X11/bitmaps/Stipple
+include/X11/bitmaps/Term
+include/X11/bitmaps/Up
+include/X11/bitmaps/black
+include/X11/bitmaps/black6
+include/X11/bitmaps/box6
+include/X11/bitmaps/boxes
+include/X11/bitmaps/calculator
+include/X11/bitmaps/cntr_ptr
+include/X11/bitmaps/cntr_ptrmsk
+include/X11/bitmaps/cross_weave
+include/X11/bitmaps/dimple1
+include/X11/bitmaps/dimple3
+include/X11/bitmaps/dot
+include/X11/bitmaps/dropbar7
+include/X11/bitmaps/dropbar8
+include/X11/bitmaps/flagup
+include/X11/bitmaps/escherknot
+include/X11/bitmaps/flagdown
+include/X11/bitmaps/flipped_gray
+include/X11/bitmaps/gray
+include/X11/bitmaps/gray1
+include/X11/bitmaps/gray3
+include/X11/bitmaps/hlines2
+include/X11/bitmaps/hlines3
+include/X11/bitmaps/icon
+include/X11/bitmaps/keyboard16
+include/X11/bitmaps/left_ptr
+include/X11/bitmaps/left_ptrmsk
+include/X11/bitmaps/letters
+include/X11/bitmaps/light_gray
+include/X11/bitmaps/mailempty
+include/X11/bitmaps/mailemptymsk
+include/X11/bitmaps/mailfull
+include/X11/bitmaps/mailfullmsk
+include/X11/bitmaps/mensetmanus
+include/X11/bitmaps/menu10
+include/X11/bitmaps/menu12
+include/X11/bitmaps/menu16
+include/X11/bitmaps/menu8
+include/X11/bitmaps/noletters
+include/X11/bitmaps/opendot
+include/X11/bitmaps/opendotMask
+include/X11/bitmaps/plaid
+include/X11/bitmaps/scales
+include/X11/bitmaps/right_ptr
+include/X11/bitmaps/right_ptrmsk
+include/X11/bitmaps/root_weave
+include/X11/bitmaps/sipb
+include/X11/bitmaps/star
+include/X11/bitmaps/starMask
+include/X11/bitmaps/stipple
+include/X11/bitmaps/target
+include/X11/bitmaps/terminal
+include/X11/bitmaps/tie_fighter
+include/X11/bitmaps/vlines2
+include/X11/bitmaps/vlines3
+include/X11/bitmaps/weird_size
+include/X11/bitmaps/wide_weave
+include/X11/bitmaps/wierd_size
+include/X11/bitmaps/wingdogs
+include/X11/bitmaps/woman
+include/X11/bitmaps/xfd_icon
+include/X11/bitmaps/xlogo11
+include/X11/bitmaps/xlogo16
+include/X11/bitmaps/xlogo32
+include/X11/bitmaps/xlogo64
+include/X11/bitmaps/txtdup
+include/X11/bitmaps/txtdupmask
+include/X11/bitmaps/txtdupmore
+include/X11/bitmaps/txtdupok
+include/X11/bitmaps/txtdupokmask
+include/X11/bitmaps/txtdupokmore
+include/X11/bitmaps/txtmv
+include/X11/bitmaps/txtmvmask
+include/X11/bitmaps/txtmvmore
+include/X11/bitmaps/txtmvok
+include/X11/bitmaps/txtmvokmask
+include/X11/bitmaps/txtmvokmore
+include/X11/DPS/ColorSB.h
+include/X11/DPS/ColorSBP.h
+include/X11/DPS/DPSScrollW.h
+include/X11/DPS/DPSScrollWP.h
+include/X11/DPS/FontCreatP.h
+include/X11/DPS/FontCreato.h
+include/X11/DPS/FontSB.h
+include/X11/DPS/FontSBP.h
+include/X11/DPS/FontSamplP.h
+include/X11/DPS/FontSample.h
+include/X11/DPS/PSres.h
+include/X11/DPS/XDPS.h
+include/X11/DPS/XDPSlib.h
+include/X11/DPS/XDPSproto.h
+include/X11/DPS/dpsXclient.h
+include/X11/DPS/dpsXcommon.h
+include/X11/DPS/dpsXpreview.h
+include/X11/DPS/dpsXshare.h
+include/X11/DPS/dpsXuserpath.h
+include/X11/DPS/dpsclient.h
+include/X11/DPS/dpsconfig.h
+include/X11/DPS/dpsexcept.h
+include/X11/DPS/psops.h
+include/X11/DPS/dpsfriends.h
+include/X11/DPS/dpsops.h
+include/X11/ICE/ICE.h
+include/X11/ICE/ICEconn.h
+include/X11/ICE/ICElib.h
+include/X11/ICE/ICEmsg.h
+include/X11/ICE/ICEproto.h
+include/X11/ICE/ICEutil.h
+include/X11/SM/SM.h
+include/X11/SM/SMlib.h
+include/X11/SM/SMproto.h
+include/X11/Xaw/AllWidgets.h
+include/X11/Xaw/AsciiSink.h
+include/X11/Xaw/AsciiSinkP.h
+include/X11/Xaw/AsciiSrc.h
+include/X11/Xaw/AsciiSrcP.h
+include/X11/Xaw/AsciiText.h
+include/X11/Xaw/AsciiTextP.h
+include/X11/Xaw/Box.h
+include/X11/Xaw/BoxP.h
+include/X11/Xaw/Cardinals.h
+include/X11/Xaw/Clock.h
+include/X11/Xaw/ClockP.h
+include/X11/Xaw/Command.h
+include/X11/Xaw/CommandP.h
+include/X11/Xaw/Dialog.h
+include/X11/Xaw/DialogP.h
+include/X11/Xaw/Form.h
+include/X11/Xaw/FormP.h
+include/X11/Xaw/Grip.h
Home |
Main Index |
Thread Index |
Old Index