Wed Feb 10 23:02:26 2010 UTC ()
0.46: Add two freetype2 header files.


(wiz)
diff -r1.107 -r1.108 pkgsrc/pkgtools/x11-links/Makefile
diff -r1.23 -r1.24 pkgsrc/pkgtools/x11-links/buildlink3.mk
diff -r1.3 -r1.4 pkgsrc/pkgtools/x11-links/files/xorg.freetype2
cvs diff -r1.107 -r1.108 pkgsrc/pkgtools/x11-links/Makefile (switch to unified diff)

--- pkgsrc/pkgtools/x11-links/Makefile 2009/12/30 17:10:32 1.107
+++ pkgsrc/pkgtools/x11-links/Makefile 2010/02/10 23:02:26 1.108
@@ -1,103 +1,103 @@ @@ -1,103 +1,103 @@
1# $NetBSD: Makefile,v 1.107 2009/12/30 17:10:32 tron Exp $ 1# $NetBSD: Makefile,v 1.108 2010/02/10 23:02:26 wiz 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.45.${OS_VERSION} 7DISTNAME= x11-links-0.46.${OS_VERSION}
8CATEGORIES= pkgtools x11 8CATEGORIES= pkgtools x11
9MASTER_SITES= # empty 9MASTER_SITES= # empty
10DISTFILES= # empty 10DISTFILES= # empty
11 11
12MAINTAINER= pkgsrc-users@NetBSD.org 12MAINTAINER= pkgsrc-users@NetBSD.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
15LICENSE= original-bsd 15LICENSE= 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
23 23
24PLIST_SRC.files= ${WRKDIR}/.PLIST_SRC.files 24PLIST_SRC.files= ${WRKDIR}/.PLIST_SRC.files
25PLIST_SRC= ${.CURDIR}/PLIST ${PLIST_SRC.files} 25PLIST_SRC= ${.CURDIR}/PLIST ${PLIST_SRC.files}
26 26
27OSVERSION_SPECIFIC= yes 27OSVERSION_SPECIFIC= yes
28 28
29.include "../../mk/bsd.prefs.mk" 29.include "../../mk/bsd.prefs.mk"
30 30
31.if ${X11_TYPE} == "modular" 31.if ${X11_TYPE} == "modular"
32PKG_FAIL_REASON+= "${PKGNAME} should only be used with X11_TYPE=native." 32PKG_FAIL_REASON+= "${PKGNAME} should only be used with X11_TYPE=native."
33.elif !exists(${X11BASE}/include/X11/X.h) 33.elif !exists(${X11BASE}/include/X11/X.h)
34PKG_FAIL_REASON+= "pkgsrc has been configured to use a system provided X11 installation" 34PKG_FAIL_REASON+= "pkgsrc has been configured to use a system provided X11 installation"
35PKG_FAIL_REASON+= "but one could not be found. Possible solutions:" 35PKG_FAIL_REASON+= "but one could not be found. Possible solutions:"
36PKG_FAIL_REASON+= "" 36PKG_FAIL_REASON+= ""
37PKG_FAIL_REASON+= " *) install X headers and libraries in X11BASE (currently ${X11BASE})" 37PKG_FAIL_REASON+= " *) install X headers and libraries in X11BASE (currently ${X11BASE})"
38PKG_FAIL_REASON+= " *) set X11_TYPE=modular in mk.conf to use X11 from pkgsrc" 38PKG_FAIL_REASON+= " *) set X11_TYPE=modular in mk.conf to use X11 from pkgsrc"
39PKG_FAIL_REASON+= "" 39PKG_FAIL_REASON+= ""
40PKG_FAIL_REASON+= "Please note that changing the value of X11_TYPE in existing" 40PKG_FAIL_REASON+= "Please note that changing the value of X11_TYPE in existing"
41PKG_FAIL_REASON+= "pkgsrc installations is not supported!" 41PKG_FAIL_REASON+= "pkgsrc installations is not supported!"
42.endif 42.endif
43 43
44.if ${OPSYS} == "IRIX" 44.if ${OPSYS} == "IRIX"
45. include "xsgi.mk" 45. include "xsgi.mk"
46.elif ${OPSYS} == "OSF1" 46.elif ${OPSYS} == "OSF1"
47. include "xdec.mk" 47. include "xdec.mk"
48.elif !empty(X11BASE:M*openwin) 48.elif !empty(X11BASE:M*openwin)
49. include "openwin.mk" 49. include "openwin.mk"
50.elif exists(${X11BASE}/lib/X11/config/xorgversion.def) || \ 50.elif exists(${X11BASE}/lib/X11/config/xorgversion.def) || \
51 exists(${X11BASE}/lib/pkgconfig/xorg-server.pc) 51 exists(${X11BASE}/lib/pkgconfig/xorg-server.pc)
52. include "xorg.mk" 52. include "xorg.mk"
53.else 53.else
54. include "xfree.mk" 54. include "xfree.mk"
55.endif 55.endif
56 56
57X11_LINKS_SUBDIR= share/x11-links 57X11_LINKS_SUBDIR= share/x11-links
58X11_LINKS_BUILD_DIR= ${WRKSRC}/${X11_LINKS_SUBDIR} 58X11_LINKS_BUILD_DIR= ${WRKSRC}/${X11_LINKS_SUBDIR}
59X11_LINKS_DIR= ${PREFIX}/${X11_LINKS_SUBDIR} 59X11_LINKS_DIR= ${PREFIX}/${X11_LINKS_SUBDIR}
60 60
61FILES_LIST_CMD= ${SED} -e "s/@ABI@/${ABI}/" ${FILES_LIST} | ${GREP} -v "^\#" 61FILES_LIST_CMD= ${SED} -e "s/@ABI@/${ABI}/" ${FILES_LIST} | ${GREP} -v "^\#"
62 62
63CREATE_X11LINK?= ${LN} -fs $$src $$dest 63CREATE_X11LINK?= ${LN} -fs $$src $$dest
64 64
65.include "../../mk/x11.buildlink3.mk" 65.include "../../mk/x11.buildlink3.mk"
66 66
67do-build: 67do-build:
68 ${MKDIR} ${X11_LINKS_BUILD_DIR} 68 ${MKDIR} ${X11_LINKS_BUILD_DIR}
69 ${CHMOD} ${PKGDIRMODE} ${X11_LINKS_BUILD_DIR} 69 ${CHMOD} ${PKGDIRMODE} ${X11_LINKS_BUILD_DIR}
70 ${FILES_LIST_CMD} | ${SED} -e "s,/[^/]*$$,," | ${SORT} -u | \ 70 ${FILES_LIST_CMD} | ${SED} -e "s,/[^/]*$$,," | ${SORT} -u | \
71 while read dir; do \ 71 while read dir; do \
72 if [ -d ${X11BASE}/$$dir ]; then \ 72 if [ -d ${X11BASE}/$$dir ]; then \
73 ${MKDIR} ${X11_LINKS_BUILD_DIR}/$$dir; \ 73 ${MKDIR} ${X11_LINKS_BUILD_DIR}/$$dir; \
74 ${CHMOD} ${PKGDIRMODE} ${X11_LINKS_BUILD_DIR}/$$dir; \ 74 ${CHMOD} ${PKGDIRMODE} ${X11_LINKS_BUILD_DIR}/$$dir; \
75 elif [ -d /usr/$$dir ]; then \ 75 elif [ -d /usr/$$dir ]; then \
76 ${MKDIR} ${X11_LINKS_BUILD_DIR}/$$dir; \ 76 ${MKDIR} ${X11_LINKS_BUILD_DIR}/$$dir; \
77 ${CHMOD} ${PKGDIRMODE} ${X11_LINKS_BUILD_DIR}/$$dir; \ 77 ${CHMOD} ${PKGDIRMODE} ${X11_LINKS_BUILD_DIR}/$$dir; \
78 fi; \ 78 fi; \
79 done 79 done
80 ${RM} -f ${PLIST_SRC.files} 80 ${RM} -f ${PLIST_SRC.files}
81 ${FILES_LIST_CMD} | ${SORT} -u | \ 81 ${FILES_LIST_CMD} | ${SORT} -u | \
82 while read file; do \ 82 while read file; do \
83 if ${TEST} -r ${X11BASE}/$$file; then \ 83 if ${TEST} -r ${X11BASE}/$$file; then \
84 src="${X11BASE}/$$file"; \ 84 src="${X11BASE}/$$file"; \
85 dest="${X11_LINKS_BUILD_DIR}/$$file"; \ 85 dest="${X11_LINKS_BUILD_DIR}/$$file"; \
86 ${CREATE_X11LINK}; \ 86 ${CREATE_X11LINK}; \
87 ${ECHO} "${X11_LINKS_SUBDIR}/$$file" \ 87 ${ECHO} "${X11_LINKS_SUBDIR}/$$file" \
88 >> ${PLIST_SRC.files}; \ 88 >> ${PLIST_SRC.files}; \
89 elif ${TEST} -r /usr/$$file; then \ 89 elif ${TEST} -r /usr/$$file; then \
90 src="/usr/$$file"; \ 90 src="/usr/$$file"; \
91 dest="${X11_LINKS_BUILD_DIR}/$$file"; \ 91 dest="${X11_LINKS_BUILD_DIR}/$$file"; \
92 ${CREATE_X11LINK}; \ 92 ${CREATE_X11LINK}; \
93 ${ECHO} "${X11_LINKS_SUBDIR}/$$file" \ 93 ${ECHO} "${X11_LINKS_SUBDIR}/$$file" \
94 >> ${PLIST_SRC.files}; \ 94 >> ${PLIST_SRC.files}; \
95 fi; \ 95 fi; \
96 done 96 done
97 97
98do-install: 98do-install:
99 ${INSTALL_DATA_DIR} ${DESTDIR:Q}${X11_LINKS_DIR:Q} 99 ${INSTALL_DATA_DIR} ${DESTDIR:Q}${X11_LINKS_DIR:Q}
100 cd ${X11_LINKS_BUILD_DIR} && \ 100 cd ${X11_LINKS_BUILD_DIR} && \
101 pax -rw . ${DESTDIR:Q}${X11_LINKS_DIR:Q} 101 pax -rw . ${DESTDIR:Q}${X11_LINKS_DIR:Q}
102 102
103.include "../../mk/bsd.pkg.mk" 103.include "../../mk/bsd.pkg.mk"
cvs diff -r1.23 -r1.24 pkgsrc/pkgtools/x11-links/buildlink3.mk (switch to unified diff)

