NetBSD 絹の日記

x11-links will be packaged differently with and without pbulk.

Prepare chrooted pbulk environment (and set limited_list mode)
Set limited-list with only one line as:
```
pkgtools/x11-links
```
run pbulk and get package x11-links-0.79.tgz
run normal make as
```
(cd /usr/pkgsrc/pkgtools/x11-links; make package)
```
And get the package /usr/pkgsrc/packages/All/x11-links-0.79.tgz

Then compare list of find in there:

tar ztvf packages/All/x11-links-0.79-normal.tgz  | awk '{print $9 $10 $11}' >!  /tmp/normal-li
tar ztvf packages/All/x11-links-0.79.tgz         | awk '{print $9 $10 $11}' >!  /tmp/pbulk-list

genova@makoto 23:09:45/131119(..usr/pkgsrc)% \
diff -u /tmp/normal-list /export/CHROOT/tmp/pbulk-
list 
--- /tmp/normal-list    2013-11-19 23:09:45.000000000 +0900
+++ /export/CHROOT/tmp/pbulk-list       2013-11-19 23:09:16.000000000 +0900
@@ -162,8 +162,6 @@
 share/x11-links/include/X11/Xcursor/Xcursor.h->/usr/X11R7/include/X11/Xcursor/Xcursor.h
 share/x11-links/include/X11/Xdefs.h->/usr/X11R7/include/X11/Xdefs.h
 share/x11-links/include/X11/Xdmcp.h->/usr/X11R7/include/X11/Xdmcp.h
-share/x11-links/include/X11/Xft/Xft.h->/usr/X11R7/include/X11/Xft/Xft.h
-share/x11-links/include/X11/Xft/XftCompat.h->/usr/X11R7/include/X11/Xft/XftCompat.h
 share/x11-links/include/X11/Xfuncproto.h->/usr/X11R7/include/X11/Xfuncproto.h
 share/x11-links/include/X11/Xfuncs.h->/usr/X11R7/include/X11/Xfuncs.h
 share/x11-links/include/X11/Xlcint.h->/usr/X11R7/include/X11/Xlcint.h
@@ -670,10 +668,6 @@
 share/x11-links/lib/libXfontcache.so->/usr/X11R7/lib/libXfontcache.so
 share/x11-links/lib/libXfontcache.so.2->/usr/X11R7/lib/libXfontcache.so.2
 share/x11-links/lib/libXfontcache.so.2.0->/usr/X11R7/lib/libXfontcache.so.2.0
-share/x11-links/lib/libXft.a->/usr/X11R7/lib/libXft.a
-share/x11-links/lib/libXft.so->/usr/X11R7/lib/libXft.so
-share/x11-links/lib/libXft.so.3->/usr/X11R7/lib/libXft.so.3
-share/x11-links/lib/libXft.so.3.0->/usr/X11R7/lib/libXft.so.3.0
 share/x11-links/lib/libXi.a->/usr/X11R7/lib/libXi.a
 share/x11-links/lib/libXi.so->/usr/X11R7/lib/libXi.so
 share/x11-links/lib/libXi.so.7->/usr/X11R7/lib/libXi.so.7
@@ -937,7 +931,6 @@
 share/x11-links/lib/pkgconfig/xfixes.pc->/usr/X11R7/lib/pkgconfig/xfixes.pc
 share/x11-links/lib/pkgconfig/xfont.pc->/usr/X11R7/lib/pkgconfig/xfont.pc
 share/x11-links/lib/pkgconfig/xfontcache.pc->/usr/X11R7/lib/pkgconfig/xfontcache.pc
-share/x11-links/lib/pkgconfig/xft.pc->/usr/X11R7/lib/pkgconfig/xft.pc
 share/x11-links/lib/pkgconfig/xi.pc->/usr/X11R7/lib/pkgconfig/xi.pc
 share/x11-links/lib/pkgconfig/xinerama.pc->/usr/X11R7/lib/pkgconfig/xinerama.pc
 share/x11-links/lib/pkgconfig/xineramaproto.pc->/usr/X11R7/lib/pkgconfig/xineramaproto.pc
genova@makoto 23:10:01/131119(..usr/pkgsrc)%

＠ x11/libXft/builtin.mk:

If you put following change, this difference disappear.

Index: x11/libXft/builtin.mk
===================================================================
RCS file: /cvs/cvsroot/pkgsrc/x11/libXft/builtin.mk,v
retrieving revision 1.2
diff -u -r1.2 builtin.mk
--- x11/libXft/builtin.mk	7 Jun 2013 17:43:40 -0000	1.2
+++ x11/libXft/builtin.mk	19 Nov 2013 14:05:23 -0000
@@ -68,6 +68,7 @@
 .    endif
 .  endif  # PREFER.libXft
 .endif
+USE_BUILTIN.libXft=	yes
 MAKEVARS+=	USE_BUILTIN.libXft
 
 ###

But following change does not affect the behavior, that is, list of files are Bad situation, the location of above line does not mean anything. (Somebody set the value to 'no' before coming here).

Index: x11/libXft/builtin.mk
===================================================================
RCS file: /cvs/cvsroot/pkgsrc/x11/libXft/builtin.mk,v
retrieving revision 1.2
diff -u -r1.2 builtin.mk
--- x11/libXft/builtin.mk	7 Jun 2013 17:43:40 -0000	1.2
+++ x11/libXft/builtin.mk	19 Nov 2013 14:42:30 -0000
@@ -47,6 +47,7 @@
 ### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no").
 ###
 
+USE_BUILTIN.libXft?=	yes
 .if !defined(USE_BUILTIN.libXft)
 .  if ${PREFER.libXft} == "pkgsrc"
 USE_BUILTIN.libXft=	no

2013年11月19日(火) 旧暦 [n年日記] [更新:"2013/11/20 07:44:18"]

#1 [pkgsrc] pkgtools/x11-links oddity

＠ x11/libXft/builtin.mk: