Sun Oct 5 21:37:39 2008 UTC ()
Bump x11-links to 0.39 and force dependency after cube-native-xorg merge.


(cube)
diff -r1.94 -r1.95 pkgsrc/pkgtools/x11-links/Makefile
diff -r1.15 -r1.16 pkgsrc/pkgtools/x11-links/buildlink3.mk
cvs diff -r1.94 -r1.95 pkgsrc/pkgtools/x11-links/Makefile (switch to unified diff)

--- pkgsrc/pkgtools/x11-links/Makefile 2008/09/16 12:38:38 1.94
+++ pkgsrc/pkgtools/x11-links/Makefile 2008/10/05 21:37:39 1.95
@@ -1,99 +1,99 @@ @@ -1,99 +1,99 @@
1# $NetBSD: Makefile,v 1.94 2008/09/16 12:38:38 tron Exp $ 1# $NetBSD: Makefile,v 1.95 2008/10/05 21:37:39 cube Exp $
2# 2#
3# NOTE: If you update this package, then you'll likely need to also update 3# NOTE: If you update this package, then you'll likely need to also update
4# the x11-links dependency in buildlink3.mk to the correct version, 4# the x11-links dependency in buildlink3.mk to the correct version,
5# usually the most recent. 5# usually the most recent.
6 6
7DISTNAME= x11-links-0.38 7DISTNAME= x11-links-0.39
8CATEGORIES= pkgtools x11 8CATEGORIES= pkgtools x11
9MASTER_SITES= # empty 9MASTER_SITES= # empty
10DISTFILES= # empty 10DISTFILES= # empty
11 11
12MAINTAINER= jlam@pkgsrc.org 12MAINTAINER= jlam@pkgsrc.org
13HOMEPAGE= ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/doc/pkgsrc.html 13HOMEPAGE= ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/doc/pkgsrc.html
14COMMENT= Shadow tree of links to native X11 headers and libraries 14COMMENT= Shadow tree of links to native X11 headers and libraries
15#LICENSE= original-bsd 15#LICENSE= original-bsd
16 16
17PKG_DESTDIR_SUPPORT= user-destdir 17PKG_DESTDIR_SUPPORT= user-destdir
18PKG_INSTALLATION_TYPES= overwrite pkgviews 18PKG_INSTALLATION_TYPES= overwrite pkgviews
19 19
20WRKSRC= ${WRKDIR} 20WRKSRC= ${WRKDIR}
21USE_LANGUAGES= # empty 21USE_LANGUAGES= # empty
22USE_TOOLS+= pax 22USE_TOOLS+= pax
23EXTRACT_ONLY= # empty 23EXTRACT_ONLY= # empty
24NO_CHECKSUM= yes 24NO_CHECKSUM= yes
25NO_MTREE= yes 25NO_MTREE= yes
26 26
27PLIST_SRC.dirs= ${WRKDIR}/.PLIST_SRC.dirs 27PLIST_SRC.dirs= ${WRKDIR}/.PLIST_SRC.dirs
28PLIST_SRC.files= ${WRKDIR}/.PLIST_SRC.files 28PLIST_SRC.files= ${WRKDIR}/.PLIST_SRC.files
29PLIST_SRC= ${.CURDIR}/PLIST ${PLIST_SRC.files} ${PLIST_SRC.dirs} 29PLIST_SRC= ${.CURDIR}/PLIST ${PLIST_SRC.files} ${PLIST_SRC.dirs}
30 30
31.include "../../mk/bsd.prefs.mk" 31.include "../../mk/bsd.prefs.mk"
32 32
33.if !exists(${X11BASE}/include/X11/X.h) 33.if !exists(${X11BASE}/include/X11/X.h)
34PKG_FAIL_REASON+= "${PKGNAME} requires X headers to be installed" 34PKG_FAIL_REASON+= "${PKGNAME} requires X headers to be installed"
35.endif 35.endif
36 36
37.if ${OPSYS} == "IRIX" 37.if ${OPSYS} == "IRIX"
38. include "xsgi.mk" 38. include "xsgi.mk"
39.elif ${OPSYS} == "OSF1" 39.elif ${OPSYS} == "OSF1"
40. include "xdec.mk" 40. include "xdec.mk"
41.elif !empty(X11BASE:M*openwin) 41.elif !empty(X11BASE:M*openwin)
42. include "openwin.mk" 42. include "openwin.mk"
43.elif exists(${X11BASE}/lib/X11/config/xorgversion.def) 43.elif exists(${X11BASE}/lib/X11/config/xorgversion.def)
44. include "xorg.mk" 44. include "xorg.mk"
45.else 45.else
46. include "xfree.mk" 46. include "xfree.mk"
47.endif 47.endif
48 48
49X11_LINKS_SUBDIR= share/x11-links 49X11_LINKS_SUBDIR= share/x11-links
50X11_LINKS_BUILD_DIR= ${WRKSRC}/${X11_LINKS_SUBDIR} 50X11_LINKS_BUILD_DIR= ${WRKSRC}/${X11_LINKS_SUBDIR}
51X11_LINKS_DIR= ${PREFIX}/${X11_LINKS_SUBDIR} 51X11_LINKS_DIR= ${PREFIX}/${X11_LINKS_SUBDIR}
52 52
53FILES_LIST_CMD= ${SED} -e "s/@ABI@/${ABI}/" ${FILES_LIST} | ${GREP} -v "^\#" 53FILES_LIST_CMD= ${SED} -e "s/@ABI@/${ABI}/" ${FILES_LIST} | ${GREP} -v "^\#"
54 54
55CREATE_X11LINK?= ${LN} -fs $$src $$dest 55CREATE_X11LINK?= ${LN} -fs $$src $$dest
56 56
57.include "../../mk/x11.buildlink3.mk" 57.include "../../mk/x11.buildlink3.mk"
58 58
59do-build: 59do-build:
60 ${MKDIR} ${X11_LINKS_BUILD_DIR} 60 ${MKDIR} ${X11_LINKS_BUILD_DIR}
61 ${CHMOD} ${PKGDIRMODE} ${X11_LINKS_BUILD_DIR} 61 ${CHMOD} ${PKGDIRMODE} ${X11_LINKS_BUILD_DIR}
62 ${FILES_LIST_CMD} | ${SED} -e "s,/[^/]*$$,," | ${SORT} -u | \ 62 ${FILES_LIST_CMD} | ${SED} -e "s,/[^/]*$$,," | ${SORT} -u | \
63 while read dir; do \ 63 while read dir; do \
64 if [ -d ${X11BASE}/$$dir ]; then \ 64 if [ -d ${X11BASE}/$$dir ]; then \
65 ${MKDIR} ${X11_LINKS_BUILD_DIR}/$$dir; \ 65 ${MKDIR} ${X11_LINKS_BUILD_DIR}/$$dir; \
66 ${CHMOD} ${PKGDIRMODE} ${X11_LINKS_BUILD_DIR}/$$dir; \ 66 ${CHMOD} ${PKGDIRMODE} ${X11_LINKS_BUILD_DIR}/$$dir; \
67 elif [ -d /usr/$$dir ]; then \ 67 elif [ -d /usr/$$dir ]; then \
68 ${MKDIR} ${X11_LINKS_BUILD_DIR}/$$dir; \ 68 ${MKDIR} ${X11_LINKS_BUILD_DIR}/$$dir; \
69 ${CHMOD} ${PKGDIRMODE} ${X11_LINKS_BUILD_DIR}/$$dir; \ 69 ${CHMOD} ${PKGDIRMODE} ${X11_LINKS_BUILD_DIR}/$$dir; \
70 fi; \ 70 fi; \
71 done 71 done
72 ${RM} -f ${PLIST_SRC.files} 72 ${RM} -f ${PLIST_SRC.files}
73 ${FILES_LIST_CMD} | ${SORT} -u | \ 73 ${FILES_LIST_CMD} | ${SORT} -u | \
74 while read file; do \ 74 while read file; do \
75 if ${TEST} -r ${X11BASE}/$$file; then \ 75 if ${TEST} -r ${X11BASE}/$$file; then \
76 src="${X11BASE}/$$file"; \ 76 src="${X11BASE}/$$file"; \
77 dest="${X11_LINKS_BUILD_DIR}/$$file"; \ 77 dest="${X11_LINKS_BUILD_DIR}/$$file"; \
78 ${CREATE_X11LINK}; \ 78 ${CREATE_X11LINK}; \
79 ${ECHO} "${X11_LINKS_SUBDIR}/$$file" \ 79 ${ECHO} "${X11_LINKS_SUBDIR}/$$file" \
80 >> ${PLIST_SRC.files}; \ 80 >> ${PLIST_SRC.files}; \
81 elif ${TEST} -r /usr/$$file; then \ 81 elif ${TEST} -r /usr/$$file; then \
82 src="/usr/$$file"; \ 82 src="/usr/$$file"; \
83 dest="${X11_LINKS_BUILD_DIR}/$$file"; \ 83 dest="${X11_LINKS_BUILD_DIR}/$$file"; \
84 ${CREATE_X11LINK}; \ 84 ${CREATE_X11LINK}; \
85 ${ECHO} "${X11_LINKS_SUBDIR}/$$file" \ 85 ${ECHO} "${X11_LINKS_SUBDIR}/$$file" \
86 >> ${PLIST_SRC.files}; \ 86 >> ${PLIST_SRC.files}; \
87 fi; \ 87 fi; \
88 done 88 done
89 ${RM} -f ${PLIST_SRC.dirs} 89 ${RM} -f ${PLIST_SRC.dirs}
90 { cd ${WRKSRC}; ${FIND} ${X11_LINKS_SUBDIR} -type d -print | \ 90 { cd ${WRKSRC}; ${FIND} ${X11_LINKS_SUBDIR} -type d -print | \
91 ${SORT} -ur | ${SED} -e "s|^|@dirrm |"; \ 91 ${SORT} -ur | ${SED} -e "s|^|@dirrm |"; \
92 } > ${PLIST_SRC.dirs} 92 } > ${PLIST_SRC.dirs}
93 93
94do-install: 94do-install:
95 ${INSTALL_DATA_DIR} ${DESTDIR:Q}${X11_LINKS_DIR:Q} 95 ${INSTALL_DATA_DIR} ${DESTDIR:Q}${X11_LINKS_DIR:Q}
96 cd ${X11_LINKS_BUILD_DIR} && \ 96 cd ${X11_LINKS_BUILD_DIR} && \
97 pax -rw . ${DESTDIR:Q}${X11_LINKS_DIR:Q} 97 pax -rw . ${DESTDIR:Q}${X11_LINKS_DIR:Q}
98 98
99.include "../../mk/bsd.pkg.mk" 99.include "../../mk/bsd.pkg.mk"
cvs diff -r1.15 -r1.16 pkgsrc/pkgtools/x11-links/buildlink3.mk (switch to unified diff)