--- pkgsrc/pkgtools/x11-links/buildlink3.mk 2009/12/30 17:10:32 1.23
+++ pkgsrc/pkgtools/x11-links/buildlink3.mk 2010/02/10 23:02:26 1.24
@@ -1,31 +1,31 @@ @@ -1,31 +1,31 @@
1# $NetBSD: buildlink3.mk,v 1.23 2009/12/30 17:10:32 tron Exp $ 1# $NetBSD: buildlink3.mk,v 1.24 2010/02/10 23:02:26 wiz 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
6# x11-links is sorted first in mk/buildlink3/bsd.buildlink3.mk, 6# x11-links is sorted first in mk/buildlink3/bsd.buildlink3.mk,
7# so that symlinks created from it can be overriden by other packages. 7# so that symlinks created from it can be overriden by other packages.
8# 8#
9 9
10BUILDLINK_TREE+= x11-links 10BUILDLINK_TREE+= x11-links
11 11
12.if !defined(X11_LINKS_BUILDLINK3_MK) 12.if !defined(X11_LINKS_BUILDLINK3_MK)
13X11_LINKS_BUILDLINK3_MK:= 13X11_LINKS_BUILDLINK3_MK:=
14 14
15BUILDLINK_API_DEPENDS.x11-links+= x11-links>=0.45.${OS_VERSION} 15BUILDLINK_API_DEPENDS.x11-links+= x11-links>=0.46.${OS_VERSION}
16BUILDLINK_PKGSRCDIR.x11-links?= ../../pkgtools/x11-links 16BUILDLINK_PKGSRCDIR.x11-links?= ../../pkgtools/x11-links
17BUILDLINK_DEPMETHOD.x11-links?= build 17BUILDLINK_DEPMETHOD.x11-links?= build
18 18
19# Force all of the headers and libraries to be symlinked into 19# Force all of the headers and libraries to be symlinked into
20# ${BUILDLINK_X11_DIR}, even in the "pkgviews" case. 20# ${BUILDLINK_X11_DIR}, even in the "pkgviews" case.
21# 21#
22BUILDLINK_CONTENTS_FILTER.x11-links= \ 22BUILDLINK_CONTENTS_FILTER.x11-links= \
23 ${EGREP} '(include.*/|\.h$$|\.pc$$|/lib[^/]*$$)' 23 ${EGREP} '(include.*/|\.h$$|\.pc$$|/lib[^/]*$$)'
24 24
25# Rename the symlinks so that they appear in ${BUILDLINK_X11_DIR}/include 25# Rename the symlinks so that they appear in ${BUILDLINK_X11_DIR}/include
26# and ${BUILDLINK_X11_DIR}/lib. 26# and ${BUILDLINK_X11_DIR}/lib.
27# 27#
28BUILDLINK_FNAME_TRANSFORM.x11-links+= -e "s|/share/x11-links/|/|" 28BUILDLINK_FNAME_TRANSFORM.x11-links+= -e "s|/share/x11-links/|/|"
29.endif # X11_LINKS_BUILDLINK3_MK 29.endif # X11_LINKS_BUILDLINK3_MK
30 30
31BUILDLINK_TREE+= -x11-links 31BUILDLINK_TREE+= -x11-links
cvs diff -r1.3 -r1.4 pkgsrc/pkgtools/x11-links/files/xorg.freetype2 (switch to unified diff)

