tech-toolchain archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
build.sh and checkflist with MKSHARE=no
Hi - and happy new year all :)
I've got an issue with checkflist and MKSHARE=no on 6.1.2 (-current has the
same issue AFAICT, although I did not check explicitly).
Is the following patch OK?
[ If yes, should the commit be split in smaller specific chunks? ]
--
Anthony
Index: crypto/external/bsd/libsaslc/etc/Makefile
===================================================================
RCS file: /cvsroot/src/crypto/external/bsd/libsaslc/etc/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- crypto/external/bsd/libsaslc/etc/Makefile 20 Feb 2011 05:17:47 -0000
1.3
+++ crypto/external/bsd/libsaslc/etc/Makefile 1 Jan 2014 17:15:04 -0000
@@ -4,6 +4,7 @@
SUBDIR=mech
+.if ${MKSHARE} != "no"
FILESDIR=/usr/share/examples/libsaslc
FILESOWN=root
FILESGRP=wheel
@@ -19,6 +20,7 @@
CFG_MECH+= GSSAPI.conf
CFG_MECH+= LOGIN.conf
CFG_MECH+= PLAIN.conf
+.endif
.include <bsd.files.mk>
.include <bsd.subdir.mk>
Index: crypto/external/bsd/libsaslc/etc/mech/Makefile
===================================================================
RCS file: /cvsroot/src/crypto/external/bsd/libsaslc/etc/mech/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- crypto/external/bsd/libsaslc/etc/mech/Makefile 20 Feb 2011 05:42:34
-0000 1.2
+++ crypto/external/bsd/libsaslc/etc/mech/Makefile 1 Jan 2014 17:15:04
-0000
@@ -2,6 +2,7 @@
.include <bsd.own.mk>
+.if ${MKSHARE} != "no"
FILESDIR=/usr/share/examples/libsaslc/mech
FILESOWN=root
FILESGRP=wheel
@@ -15,5 +16,6 @@
FILES+= GSSAPI.conf
FILES+= LOGIN.conf
FILES+= PLAIN.conf
+.endif
.include <bsd.prog.mk>
Index: distrib/sets/lists/base/mi
===================================================================
RCS file: /cvsroot/src/distrib/sets/lists/base/mi,v
retrieving revision 1.984.2.15
diff -u -r1.984.2.15 mi
--- distrib/sets/lists/base/mi 14 Mar 2013 19:16:40 -0000 1.984.2.15
+++ distrib/sets/lists/base/mi 1 Jan 2014 17:15:04 -0000
@@ -1658,17 +1658,17 @@
./usr/share/examples/ipf base-netutil-examples
./usr/share/examples/isdn base-isdn-examples
./usr/share/examples/kerberos base-krb5-examples
-./usr/share/examples/lua base-sys-examples share
+./usr/share/examples/lua base-sys-examples
./usr/share/examples/lua/README base-sys-examples
share
./usr/share/examples/lua/gpio.lua base-sys-examples share
./usr/share/examples/lua/sqlite.lua base-sys-examples share
./usr/share/examples/mount_portal base-miscfs-examples
./usr/share/examples/named base-obsolete obsolete
./usr/share/examples/npf base-netutil-examples
-./usr/share/examples/npf/host-npf.conf base-netutil-examples
-./usr/share/examples/npf/soho_gw-npf.conf base-netutil-examples
-./usr/share/examples/npf/hashtablefile base-netutil-examples
-./usr/share/examples/npf/treetablefile base-netutil-examples
+./usr/share/examples/npf/host-npf.conf base-netutil-examples share
+./usr/share/examples/npf/soho_gw-npf.conf base-netutil-examples share
+./usr/share/examples/npf/hashtablefile base-netutil-examples share
+./usr/share/examples/npf/treetablefile base-netutil-examples share
./usr/share/examples/openssl base-crypto-examples
./usr/share/examples/pf base-netutil-examples
./usr/share/examples/postfix base-postfix-examples
Index: distrib/sets/lists/misc/mi
===================================================================
RCS file: /cvsroot/src/distrib/sets/lists/misc/mi,v
retrieving revision 1.176
diff -u -r1.176 mi
--- distrib/sets/lists/misc/mi 14 Feb 2012 17:29:51 -0000 1.176
+++ distrib/sets/lists/misc/mi 1 Jan 2014 17:15:04 -0000
@@ -745,9 +745,9 @@
./usr/share/examples/isdn/isdnd.rates.UK.BT misc-isdn-examples share
./usr/share/examples/isdn/isdnd.rc.sample misc-isdn-examples share
./usr/share/examples/kerberos/krb5.conf misc-krb5-examples
kerberos,share
-./usr/share/examples/libsaslc misc-libsaslc-examples share
+./usr/share/examples/libsaslc misc-libsaslc-examples
./usr/share/examples/libsaslc/README misc-libsaslc-examples share
-./usr/share/examples/libsaslc/mech misc-libsaslc-examples share
+./usr/share/examples/libsaslc/mech misc-libsaslc-examples
./usr/share/examples/libsaslc/saslc.conf misc-libsaslc-examples share
./usr/share/examples/libsaslc/mech/ANONYMOUS.conf misc-libsaslc-examples
share
./usr/share/examples/libsaslc/mech/CRAM-MD5.conf misc-libsaslc-examples
share
@@ -916,7 +916,7 @@
./usr/share/examples/supfiles/sup2.fr.netbsd.org misc-sup-examples
share
./usr/share/examples/syslogd/all.debug misc-sysutil-examples share
./usr/share/examples/syslogd/all.newsyslog.conf misc-sysutil-examples
share
-./usr/share/examples/tmux misc-tmux-examples share
+./usr/share/examples/tmux misc-tmux-examples
./usr/share/examples/tmux/screen-keys.conf misc-tmux-examples share
./usr/share/examples/usermgmt misc-obsolete obsolete
./usr/share/examples/usermgmt/.cshrc misc-obsolete obsolete
Home |
Main Index |
Thread Index |
Old Index