--- pkgsrc/pkgtools/x11-links/buildlink3.mk 2008/09/16 12:38:38 1.15
+++ pkgsrc/pkgtools/x11-links/buildlink3.mk 2008/10/05 21:37:39 1.16
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: buildlink3.mk,v 1.15 2008/09/16 12:38:38 tron Exp $ 1# $NetBSD: buildlink3.mk,v 1.16 2008/10/05 21:37:39 cube Exp $
2# 2#
3# Don't include this file manually! It will be included as necessary 3# Don't include this file manually! It will be included as necessary
4# by bsd.buildlink3.mk. 4# by bsd.buildlink3.mk.
5 5
6BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ 6BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
7X11_LINKS_BUILDLINK3_MK:= ${X11_LINKS_BUILDLINK3_MK}+ 7X11_LINKS_BUILDLINK3_MK:= ${X11_LINKS_BUILDLINK3_MK}+
8 8
9.if !empty(BUILDLINK_DEPTH:M+) 9.if !empty(BUILDLINK_DEPTH:M+)
10BUILDLINK_DEPENDS+= x11-links 10BUILDLINK_DEPENDS+= x11-links
11.endif 11.endif
12 12
13# x11-links must come first so that packages listed later can overwrite 13# x11-links must come first so that packages listed later can overwrite
14# any symlinks created by buildlinking x11-links. 14# any symlinks created by buildlinking x11-links.
15# 15#
16BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nx11-links} 16BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nx11-links}
17BUILDLINK_PACKAGES:= x11-links ${BUILDLINK_PACKAGES} 17BUILDLINK_PACKAGES:= x11-links ${BUILDLINK_PACKAGES}
18BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}x11-links 18BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}x11-links
19 19
20.if !empty(X11_LINKS_BUILDLINK3_MK:M+) 20.if !empty(X11_LINKS_BUILDLINK3_MK:M+)
21BUILDLINK_API_DEPENDS.x11-links+= x11-links>=0.38 21BUILDLINK_API_DEPENDS.x11-links+= x11-links>=0.39
22BUILDLINK_PKGSRCDIR.x11-links?= ../../pkgtools/x11-links 22BUILDLINK_PKGSRCDIR.x11-links?= ../../pkgtools/x11-links
23BUILDLINK_DEPMETHOD.x11-links?= build 23BUILDLINK_DEPMETHOD.x11-links?= build
24 24
25# Force all of the headers and libraries to be symlinked into 25# Force all of the headers and libraries to be symlinked into
26# ${BUILDLINK_X11_DIR}, even in the "pkgviews" case. 26# ${BUILDLINK_X11_DIR}, even in the "pkgviews" case.
27# 27#
28BUILDLINK_CONTENTS_FILTER.x11-links= \ 28BUILDLINK_CONTENTS_FILTER.x11-links= \
29 ${EGREP} '(include.*/|\.h$$|\.pc$$|/lib[^/]*$$)' 29 ${EGREP} '(include.*/|\.h$$|\.pc$$|/lib[^/]*$$)'
30 30
31# Rename the symlinks so that they appear in ${BUILDLINK_X11_DIR}/include 31# Rename the symlinks so that they appear in ${BUILDLINK_X11_DIR}/include
32# and ${BUILDLINK_X11_DIR}/lib. 32# and ${BUILDLINK_X11_DIR}/lib.
33# 33#
34BUILDLINK_FNAME_TRANSFORM.x11-links+= -e "s|/share/x11-links/|/|" 34BUILDLINK_FNAME_TRANSFORM.x11-links+= -e "s|/share/x11-links/|/|"
35 35
36.endif # X11_LINKS_BUILDLINK3_MK 36.endif # X11_LINKS_BUILDLINK3_MK
37 37
38BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} 38BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}