--- pkgsrc/pkgtools/x11-links/files/xorg.freetype2 2009/12/30 17:10:32 1.3
+++ pkgsrc/pkgtools/x11-links/files/xorg.freetype2 2010/02/10 23:02:26 1.4
@@ -1,60 +1,62 @@ @@ -1,60 +1,62 @@
1# $NetBSD: xorg.freetype2,v 1.3 2009/12/30 17:10:32 tron Exp $ 1# $NetBSD: xorg.freetype2,v 1.4 2010/02/10 23:02:26 wiz Exp $
2# 2#
3bin/freetype-config 3bin/freetype-config
4include/freetype2/freetype/config/ftconfig.h 4include/freetype2/freetype/config/ftconfig.h
5include/freetype2/freetype/config/ftheader.h 5include/freetype2/freetype/config/ftheader.h
6include/freetype2/freetype/config/ftmodule.h 6include/freetype2/freetype/config/ftmodule.h
7include/freetype2/freetype/config/ftoption.h 7include/freetype2/freetype/config/ftoption.h
8include/freetype2/freetype/config/ftstdlib.h 8include/freetype2/freetype/config/ftstdlib.h
9include/freetype2/freetype/freetype.h 9include/freetype2/freetype/freetype.h
 10include/freetype2/freetype/ftadvanc.h
