tech-pkg archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
xorg.mk line 90,91 (Re: x11-links differ pbulk and just a make (Re: 2013Q2 MesaLib and pbulk
In the line 90 and 91 of x11-links/xorg.mk may be
the point of difference (of pbulk OR reguar make).
kuro@makoto 15:04:44/130918(..pkgtools/x11-links)% cat -n xorg.mk | sed -n
88,100p
88 .for _pkg_ in ${BUILDLINK_TREE:N-*:Nx11-links:O:u}
89 IGNORE_PKG.${_pkg_}= yes
90 . if defined(USE_BUILTIN.${_pkg_}) && \
91 !empty(USE_BUILTIN.${_pkg_}:M[yY][eE][sS])
+ 92 _TMP_pkg+= ${_pkg_}
93 . if exists(${FILESDIR}/xorg.${_pkg_})
94 FILES_LIST+= ${FILESDIR}/xorg.${_pkg_}
95 . elif exists(${FILESDIR}/xfree.${_pkg_})
96 FILES_LIST+= ${FILESDIR}/xfree.${_pkg_}
97 . endif
98 . endif
99 .endfor
With attached change, I've got following diff
(Some permission denied or, converting SPACE to NL
etc, manually operations are necessary, but I
think this will tell the sitution).
Thank you,
--- /export/CHROOT/tmp/_TMP_pkg-pbulk.cr 2013-09-18 14:57:28.000000000
+0900
+++ /export/CHROOT/tmp/_TMP_pkg-make.cr 2013-09-18 14:57:37.000000000 +0900
@@ -1,3 +1,4 @@
+MesaLib
Xcomposite
Xfixes
bigreqsproto
@@ -10,6 +11,8 @@
fixesproto
fontcacheproto
fontsproto
+glu
+glut
inputproto
kbproto
libFS
@@ -23,6 +26,8 @@
libXdmcp
libXevie
libXext
+libXfont
+libXft
libXinerama
libXmu
libXp
@@ -48,6 +53,7 @@
xcursor
xextproto
xf86bigfontproto
+xf86driproto
xf86miscproto
xineramaproto
xproto
---
Makoto Fujiwara,
Index: Makefile
===================================================================
RCS file: /cvs/cvsroot/pkgsrc/pkgtools/x11-links/Makefile,v
retrieving revision 1.146
diff -u -r1.146 Makefile
--- Makefile 11 Jun 2013 13:09:17 -0000 1.146
+++ Makefile 18 Sep 2013 06:00:57 -0000
@@ -87,6 +87,8 @@
fi; \
done
${RM} -f ${PLIST_SRC.files}
+ cat ${FILES_LIST} > /tmp/FILES_LIST
+ echo ${_TMP_pkg} > /tmp/_TMP_pkg
${FILES_LIST_CMD} | ${SORT} -u | \
while read file; do \
srcdir=""; \
Index: xorg.mk
===================================================================
RCS file: /cvs/cvsroot/pkgsrc/pkgtools/x11-links/xorg.mk,v
retrieving revision 1.24
diff -u -r1.24 xorg.mk
--- xorg.mk 11 Feb 2013 09:16:12 -0000 1.24
+++ xorg.mk 18 Sep 2013 06:00:57 -0000
@@ -89,6 +89,7 @@
IGNORE_PKG.${_pkg_}= yes
. if defined(USE_BUILTIN.${_pkg_}) && \
!empty(USE_BUILTIN.${_pkg_}:M[yY][eE][sS])
+_TMP_pkg+= ${_pkg_}
. if exists(${FILESDIR}/xorg.${_pkg_})
FILES_LIST+= ${FILESDIR}/xorg.${_pkg_}
. elif exists(${FILESDIR}/xfree.${_pkg_})
Home |
Main Index |
Thread Index |
Old Index