10include/freetype2/freetype/ftbbox.h 11include/freetype2/freetype/ftbbox.h
11include/freetype2/freetype/ftbdf.h 12include/freetype2/freetype/ftbdf.h
12include/freetype2/freetype/ftbitmap.h 13include/freetype2/freetype/ftbitmap.h
13include/freetype2/freetype/ftcache.h 14include/freetype2/freetype/ftcache.h
14include/freetype2/freetype/ftchapters.h 15include/freetype2/freetype/ftchapters.h
 16include/freetype2/freetype/ftcid.h
15include/freetype2/freetype/fterrdef.h 17include/freetype2/freetype/fterrdef.h
16include/freetype2/freetype/fterrors.h 18include/freetype2/freetype/fterrors.h
17include/freetype2/freetype/ftgasp.h 19include/freetype2/freetype/ftgasp.h
18include/freetype2/freetype/ftglyph.h 20include/freetype2/freetype/ftglyph.h
19include/freetype2/freetype/ftgxval.h 21include/freetype2/freetype/ftgxval.h
20include/freetype2/freetype/ftgzip.h 22include/freetype2/freetype/ftgzip.h
21include/freetype2/freetype/ftimage.h 23include/freetype2/freetype/ftimage.h
22include/freetype2/freetype/ftincrem.h 24include/freetype2/freetype/ftincrem.h
23include/freetype2/freetype/ftlcdfil.h 25include/freetype2/freetype/ftlcdfil.h
24include/freetype2/freetype/ftlist.h 26include/freetype2/freetype/ftlist.h
25include/freetype2/freetype/ftlzw.h 27include/freetype2/freetype/ftlzw.h
26include/freetype2/freetype/ftmac.h 28include/freetype2/freetype/ftmac.h
27include/freetype2/freetype/ftmm.h 29include/freetype2/freetype/ftmm.h
28include/freetype2/freetype/ftmodapi.h 30include/freetype2/freetype/ftmodapi.h
29include/freetype2/freetype/ftmoderr.h 31include/freetype2/freetype/ftmoderr.h
30include/freetype2/freetype/ftotval.h 32include/freetype2/freetype/ftotval.h
31include/freetype2/freetype/ftoutln.h 33include/freetype2/freetype/ftoutln.h
32include/freetype2/freetype/ftpfr.h 34include/freetype2/freetype/ftpfr.h
33include/freetype2/freetype/ftrender.h 35include/freetype2/freetype/ftrender.h
34include/freetype2/freetype/ftsizes.h 36include/freetype2/freetype/ftsizes.h
35include/freetype2/freetype/ftsnames.h 37include/freetype2/freetype/ftsnames.h
36include/freetype2/freetype/ftstroke.h 38include/freetype2/freetype/ftstroke.h
37include/freetype2/freetype/ftsynth.h 39include/freetype2/freetype/ftsynth.h
38include/freetype2/freetype/ftsystem.h 40include/freetype2/freetype/ftsystem.h
39include/freetype2/freetype/fttrigon.h 41include/freetype2/freetype/fttrigon.h
40include/freetype2/freetype/fttypes.h 42include/freetype2/freetype/fttypes.h
41include/freetype2/freetype/ftwinfnt.h 43include/freetype2/freetype/ftwinfnt.h
42include/freetype2/freetype/ftxf86.h 44include/freetype2/freetype/ftxf86.h
43include/freetype2/freetype/t1tables.h 45include/freetype2/freetype/t1tables.h
44include/freetype2/freetype/ttnameid.h 46include/freetype2/freetype/ttnameid.h
45include/freetype2/freetype/tttables.h 47include/freetype2/freetype/tttables.h
46include/freetype2/freetype/tttags.h 48include/freetype2/freetype/tttags.h
47include/freetype2/freetype/ttunpat.h 49include/freetype2/freetype/ttunpat.h
48include/ft2build.h 50include/ft2build.h
49lib/libfreetype.a 
50lib/libfreetype.la 
51lib/libfreetype.6.3.16.dylib 51lib/libfreetype.6.3.16.dylib
52lib/libfreetype.6.dylib 52lib/libfreetype.6.dylib
 53lib/libfreetype.a
53lib/libfreetype.dylib 54lib/libfreetype.dylib
 55lib/libfreetype.la
54lib/libfreetype.so 56lib/libfreetype.so
55lib/libfreetype.so.6 57lib/libfreetype.so.6
56lib/libfreetype.so.6.3.17 58lib/libfreetype.so.6.3.17
57lib/libfreetype.so.7 59lib/libfreetype.so.7
58lib/libfreetype.so.7.1 60lib/libfreetype.so.7.1
59lib/pkgconfig/freetype2.pc 61lib/pkgconfig/freetype2.pc
60share/aclocal/freetype2.m4 62share/aclocal/freetype2.m4