Index: head/etc/Makefile =================================================================== --- head/etc/Makefile (revision 290082) +++ head/etc/Makefile (revision 290083) @@ -1,436 +1,436 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 # $FreeBSD$ .include SUBDIR= \ newsyslog.conf.d .if ${MK_SENDMAIL} != "no" SUBDIR+=sendmail .endif BIN1= crontab \ devd.conf \ devfs.conf \ ddb.conf \ dhclient.conf \ disktab \ fbtab \ gettytab \ group \ hosts \ hosts.allow \ hosts.equiv \ libalias.conf \ libmap.conf \ login.access \ login.conf \ mac.conf \ motd \ netconfig \ network.subr \ networks \ newsyslog.conf \ nsswitch.conf \ phones \ profile \ protocols \ rc \ rc.bsdextended \ rc.firewall \ rc.initdiskless \ rc.shutdown \ rc.subr \ remote \ rpc \ services \ shells \ sysctl.conf \ syslog.conf \ termcap.small .if exists(${.CURDIR}/etc.${MACHINE}/ttys) BIN1+= etc.${MACHINE}/ttys .elif exists(${.CURDIR}/etc.${MACHINE_ARCH}/ttys) BIN1+= etc.${MACHINE_ARCH}/ttys .elif exists(${.CURDIR}/etc.${MACHINE_CPUARCH}/ttys) BIN1+= etc.${MACHINE_CPUARCH}/ttys .else .error etc.MACHINE/ttys missing .endif OPENBSMDIR= ${.CURDIR}/../contrib/openbsm BSM_ETC_OPEN_FILES= ${OPENBSMDIR}/etc/audit_class \ ${OPENBSMDIR}/etc/audit_event BSM_ETC_RESTRICTED_FILES= ${OPENBSMDIR}/etc/audit_control \ ${OPENBSMDIR}/etc/audit_user BSM_ETC_EXEC_FILES= ${OPENBSMDIR}/etc/audit_warn BSM_ETC_DIR= ${DESTDIR}/etc/security # NB: keep these sorted by MK_* knobs .if ${MK_AMD} != "no" BIN1+= amd.map .endif .if ${MK_APM} != "no" BIN1+= apmd.conf .endif .if ${MK_AUTOFS} != "no" BIN1+= auto_master .endif .if ${MK_BSNMP} != "no" BIN1+= snmpd.config .endif .if ${MK_FREEBSD_UPDATE} != "no" BIN1+= freebsd-update.conf .endif .if ${MK_FTP} != "no" BIN1+= ftpusers .endif .if ${MK_INETD} != "no" BIN1+= inetd.conf .endif .if ${MK_LOCATE} != "no" BIN1+= ${.CURDIR}/../usr.bin/locate/locate/locate.rc .endif .if ${MK_LPR} != "no" BIN1+= hosts.lpd printcap .endif .if ${MK_MAIL} != "no" BIN1+= ${.CURDIR}/../usr.bin/mail/misc/mail.rc .endif .if ${MK_NTP} != "no" BIN1+= ntp.conf .endif .if ${MK_OPENSSH} != "no" SSH= ${.CURDIR}/../crypto/openssh/ssh_config \ ${.CURDIR}/../crypto/openssh/sshd_config \ ${.CURDIR}/../crypto/openssh/moduli .endif .if ${MK_OPENSSL} != "no" SSL= ${.CURDIR}/../crypto/openssl/apps/openssl.cnf .endif .if ${MK_NS_CACHING} != "no" BIN1+= nscd.conf .endif .if ${MK_PORTSNAP} != "no" BIN1+= portsnap.conf .endif .if ${MK_PF} != "no" BIN1+= pf.os .endif .if ${MK_SENDMAIL} != "no" BIN1+= rc.sendmail .endif .if ${MK_TCSH} != "no" BIN1+= csh.cshrc csh.login csh.logout .endif .if ${MK_WIRELESS} != "no" BIN1+= regdomain.xml .endif # -rwxr-xr-x root:wheel, for the new cron root:wheel BIN2= netstart pccard_ether rc.suspend rc.resume MTREE= BSD.debug.dist BSD.include.dist BSD.root.dist BSD.usr.dist BSD.var.dist .if ${MK_LIB32} != "no" MTREE+= BSD.lib32.dist .endif .if ${MK_TESTS} != "no" MTREE+= BSD.tests.dist .endif .if ${MK_SENDMAIL} != "no" MTREE+= BSD.sendmail.dist .endif PPPCNF= ppp.conf .if ${MK_SENDMAIL} == "no" ETCMAIL=mailer.conf aliases .else ETCMAIL=Makefile README mailer.conf access.sample virtusertable.sample \ mailertable.sample aliases .endif # Special top level files for FreeBSD FREEBSD=COPYRIGHT # Sanitize DESTDIR DESTDIR:= ${DESTDIR:C://*:/:g} afterinstall: .if ${MK_MAN} != "no" ${_+_}cd ${.CURDIR}/../share/man; ${MAKE} makedb .endif distribute: # Avoid installing tests here; "make distribution" will do this and # correctly place them in the right location. ${_+_}cd ${.CURDIR} ; ${MAKE} MK_TESTS=no install \ DESTDIR=${DISTDIR}/${DISTRIBUTION} ${_+_}cd ${.CURDIR} ; ${MAKE} distribution DESTDIR=${DISTDIR}/${DISTRIBUTION} .include .if ${TARGET_ENDIANNESS} == "1234" CAP_MKDB_ENDIAN?= -l .elif ${TARGET_ENDIANNESS} == "4321" CAP_MKDB_ENDIAN?= -b .else CAP_MKDB_ENDIAN?= .endif .if defined(NO_ROOT) METALOG.add?= cat -l >> ${METALOG} .endif distribution: .if !defined(DESTDIR) @echo "set DESTDIR before running \"make ${.TARGET}\"" @false .endif cd ${.CURDIR}; \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${BIN1} ${DESTDIR}/etc; \ cap_mkdb ${CAP_MKDB_ENDIAN} ${DESTDIR}/etc/login.conf; \ services_mkdb ${CAP_MKDB_ENDIAN} -q -o ${DESTDIR}/var/db/services.db \ ${DESTDIR}/etc/services; \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 755 \ ${BIN2} ${DESTDIR}/etc; \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \ master.passwd nsmb.conf opieaccess ${DESTDIR}/etc; .if ${MK_AT} == "no" sed -i "" -e 's;.*/usr/libexec/atrun;#&;' ${DESTDIR}/etc/crontab .endif .if ${MK_TCSH} == "no" sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDIR}/etc/master.passwd .endif pwd_mkdb -i -p -d ${DESTDIR}/etc ${DESTDIR}/etc/master.passwd .if defined(NO_ROOT) ( \ echo "./etc/login.conf.db type=file mode=0644 uname=root gname=wheel"; \ echo "./etc/passwd type=file mode=0644 uname=root gname=wheel"; \ echo "./etc/pwd.db type=file mode=0644 uname=root gname=wheel"; \ echo "./etc/spwd.db type=file mode=0600 uname=root gname=wheel"; \ ) | ${METALOG.add} .endif .if ${MK_AUTOFS} != "no" ${_+_}cd ${.CURDIR}/autofs; ${MAKE} install .endif .if ${MK_BLUETOOTH} != "no" ${_+_}cd ${.CURDIR}/bluetooth; ${MAKE} install .endif .if ${MK_CASPER} != "no" ${_+_}cd ${.CURDIR}/casper; ${MAKE} install .endif ${_+_}cd ${.CURDIR}/defaults; ${MAKE} install ${_+_}cd ${.CURDIR}/devd; ${MAKE} install ${_+_}cd ${.CURDIR}/gss; ${MAKE} install .if ${MK_NTP} != "no" ${_+_}cd ${.CURDIR}/ntp; ${MAKE} install .endif ${_+_}cd ${.CURDIR}/periodic; ${MAKE} install .if ${MK_PKGBOOTSTRAP} != "no" ${_+_}cd ${.CURDIR}/pkg; ${MAKE} install .endif ${_+_}cd ${.CURDIR}/rc.d; ${MAKE} install ${_+_}cd ${.CURDIR}/../share/termcap; ${MAKE} etc-termcap ${_+_}cd ${.CURDIR}/../usr.sbin/rmt; ${MAKE} etc-rmt ${_+_}cd ${.CURDIR}/pam.d; ${MAKE} install cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0444 \ ${BSM_ETC_OPEN_FILES} ${BSM_ETC_DIR} cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0600 \ ${BSM_ETC_RESTRICTED_FILES} ${BSM_ETC_DIR} cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0500 \ ${BSM_ETC_EXEC_FILES} ${BSM_ETC_DIR} .if ${MK_UNBOUND} != "no" if [ ! -e ${DESTDIR}/etc/unbound ]; then \ ${INSTALL_SYMLINK} ../var/unbound ${DESTDIR}/etc/unbound; \ fi .endif .if ${MK_SENDMAIL} != "no" ${_+_}cd ${.CURDIR}/sendmail; ${MAKE} distribution .endif .if ${MK_OPENSSH} != "no" cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${SSH} ${DESTDIR}/etc/ssh .endif .if ${MK_OPENSSL} != "no" cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${SSL} ${DESTDIR}/etc/ssl .endif .if ${MK_KERBEROS} != "no" cd ${.CURDIR}/root; \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ dot.k5login ${DESTDIR}/root/.k5login; .endif cd ${.CURDIR}/root; \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ dot.profile ${DESTDIR}/root/.profile; \ rm -f ${DESTDIR}/.profile; \ ln ${DESTDIR}/root/.profile ${DESTDIR}/.profile .if ${MK_TCSH} != "no" cd ${.CURDIR}/root; \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ dot.cshrc ${DESTDIR}/root/.cshrc; \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ dot.login ${DESTDIR}/root/.login; \ rm -f ${DESTDIR}/.cshrc; \ ln ${DESTDIR}/root/.cshrc ${DESTDIR}/.cshrc .endif cd ${.CURDIR}/mtree; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${MTREE} ${DESTDIR}/etc/mtree .if ${MK_MAIL} != "no" cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${ETCMAIL} ${DESTDIR}/etc/mail if [ -d ${DESTDIR}/etc/mail -a -f ${DESTDIR}/etc/mail/aliases -a \ ! -f ${DESTDIR}/etc/aliases ]; then \ ln -s mail/aliases ${DESTDIR}/etc/aliases; \ fi .endif ${INSTALL} -o ${BINOWN} -g operator -m 664 /dev/null \ ${DESTDIR}/etc/dumpdates .if ${MK_LOCATE} != "no" ${INSTALL} -o nobody -g ${BINGRP} -m 644 /dev/null \ ${DESTDIR}/var/db/locate.database .endif ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 ${.CURDIR}/minfree \ ${DESTDIR}/var/crash cd ${.CURDIR}/..; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${FREEBSD} ${DESTDIR}/ .if ${MK_BOOT} != "no" .if exists(${.CURDIR}/../sys/${MACHINE}/conf/GENERIC.hints) ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${.CURDIR}/../sys/${MACHINE}/conf/GENERIC.hints \ ${DESTDIR}/boot/device.hints .endif .endif .if ${MK_NIS} == "no" sed -i "" -e 's/.*_compat:/# &/' -e 's/compat$$/files/' \ ${DESTDIR}/etc/nsswitch.conf .endif MTREE_CMD?= mtree .if ${MK_INSTALL_AS_USER} == "yes" && ${_uid} != 0 MTREE_FILTER= sed -e 's,\([gu]\)name=,\1id=,g' \ -e 's,\(uid=\)[^ ]* ,\1${_uid} ,' \ -e 's,\(gid=\)[^ ]* ,\1${_gid} ,' \ -e 's,\(uid=\)[^ ]*$$,\1${_uid},' \ -e 's,\(gid=\)[^ ]*$$,\1${_gid},' .else MTREE_FILTER= cat .endif MTREES= mtree/BSD.root.dist / \ mtree/BSD.var.dist /var \ mtree/BSD.usr.dist /usr \ mtree/BSD.include.dist /usr/include \ mtree/BSD.debug.dist /usr/lib .if ${MK_GROFF} != "no" MTREES+= mtree/BSD.groff.dist /usr .endif .if ${MK_LIB32} != "no" MTREES+= mtree/BSD.lib32.dist /usr MTREES+= mtree/BSD.lib32.dist /usr/lib/debug/usr .endif .if ${MK_TESTS} != "no" MTREES+= mtree/BSD.tests.dist ${TESTSBASE} MTREES+= mtree/BSD.tests.dist /usr/lib/debug/${TESTSBASE} .endif .if ${MK_SENDMAIL} != "no" MTREES+= mtree/BSD.sendmail.dist / .endif .for mtree in ${LOCAL_MTREE} MTREES+= ../${mtree} / .endfor distrib-dirs: ${MTREES:N/*} @set ${MTREES}; \ while test $$# -ge 2; do \ m=${.CURDIR}/$$1; \ shift; \ d=${DESTDIR}$$1; \ shift; \ test -d $$d || mkdir -p $$d; \ ${ECHO} ${MTREE_CMD} -deU ${MTREE_FOLLOWS_SYMLINKS} \ -f $$m -p $$d; \ ${MTREE_FILTER} $$m | \ ${MTREE_CMD} -deU ${MTREE_FOLLOWS_SYMLINKS} -p $$d; \ done; true .if defined(NO_ROOT) @set ${MTREES}; \ while test $$# -ge 2; do \ m=${.CURDIR}/$$1; \ shift; \ d=$$1; \ test "$$d" == "/" && d=""; \ d=${DISTBASE}$$d; \ shift; \ test -d ${DESTDIR}/$$d || mkdir -p ${DESTDIR}/$$d; \ ${ECHO} "${MTREE_CMD:N-W} -C -f $$m -K uname,gname | " \ "sed s#^\.#.$$d# | ${METALOG.add}" ; \ ${MTREE_FILTER} $$m | \ ${MTREE_CMD:N-W} -C -K uname,gname | sed s#^\.#.$$d# | \ ${METALOG.add} ; \ done; true .endif ${INSTALL_SYMLINK} usr/src/sys ${DESTDIR}/sys .if ${MK_MAN} != "no" - cd ${DESTDIR}/usr/share/man; \ + cd ${DESTDIR}${SHAREDIR}/man; \ for mandir in man*; do \ ${INSTALL_SYMLINK} ../$$mandir \ - ${DESTDIR}/usr/share/man/en.ISO8859-1/; \ + ${DESTDIR}${SHAREDIR}/man/en.ISO8859-1/; \ ${INSTALL_SYMLINK} ../$$mandir \ - ${DESTDIR}/usr/share/man/en.UTF-8/; \ + ${DESTDIR}${SHAREDIR}/man/en.UTF-8/; \ done .if ${MK_OPENSSL} != "no" - cd ${DESTDIR}/usr/share/openssl/man; \ + cd ${DESTDIR}${SHAREDIR}/openssl/man; \ for mandir in man*; do \ ${INSTALL_SYMLINK} ../$$mandir \ - ${DESTDIR}/usr/share/openssl/man/en.ISO8859-1/; \ + ${DESTDIR}${SHAREDIR}/openssl/man/en.ISO8859-1/; \ done .endif set - `grep "^[a-zA-Z]" ${.CURDIR}/man.alias`; \ while [ $$# -gt 0 ] ; do \ - ${INSTALL_SYMLINK} "$$2" "${DESTDIR}/usr/share/man/$$1"; \ + ${INSTALL_SYMLINK} "$$2" "${DESTDIR}${SHAREDIR}/man/$$1"; \ if [ "${MK_OPENSSL}" != "no" ]; then \ ${INSTALL_SYMLINK} "$$2" \ - "${DESTDIR}/usr/share/openssl/man/$$1"; \ + "${DESTDIR}${SHAREDIR}/openssl/man/$$1"; \ fi; \ shift; shift; \ done .endif .if ${MK_NLS} != "no" set - `grep "^[a-zA-Z]" ${.CURDIR}/nls.alias`; \ while [ $$# -gt 0 ] ; do \ - ${INSTALL_SYMLINK} "$$2" "${DESTDIR}/usr/share/nls/$$1"; \ + ${INSTALL_SYMLINK} "$$2" "${DESTDIR}${SHAREDIR}/nls/$$1"; \ shift; shift; \ done .endif etc-examples: cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${BIN1} ${BIN2} nsmb.conf opieaccess \ - ${DESTDIR}/usr/share/examples/etc + ${DESTDIR}${SHAREDIR}/examples/etc ${_+_}cd ${.CURDIR}/defaults; ${MAKE} install \ - DESTDIR=${DESTDIR}/usr/share/examples + DESTDIR=${DESTDIR}${SHAREDIR}/examples .include Index: head/sbin/atm/atmconfig/Makefile =================================================================== --- head/sbin/atm/atmconfig/Makefile (revision 290082) +++ head/sbin/atm/atmconfig/Makefile (revision 290083) @@ -1,43 +1,43 @@ # Copyright (c) 2001-2003 # Fraunhofer Institute for Open Communication Systems (FhG Fokus). # All rights reserved. # Author: Harti Brandt # # $FreeBSD$ .include PROG= atmconfig SRCS= main.c diag.c natm.c MAN= atmconfig.8 -# CFLAGS+= -DPATH_HELP='".:/usr/share/doc/atm:/usr/local/share/doc/atm"' +# CFLAGS+= -DPATH_HELP='".:${SHAREDIR}/doc/atm:/usr/local/share/doc/atm"' CFLAGS+= -I${.OBJDIR} .if !defined(RESCUE) && ${MK_BSNMP} != "no" CFLAGS+= -DWITH_BSNMP SRCS+= oid.h atmconfig_device.c LIBADD+= bsnmp . if ${MK_DYNAMICROOT} == "no" && ${MK_OPENSSL} != "no" LIBADD+= crypto . endif .endif CLEANFILES+= oid.h # XXX - this is verboten .if ${MACHINE_CPUARCH} == "arm" WARNS?= 3 .endif FILES= atmconfig.help atmconfig_device.help -FILESDIR= /usr/share/doc/atm +FILESDIR= ${SHAREDIR}/doc/atm SNMP_ATM_DEF= ${.CURDIR}/../../../contrib/ngatm/snmp_atm/atm_tree.def \ ${.CURDIR}/../../../usr.sbin/bsnmpd/modules/snmp_atm/atm_freebsd.def oid.h: atm_oid.list ${SNMP_ATM_DEF} cat ${SNMP_ATM_DEF} | gensnmptree -e `tail -n +2 ${.CURDIR}/atm_oid.list` \ > ${.TARGET} .include Index: head/share/colldef/Makefile =================================================================== --- head/share/colldef/Makefile (revision 290082) +++ head/share/colldef/Makefile (revision 290083) @@ -1,117 +1,117 @@ # $FreeBSD$ LOCALES= bg_BG.CP1251 \ be_BY.CP1131 \ be_BY.CP1251 \ be_BY.ISO8859-5 \ ca_ES.ISO8859-1 \ ca_ES.ISO8859-15 \ cs_CZ.ISO8859-2 \ de_DE.ISO8859-1 \ de_DE.ISO8859-15 \ el_GR.ISO8859-7 \ es_ES.ISO8859-1 \ es_ES.ISO8859-15 \ et_EE.ISO8859-15 \ hi_IN.ISCII-DEV \ hr_HR.ISO8859-2 \ hy_AM.ARMSCII-8 \ is_IS.ISO8859-1 \ is_IS.ISO8859-15 \ kk_KZ.PT154 \ la_LN.ISO8859-1 \ la_LN.ISO8859-13 \ la_LN.ISO8859-15 \ la_LN.ISO8859-2 \ la_LN.ISO8859-4 \ la_LN.US-ASCII \ no_NO.ISO8859-1 \ no_NO.ISO8859-15 \ lt_LT.ISO8859-4 \ pl_PL.ISO8859-2 \ ru_RU.CP1251 \ ru_RU.CP866 \ ru_RU.ISO8859-5 \ ru_RU.KOI8-R \ sl_SI.ISO8859-2 \ sr_YU.ISO8859-5 \ sv_SE.ISO8859-1 \ sv_SE.ISO8859-15 \ tr_TR.ISO8859-9 \ uk_UA.CP1251 \ uk_UA.ISO8859-5 \ uk_UA.KOI8-U -LOCALEDIR= /usr/share/locale +LOCALEDIR= ${SHAREDIR}/locale .SUFFIXES: .src .out .src.out: colldef -I ${.CURDIR} -o ${.TARGET} ${.IMPSRC} FILES= ${LOCALES:S/$/.out/} FILESNAME= LC_COLLATE .for locale in ${LOCALES} FILESDIR_${locale}.out= ${LOCALEDIR}/${locale} .if exists(${.CURDIR}/map.${locale:E}) ${locale}.out: map.${locale:E} .endif .endfor CLEANFILES= ${FILES} ENCODINGS= Big5 Big5HKSCS CP949 eucCN eucJP eucKR GB18030 GB2312 GBK \ ISO8859-1 ISO8859-2 ISO8859-13 ISO8859-15 SJIS US-ASCII UTF-8 ISO8859-1_Big5= is_IS:zh_TW ISO8859-1_ISO8859-1= ${ISO8859-15_ISO8859-15} pt_PT:pt_BR LATIN1LINKS= af_ZA da_DK en_AU en_CA en_GB en_NZ en_US eu_ES fi_FI \ fr_BE fr_CA fr_CH fr_FR it_CH it_IT nl_BE nl_NL pt_PT ISO8859-15_ISO8859-15= \ ca_ES:ca_AD ca_ES:ca_FR ca_ES:ca_IT \ de_DE:de_AT de_DE:de_CH \ no_NO:nb_NO no_NO:nn_NO \ ${LATIN1LINKS:C/^/la_LN:/} LATIN2LINKS= hu_HU ro_RO sr_YU ISO8859-2_ISO8859-2= ${LATIN2LINKS:C/^/la_LN:/} cs_CZ:sk_SK LATIN13LINKS= lt_LT lv_LV ISO8859-13_ISO8859-13= ${LATIN13LINKS:C/^/la_LN:/} US-ASCII_Big5HKSCS= la_LN:zh_HK US-ASCII_CP949= la_LN:ko_KR US-ASCII_eucCN= la_LN:zh_CN US-ASCII_eucJP= la_LN:ja_JP US-ASCII_eucKR= la_LN:ko_KR US-ASCII_GB18030= la_LN:zh_CN US-ASCII_GB2312= la_LN:zh_CN US-ASCII_GBK= la_LN:zh_CN US-ASCII_SJIS= la_LN:ja_JP ASCIILINKS= en_AU en_CA en_GB en_NZ en_US US-ASCII_US-ASCII= ${ASCIILINKS:C/^/la_LN:/} UTF8LINKS= af_ZA am_ET be_BY bg_BG ca_AD ca_ES ca_FR ca_IT cs_CZ \ da_DK de_AT de_CH de_DE \ el_GR en_AU en_CA en_GB en_IE en_NZ en_US es_ES et_EE eu_ES \ fi_FI fr_BE fr_CA fr_CH fr_FR he_IL hr_HR hu_HU hy_AM \ is_IS it_CH it_IT ja_JP kk_KZ ko_KR lt_LT lv_LV mn_MN \ nb_NO nl_BE nl_NL nn_NO no_NO pl_PL pt_BR pt_PT \ ro_RO ru_RU sk_SK sl_SI sr_YU sv_SE tr_TR uk_UA zh_CN zh_HK \ zh_TW US-ASCII_UTF-8= ${UTF8LINKS:C/^/la_LN:/} SYMLINKS= .for enc1 in ${ENCODINGS} .for enc2 in ${ENCODINGS} .for lang_terr in ${${enc1}_${enc2}} SYMLINKS+= ../${lang_terr:C/:.*$//}.${enc1}/${FILESNAME} \ ${LOCALEDIR}/${lang_terr:C/^.*://}.${enc2}/${FILESNAME} .endfor .endfor .endfor .include Index: head/share/examples/smbfs/Makefile =================================================================== --- head/share/examples/smbfs/Makefile (revision 290082) +++ head/share/examples/smbfs/Makefile (revision 290083) @@ -1,11 +1,11 @@ # $FreeBSD$ NO_OBJ= -BINDIR= /usr/share/examples/smbfs +FILESDIR= ${SHAREDIR}/examples/smbfs FILES= dot.nsmbrc .PATH: ${.CURDIR}/../../../contrib/smbfs/examples SUBDIR= print .include Index: head/share/examples/smbfs/print/Makefile =================================================================== --- head/share/examples/smbfs/print/Makefile (revision 290082) +++ head/share/examples/smbfs/print/Makefile (revision 290083) @@ -1,9 +1,9 @@ # $FreeBSD$ NO_OBJ= -BINDIR= /usr/share/examples/smbfs/print +FILESDIR= ${SHAREDIR}/examples/smbfs/print FILES= lj6l ljspool printcap.sample tolj .PATH: ${.CURDIR}/../../../../contrib/smbfs/examples/print .include Index: head/share/keys/pkg/trusted/Makefile =================================================================== --- head/share/keys/pkg/trusted/Makefile (revision 290082) +++ head/share/keys/pkg/trusted/Makefile (revision 290083) @@ -1,10 +1,10 @@ # $FreeBSD$ NO_OBJ= FILES= pkg.freebsd.org.2013102301 -FILESDIR= /usr/share/keys/pkg/trusted +FILESDIR= ${SHAREDIR}/keys/pkg/trusted FILESMODE= 644 .include Index: head/share/mklocale/Makefile =================================================================== --- head/share/mklocale/Makefile (revision 290082) +++ head/share/mklocale/Makefile (revision 290083) @@ -1,102 +1,102 @@ # $FreeBSD$ LOCALES= UTF-8 \ am_ET.UTF-8 \ be_BY.CP1131 \ bg_BG.CP1251 \ el_GR.ISO8859-7 \ hi_IN.ISCII-DEV \ hy_AM.ARMSCII-8 \ ja_JP.SJIS \ ja_JP.eucJP \ kk_KZ.PT154 \ ko_KR.CP949 \ ko_KR.eucKR \ la_LN.ISO8859-1 \ la_LN.ISO8859-13 \ la_LN.ISO8859-15 \ la_LN.ISO8859-2 \ la_LN.ISO8859-4 \ la_LN.US-ASCII \ ru_RU.CP866 \ ru_RU.ISO8859-5 \ ru_RU.KOI8-R \ tr_TR.ISO8859-9 \ uk_UA.KOI8-U \ zh_CN.eucCN \ zh_CN.GB18030 \ zh_CN.GB2312 \ zh_CN.GBK \ zh_HK.Big5HKSCS \ zh_TW.Big5 -LOCALEDIR= /usr/share/locale +LOCALEDIR= ${SHAREDIR}/locale .SUFFIXES: .src .out .src.out: mklocale -o ${.TARGET} ${.IMPSRC} FILES= ${LOCALES:S/$/.out/} FILESNAME= LC_CTYPE .for locale in ${LOCALES} FILESDIR_${locale}.out= ${LOCALEDIR}/${locale} .endfor CLEANFILES= ${FILES} ENCODINGS= CP1251 ISO8859-1 ISO8859-2 ISO8859-4 ISO8859-5 \ ISO8859-13 ISO8859-15 US-ASCII UTF-8 ASCIILINKS= en_AU en_CA en_GB en_NZ en_US US-ASCII_US-ASCII= ${ASCIILINKS:C/^/la_LN:/} LATIN1XLINKS= af_ZA ca_AD ca_ES ca_FR ca_IT da_DK de_AT de_CH de_DE \ en_AU en_CA en_GB en_NZ en_US es_ES eu_ES \ fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH \ it_IT nb_NO nl_BE nl_NL nn_NO no_NO pt_PT sv_SE LATIN1LINKS= ${LATIN1XLINKS} pt_BR ISO8859-1_ISO8859-1= ${LATIN1LINKS:C/^/la_LN:/} LATIN15LINKS= ${LATIN1XLINKS} et_EE ISO8859-15_ISO8859-15= ${LATIN15LINKS:C/^/la_LN:/} LATIN2LINKS= cs_CZ hr_HR hu_HU pl_PL sl_SI sr_YU ro_RO sk_SK ISO8859-2_ISO8859-2= ${LATIN2LINKS:C/^/la_LN:/} LATIN4LINKS= lt_LT ISO8859-4_ISO8859-4= ${LATIN4LINKS:C/^/la_LN:/} LATIN5LINKS= sr_YU uk_UA be_BY ISO8859-5_ISO8859-5= ${LATIN5LINKS:C/^/ru_RU:/} LATIN13LINKS= lt_LT lv_LV ISO8859-13_ISO8859-13= ${LATIN13LINKS:C/^/la_LN:/} CP1251LINKS= ru_RU be_BY uk_UA CP1251_CP1251= ${CP1251LINKS:C/^/bg_BG:/} UTF8LINKS= af_ZA be_BY bg_BG ca_AD ca_ES ca_FR ca_IT cs_CZ \ da_DK de_AT de_CH de_DE el_GR \ en_AU en_CA en_GB en_IE en_NZ en_US es_ES et_EE eu_ES fi_FI \ fr_BE \ fr_CA fr_CH fr_FR he_IL hr_HR hu_HU hy_AM is_IS it_CH it_IT \ ja_JP kk_KZ ko_KR lt_LT lv_LV mn_MN \ nb_NO nl_BE nl_NL nn_NO no_NO pl_PL pt_BR pt_PT \ ro_RO ru_RU sk_SK sl_SI sr_YU sv_SE tr_TR uk_UA zh_CN zh_HK \ zh_TW UTF-8_UTF-8= ${UTF8LINKS:C/^/:/} SYMLINKS= .for enc1 in ${ENCODINGS} .for enc2 in ${ENCODINGS} .for lang_terr in ${${enc1}_${enc2}} SYMLINKS+= ../${lang_terr:C/:.*$//:C/.+$/&./}${enc1}/${FILESNAME} \ ${LOCALEDIR}/${lang_terr:C/^.*://}.${enc2}/${FILESNAME} .endfor .endfor .endfor .include Index: head/share/monetdef/Makefile =================================================================== --- head/share/monetdef/Makefile (revision 290082) +++ head/share/monetdef/Makefile (revision 290083) @@ -1,146 +1,146 @@ # $FreeBSD$ LOCALES= af_ZA.ISO8859-1 \ am_ET.UTF-8 \ be_BY.CP1131 \ be_BY.CP1251 \ be_BY.ISO8859-5 \ be_BY.UTF-8 \ bg_BG.CP1251 \ bg_BG.UTF-8 \ ca_ES.ISO8859-1 \ ca_ES.UTF-8 \ cs_CZ.ISO8859-2 \ cs_CZ.UTF-8 \ da_DK.ISO8859-1 \ de_AT.ISO8859-1 \ de_AT.UTF-8 \ de_CH.ISO8859-1 \ de_DE.ISO8859-1 \ de_DE.UTF-8 \ el_GR.ISO8859-7 \ el_GR.UTF-8 \ en_AU.ISO8859-1 \ en_CA.ISO8859-1 \ en_GB.ISO8859-1 \ en_GB.UTF-8 \ en_IE.UTF-8 \ en_NZ.ISO8859-1 \ en_US.ISO8859-1 \ es_ES.ISO8859-1 \ es_ES.UTF-8 \ et_EE.ISO8859-15 \ fi_FI.ISO8859-1 \ fi_FI.UTF-8 \ fr_BE.ISO8859-1 \ fr_BE.UTF-8 \ fr_CA.ISO8859-1 \ fr_FR.ISO8859-1 \ fr_FR.UTF-8 \ he_IL.UTF-8 \ hi_IN.ISCII-DEV \ hr_HR.ISO8859-2 \ hu_HU.ISO8859-2 \ hy_AM.ARMSCII-8 \ hy_AM.UTF-8 \ is_IS.ISO8859-1 \ it_IT.ISO8859-1 \ it_IT.UTF-8 \ ja_JP.eucJP \ ja_JP.UTF-8 \ kk_KZ.PT154 \ kk_KZ.UTF-8 \ ko_KR.eucKR \ ko_KR.UTF-8 \ lt_LT.ISO8859-13 \ lv_LV.ISO8859-13 \ mn_MN.UTF-8 \ nl_BE.ISO8859-1 \ nl_BE.UTF-8 \ nl_NL.ISO8859-1 \ nl_NL.UTF-8 \ no_NO.ISO8859-1 \ pl_PL.ISO8859-2 \ pl_PL.UTF-8 \ pt_BR.ISO8859-1 \ pt_PT.ISO8859-1 \ pt_PT.ISO8859-15 \ pt_PT.UTF-8 \ ro_RO.ISO8859-2 \ ru_RU.CP1251 \ ru_RU.CP866 \ ru_RU.ISO8859-5 \ ru_RU.KOI8-R \ ru_RU.UTF-8 \ sk_SK.ISO8859-2 \ sl_SI.ISO8859-2 \ sr_YU.ISO8859-2 \ sr_YU.ISO8859-5 \ sr_YU.UTF-8 \ sv_SE.ISO8859-1 \ tr_TR.ISO8859-9 \ uk_UA.CP1251 \ uk_UA.ISO8859-5 \ uk_UA.KOI8-U \ uk_UA.UTF-8 \ zh_CN.eucCN \ zh_CN.GB18030 \ zh_CN.GB2312 \ zh_CN.UTF-8 \ zh_HK.UTF-8 \ zh_TW.Big5 -LOCALEDIR= /usr/share/locale +LOCALEDIR= ${SHAREDIR}/locale .SUFFIXES: .src .out .src.out: grep -v '^#' < ${.IMPSRC} > ${.TARGET} FILES= ${LOCALES:S/$/.out/} FILESNAME= LC_MONETARY .for lang in ${LOCALES} FILESDIR_${lang}.out= ${LOCALEDIR}/${lang} .endfor CLEANFILES= ${FILES} ENCODINGS= Big5 Big5HKSCS CP949 eucJP eucKR GB2312 GBK \ ISO8859-1 ISO8859-2 ISO8859-4 ISO8859-7 ISO8859-9 \ ISO8859-13 ISO8859-15 SJIS US-ASCII UTF-8 Big5_UTF-8= zh_TW eucJP_SJIS= ja_JP eucKR_CP949= ko_KR GB2312_GBK= zh_CN ISO8859-1_ISO8859-1= ca_ES:ca_AD ca_ES:ca_FR ca_ES:ca_IT es_ES:eu_ES \ de_CH:fr_CH de_CH:it_CH no_NO:nb_NO no_NO:nn_NO ISO8859-1_ISO8859-15= af_ZA ca_AD ca_ES ca_FR ca_IT da_DK de_AT de_CH de_DE \ en_AU en_CA en_GB en_NZ en_US es_ES \ fi_FI fr_BE fr_CA fr_CH fr_FR \ is_IS it_IT it_CH nl_BE nl_NL nb_NO nn_NO no_NO sv_SE ISO8859-1_US-ASCII= en_AU en_CA en_GB en_NZ en_US ISO8859-1_UTF-8= af_ZA da_DK de_CH en_AU en_CA en_NZ en_US \ fr_CA is_IS nb_NO nn_NO no_NO pt_BR sv_SE ISO8859-2_UTF-8= hr_HR hu_HU ro_RO sk_SK sl_SI ISO8859-9_UTF-8= tr_TR ISO8859-13_ISO8859-4= lt_LT ISO8859-13_UTF-8= lt_LT lv_LV ISO8859-15_ISO8859-15= es_ES:eu_ES ISO8859-15_UTF-8= et_EE UTF-8_Big5HKSCS= zh_HK UTF-8_UTF-8= ca_ES:ca_AD ca_ES:ca_FR ca_ES:ca_IT \ es_ES:eu_ES de_CH:fr_CH de_CH:it_CH SYMLINKS= .for enc1 in ${ENCODINGS} .for enc2 in ${ENCODINGS} .for lang_terr in ${${enc1}_${enc2}} SYMLINKS+= ../${lang_terr:C/:.*$//}.${enc1}/${FILESNAME} \ ${LOCALEDIR}/${lang_terr:C/^.*://}.${enc2}/${FILESNAME} .endfor .endfor .endfor .include Index: head/share/msgdef/Makefile =================================================================== --- head/share/msgdef/Makefile (revision 290082) +++ head/share/msgdef/Makefile (revision 290083) @@ -1,137 +1,137 @@ # $FreeBSD$ LOCALES= af_ZA.ISO8859-1 \ am_ET.UTF-8 \ be_BY.CP1131 \ be_BY.CP1251 \ be_BY.ISO8859-5 \ be_BY.UTF-8 \ bg_BG.CP1251 \ bg_BG.UTF-8 \ ca_ES.ISO8859-1 \ cs_CZ.ISO8859-2 \ da_DK.ISO8859-1 \ de_DE.ISO8859-1 \ el_GR.ISO8859-7 \ el_GR.UTF-8 \ en_CA.ISO8859-1 \ en_GB.ISO8859-1 \ en_US.ISO8859-1 \ es_ES.ISO8859-1 \ et_EE.ISO8859-15 \ eu_ES.ISO8859-1 \ fi_FI.ISO8859-1 \ fr_BE.ISO8859-1 \ fr_CH.ISO8859-1 \ fr_FR.ISO8859-1 \ he_IL.UTF-8 \ hi_IN.ISCII-DEV \ hr_HR.ISO8859-2 \ hu_HU.ISO8859-2 \ hy_AM.ARMSCII-8 \ hy_AM.UTF-8 \ is_IS.ISO8859-1 \ it_IT.ISO8859-1 \ ja_JP.eucJP \ ja_JP.SJIS \ ja_JP.UTF-8 \ kk_KZ.PT154 \ kk_KZ.UTF-8 \ ko_KR.UTF-8 \ ko_KR.eucKR \ lt_LT.ISO8859-13 \ lv_LV.ISO8859-13 \ lv_LV.UTF-8 \ mn_MN.UTF-8 \ nl_NL.ISO8859-1 \ no_NO.ISO8859-1 \ pl_PL.ISO8859-2 \ pt_PT.ISO8859-1 \ ro_RO.ISO8859-2 \ ru_RU.CP1251 \ ru_RU.CP866 \ ru_RU.ISO8859-5 \ ru_RU.KOI8-R \ ru_RU.UTF-8 \ sl_SI.ISO8859-2 \ sr_YU.ISO8859-2 \ sr_YU.ISO8859-5 \ sr_YU.UTF-8 \ sv_SE.ISO8859-1 \ tr_TR.ISO8859-9 \ uk_UA.CP1251 \ uk_UA.ISO8859-5 \ uk_UA.KOI8-U \ uk_UA.UTF-8 \ zh_CN.eucCN \ zh_CN.GB18030 \ zh_CN.GB2312 \ zh_CN.UTF-8 \ zh_TW.Big5 \ zh_TW.UTF-8 -LOCALEDIR= /usr/share/locale +LOCALEDIR= ${SHAREDIR}/locale .SUFFIXES: .src .out .src.out: grep -v '^#' < ${.IMPSRC} > ${.TARGET} FILES= ${LOCALES:S/$/.out/} FILESNAME= LC_MESSAGES .for locale in ${LOCALES} FILESDIR_${locale}.out= ${LOCALEDIR}/${locale} .endfor CLEANFILES= ${FILES} CA_LINKS= ca_ES:ca_AD ca_ES:ca_FR ca_ES:ca_IT CZ_LINKS= cs_CZ:sk_SK DE_LINKS= de_DE:de_AT de_DE:de_CH FR_LINKS= fr_FR:fr_CA GB_LINKS= en_GB:en_AU en_GB:en_NZ IT_LINKS= it_IT:it_CH NL_LINKS= nl_NL:nl_BE NO_LINKS= no_NO:nb_NO no_NO:nn_NO PT_LINKS= pt_PT:pt_BR ENCODINGS= Big5 Big5HKSCS CP949 eucKR GB2312 GBK \ ISO8859-1 ISO8859-2 ISO8859-4 ISO8859-9 ISO8859-13 ISO8859-15 \ US-ASCII UTF-8 Big5_Big5HKSCS= zh_TW:zh_HK eucKR_CP949= ko_KR GB2312_GBK= zh_CN ISO8859-1_ISO8859-1= ${CA_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} \ ${IT_LINKS} ${NL_LINKS} ${NO_LINKS} ${PT_LINKS} ISO8859-1_ISO8859-15= af_ZA ca_ES da_DK de_DE en_CA en_GB en_US es_ES \ eu_ES fi_FI fr_BE fr_CH fr_FR is_IS it_IT nl_NL no_NO \ pt_PT sv_SE \ ${CA_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} ${IT_LINKS} \ ${NL_LINKS} ${NO_LINKS} ISO8859-1_US-ASCII= ${GB_LINKS} en_CA en_GB en_US ISO8859-1_UTF-8= af_ZA ca_ES da_DK de_DE en_CA en_GB en_US es_ES eu_ES \ fi_FI fr_BE fr_CH fr_FR is_IS it_IT nl_NL no_NO \ pt_PT sv_SE ISO8859-2_ISO8859-2= ${CZ_LINKS} ISO8859-2_UTF-8= cs_CZ hr_HR hu_HU pl_PL ro_RO sl_SI ISO8859-9_UTF-8= tr_TR ISO8859-13_ISO8859-4= lt_LT ISO8859-13_UTF-8= lt_LT ISO8859-15_UTF-8= et_EE UTF-8_UTF-8= ${CA_LINKS} ${CZ_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} \ en_GB:en_IE \ ${IT_LINKS} ${NL_LINKS} ${NO_LINKS} ${PT_LINKS} zh_TW:zh_HK SYMLINKS= .for enc1 in ${ENCODINGS} .for enc2 in ${ENCODINGS} .for lang_terr in ${${enc1}_${enc2}} SYMLINKS+= ../${lang_terr:C/:.*$//}.${enc1}/${FILESNAME} \ ${LOCALEDIR}/${lang_terr:C/^.*://}.${enc2}/${FILESNAME} .endfor .endfor .endfor .include Index: head/share/numericdef/Makefile =================================================================== --- head/share/numericdef/Makefile (revision 290082) +++ head/share/numericdef/Makefile (revision 290083) @@ -1,132 +1,132 @@ # $FreeBSD$ LOCALES= af_ZA.ISO8859-1 \ am_ET.UTF-8 \ be_BY.CP1251 \ bg_BG.CP1251 \ ca_ES.ISO8859-1 \ cs_CZ.ISO8859-2 \ da_DK.ISO8859-1 \ de_CH.ISO8859-1 \ de_DE.ISO8859-1 \ el_GR.ISO8859-7 \ en_US.ISO8859-1 \ es_ES.ISO8859-1 \ et_EE.ISO8859-15 \ eu_ES.ISO8859-1 \ fi_FI.ISO8859-1 \ fr_BE.ISO8859-1 \ fr_FR.ISO8859-1 \ hi_IN.ISCII-DEV \ hr_HR.ISO8859-2 \ hu_HU.ISO8859-2 \ hy_AM.ARMSCII-8 \ is_IS.ISO8859-1 \ it_IT.ISO8859-1 \ ja_JP.eucJP \ kk_KZ.PT154 \ ko_KR.eucKR \ lt_LT.ISO8859-13 \ mn_MN.UTF-8 \ nl_NL.ISO8859-1 \ no_NO.ISO8859-1 \ pl_PL.ISO8859-2 \ pt_BR.ISO8859-1 \ pt_PT.ISO8859-1 \ ro_RO.ISO8859-2 \ ru_RU.KOI8-R \ sk_SK.ISO8859-2 \ sl_SI.ISO8859-2 \ sr_YU.ISO8859-2 \ sr_YU.ISO8859-5 \ sv_SE.ISO8859-1 \ tr_TR.ISO8859-9 \ uk_UA.KOI8-U \ zh_CN.eucCN -LOCALEDIR= /usr/share/locale +LOCALEDIR= ${SHAREDIR}/locale .SUFFIXES: .src .out .src.out: grep -v '^#' < ${.IMPSRC} > ${.TARGET} FILES= ${LOCALES:S/$/.out/} FILESNAME= LC_NUMERIC .for locale in ${LOCALES} FILESDIR_${locale}.out= ${LOCALEDIR}/${locale} .endfor CLEANFILES= ${FILES} ENCODINGS= ARMSCII-8 Big5 Big5HKSCS \ CP1131 CP1251 CP866 CP949 \ eucCN eucJP eucKR GB18030 GB2312 GBK \ ISO8859-1 ISO8859-2 ISO8859-4 ISO8859-5 ISO8859-7 ISO8859-9 \ ISO8859-13 ISO8859-15 \ KOI8-R KOI8-U PT154 SJIS US-ASCII UTF-8 BE_LINKS= fr_BE:nl_BE CA_LINKS= ca_ES:ca_AD ca_ES:ca_FR ca_ES:ca_IT DE_LINKS= de_DE:de_AT FR_LINKS= fr_FR:fr_CA fr_FR:fr_CH GB_LINKS= en_GB:en_AU en_GB:en_NZ IT_LINKS= it_IT:it_CH NO_LINKS= no_NO:nb_NO no_NO:nn_NO US_LINKS= en_US:en_CA en_US:en_GB ARMSCII-8_UTF-8= hy_AM Big5_UTF-8= zh_TW:zh_HK zh_TW CP1251_CP1131= be_BY CP1251_ISO8859-5= be_BY CP1251_UTF-8= be_BY bg_BG CP866_UTF-8= ru_RU eucCN_Big5= zh_CN:zh_TW eucCN_Big5HKSCS= zh_CN:zh_HK eucCN_GB18030= zh_CN eucCN_GB2312= zh_CN eucCN_GBK= zh_CN eucCN_UTF-8= zh_CN eucJP_SJIS= ja_JP eucJP_UTF-8= ja_JP eucKR_CP949= ko_KR eucKR_UTF-8= ko_KR ISO8859-1_ISO8859-15= af_ZA ca_ES da_DK de_CH de_DE en_US es_ES eu_ES \ fi_FI fr_BE fr_FR is_IS it_IT nl_NL no_NO pt_PT sv_SE \ ${BE_LINKS} ${CA_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} \ ${IT_LINKS} ${NO_LINKS} ${US_LINKS} ISO8859-1_ISO8859-1= ${BE_LINKS} ${CA_LINKS} ${DE_LINKS} ${FR_LINKS} \ ${GB_LINKS} ${IT_LINKS} ${NO_LINKS} ${US_LINKS} ISO8859-1_US-ASCII= en_US ${GB_LINKS} ${US_LINKS} ISO8859-1_UTF-8= af_ZA ca_ES da_DK de_CH de_DE en_US es_ES eu_ES fi_FI \ fr_BE fr_FR is_IS it_IT nl_NL no_NO pt_BR pt_PT sv_SE ISO8859-2_UTF-8= cs_CZ hr_HR hu_HU pl_PL ro_RO sk_SK sl_SI ISO8859-5_UTF-8= sr_YU uk_UA ISO8859-5_CP1251= uk_UA ISO8859-7_UTF-8= el_GR ISO8859-9_UTF-8= tr_TR ISO8859-13_ISO8859-4= lt_LT ISO8859-13_ISO8859-13= lt_LT:lv_LV ISO8859-13_UTF-8= lt_LT lt_LT:lv_LV ISO8859-15_UTF-8= et_EE KOI8-R_CP1251= ru_RU KOI8-R_CP866= ru_RU KOI8-R_ISO8859-5= ru_RU KOI8-U_ISO8859-5= uk_UA PT154_UTF-8= kk_KZ US-ASCII_UTF-8= en_US:he_IL UTF-8_UTF-8= ${BE_LINKS} ${CA_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} \ en_GB:en_IE ${IT_LINKS} ${NO_LINKS} ${US_LINKS} SYMLINKS= .for enc1 in ${ENCODINGS} .for enc2 in ${ENCODINGS} .for lang_terr in ${${enc1}_${enc2}} SYMLINKS+= ../${lang_terr:C/:.*$//}.${enc1}/${FILESNAME} \ ${LOCALEDIR}/${lang_terr:C/^.*://}.${enc2}/${FILESNAME} .endfor .endfor .endfor .include Index: head/share/sendmail/Makefile =================================================================== --- head/share/sendmail/Makefile (revision 290082) +++ head/share/sendmail/Makefile (revision 290083) @@ -1,32 +1,32 @@ # $FreeBSD$ # # Doing a make install builds /usr/share/sendmail/ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail CFDIR= cf CFDIRS!= (cd ${SENDMAIL_DIR}; find -L ${CFDIR} \( \( -name CVS -o -name .svn \) -prune \) -o -type d -print) CFFILES!= (cd ${SENDMAIL_DIR}; find -L ${CFDIR} \( \( -name CVS -o -name .svn \) -prune \) -o -type f -print) -DDIR= ${DESTDIR}/usr/share/sendmail +DDIR= ${DESTDIR}${SHAREDIR}/sendmail # Define SHARED to indicate whether you want symbolic links to the system # source (``symlinks''), or a separate copy (``copies'') SHARED?= copies all clean cleandir depend lint tags: beforeinstall: ${SHARED} copies:: if [ -L ${DDIR}/${CFDIR} ]; then rm -f ${DDIR}/${CFDIR}; fi .for dir in ${CFDIRS} ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 755 -d ${DDIR}/${dir} .endfor .for file in ${CFFILES} ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 ${SENDMAIL_DIR}/${file} ${DDIR}/${file} .endfor symlinks:: rm -rf ${DDIR}/${CFDIR}; ln -s ${SENDMAIL_DIR}/${CFDIR} ${DDIR}/${CFDIR} .include Index: head/share/skel/Makefile =================================================================== --- head/share/skel/Makefile (revision 290082) +++ head/share/skel/Makefile (revision 290083) @@ -1,13 +1,13 @@ # @(#)Makefile 8.1 (Berkeley) 6/8/93 # $FreeBSD$ FILESGROUPS= FILES1 FILES2 FILES1= dot.cshrc dot.login dot.login_conf dot.mailrc dot.profile \ dot.shrc FILES2= dot.mail_aliases dot.rhosts -FILES1DIR= /usr/share/skel -FILES2DIR= /usr/share/skel +FILES1DIR= ${SHAREDIR}/skel +FILES2DIR= ${SHAREDIR}/skel FILES1MODE= 0644 FILES2MODE= 0600 .include Index: head/share/timedef/Makefile =================================================================== --- head/share/timedef/Makefile (revision 290082) +++ head/share/timedef/Makefile (revision 290083) @@ -1,156 +1,156 @@ # $FreeBSD$ LOCALES= am_ET.UTF-8 \ be_BY.CP1131 \ be_BY.CP1251 \ be_BY.ISO8859-5 \ be_BY.UTF-8 \ bg_BG.CP1251 \ bg_BG.UTF-8 \ ca_ES.ISO8859-1 \ ca_ES.UTF-8 \ cs_CZ.ISO8859-2 \ cs_CZ.UTF-8 \ da_DK.ISO8859-1 \ da_DK.UTF-8 \ de_AT.ISO8859-1 \ de_AT.UTF-8 \ de_DE.ISO8859-1 \ de_DE.UTF-8 \ el_GR.ISO8859-7 \ el_GR.UTF-8 \ en_GB.ISO8859-1 \ en_US.ISO8859-1 \ es_ES.ISO8859-1 \ es_ES.UTF-8 \ et_EE.ISO8859-15 \ et_EE.UTF-8 \ eu_ES.ISO8859-1 \ fi_FI.ISO8859-1 \ fi_FI.UTF-8 \ fr_FR.ISO8859-1 \ fr_FR.UTF-8 \ he_IL.UTF-8 \ hi_IN.ISCII-DEV \ hr_HR.ISO8859-2 \ hr_HR.UTF-8 \ hu_HU.ISO8859-2 \ hu_HU.UTF-8 \ hy_AM.ARMSCII-8 \ hy_AM.UTF-8 \ is_IS.ISO8859-1 \ is_IS.UTF-8 \ ja_JP.eucJP \ ja_JP.SJIS \ ja_JP.UTF-8 \ it_IT.ISO8859-1 \ it_IT.UTF-8 \ kk_KZ.PT154 \ kk_KZ.UTF-8 \ ko_KR.eucKR \ ko_KR.UTF-8 \ la_LN.ISO8859-1 \ lt_LT.ISO8859-4 \ lt_LT.ISO8859-13 \ lt_LT.UTF-8 \ lv_LV.ISO8859-13 \ lv_LV.UTF-8 \ mn_MN.UTF-8 \ nb_NO.ISO8859-1 \ nb_NO.UTF-8 \ nl_NL.ISO8859-1 \ nn_NO.ISO8859-1 \ nn_NO.UTF-8 \ pl_PL.ISO8859-2 \ pl_PL.UTF-8 \ pt_BR.ISO8859-1 \ pt_BR.UTF-8 \ pt_PT.ISO8859-1 \ pt_PT.UTF-8 \ ro_RO.ISO8859-2 \ ro_RO.UTF-8 \ ru_RU.CP1251 \ ru_RU.CP866 \ ru_RU.ISO8859-5 \ ru_RU.KOI8-R \ ru_RU.UTF-8 \ sk_SK.ISO8859-2 \ sk_SK.UTF-8 \ sl_SI.ISO8859-2 \ sl_SI.UTF-8 \ sr_YU.ISO8859-2 \ sr_YU.ISO8859-5 \ sr_YU.UTF-8 \ sv_SE.ISO8859-1 \ sv_SE.UTF-8 \ tr_TR.ISO8859-9 \ tr_TR.UTF-8 \ uk_UA.CP1251 \ uk_UA.ISO8859-5 \ uk_UA.KOI8-U \ uk_UA.UTF-8 \ zh_CN.eucCN \ zh_CN.GB18030 \ zh_CN.GB2312 \ zh_CN.UTF-8 \ zh_TW.Big5 \ zh_TW.UTF-8 -LOCALEDIR= /usr/share/locale +LOCALEDIR= ${SHAREDIR}/locale .SUFFIXES: .src .out .src.out: grep -v '^#' < ${.IMPSRC} > ${.TARGET} FILES= ${LOCALES:S/$/.out/} FILESNAME= LC_TIME .for locale in ${LOCALES} FILESDIR_${locale}.out= ${LOCALEDIR}/${locale} .endfor CLEANFILES= ${FILES} ENCODINGS= Big5HKSCS CP949 eucKR GB2312 GBK \ ISO8859-1 ISO8859-2 ISO8859-4 ISO8859-15 \ US-ASCII UTF-8 CA_LINKS= ca_ES:ca_AD ca_ES:ca_FR ca_ES:ca_IT DE_LINKS= de_DE:de_CH FR_LINKS= fr_FR:fr_BE fr_FR:fr_CA fr_FR:fr_CH IT_LINKS= it_IT:it_CH NL_LINKS= nl_NL:nl_BE NO_LINKS= nb_NO:no_NO GB_LINKS= en_GB:en_AU en_GB:en_CA en_GB:en_NZ eucKR_CP949= ko_KR GB2312_GBK= zh_CN ISO8859-1_ISO8859-1= ${CA_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} \ ${IT_LINKS} ${NL_LINKS} ${NO_LINKS} en_US:af_ZA ISO8859-1_ISO8859-15= ca_ES da_DK de_AT de_DE en_GB en_US es_ES eu_ES \ fi_FI fr_FR is_IS it_IT la_LN nb_NO nl_NL nn_NO no_NO pt_PT \ sv_SE \ ${CA_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} ${IT_LINKS} \ ${NL_LINKS} ISO8859-1_US-ASCII= ${GB_LINKS} en_GB en_US la_LN ISO8859-1_ISO8859-2= la_LN ISO8859-1_ISO8859-4= la_LN ISO8859-1_UTF-8= en_GB en_US eu_ES nl_NL ISO8859-15_ISO8859-15= en_US:af_ZA UTF-8_Big5HKSCS= zh_TW:zh_HK UTF-8_UTF-8= ${CA_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} ${IT_LINKS} \ ${NL_LINKS} ${NO_LINKS} \ en_GB:en_IE en_US:af_ZA zh_TW:zh_HK SYMLINKS= .for enc1 in ${ENCODINGS} .for enc2 in ${ENCODINGS} .for lang_terr in ${${enc1}_${enc2}} SYMLINKS+= ../${lang_terr:C/:.*$//}.${enc1}/${FILESNAME} \ ${LOCALEDIR}/${lang_terr:C/^.*://}.${enc2}/${FILESNAME} .endfor .endfor .endfor .include Index: head/usr.bin/vi/catalog/Makefile =================================================================== --- head/usr.bin/vi/catalog/Makefile (revision 290082) +++ head/usr.bin/vi/catalog/Makefile (revision 290083) @@ -1,161 +1,161 @@ # $Id: Makefile,v 9.0 2012/10/19 15:13:11 zy Exp $ # $FreeBSD$ .include V= ${.CURDIR}/../../../contrib/nvi CAT= dutch english french german polish ru_RU.KOI8-R spanish swedish \ uk_UA.KOI8-U zh_CN.GB2312 SCAN= ${V}/cl/*.c ${V}/common/*.c ${V}/ex/*.c ${V}/vi/*.c .PATH: ${V}/catalog all: dump build-tools: dump # Helper since iconv is non trivial to make a build tool utf8convert: .for c in dutch french german spanish swedish iconv -f ISO8859-1 -t UTF-8 $V/catalog/$c.base > $c.UTF-8.base .endfor iconv -f ISO8859-2 -t UTF-8 $V/catalog/polish.base > polish.UTF-8.base iconv -f GB2312 -t UTF-8 $V/catalog/zh_CN.GB2312.base > zh_CN.UTF-8.base iconv -f KOI8-R -t UTF-8 $V/catalog/ru_RU.KOI8-R.base > ru_RU.UTF-8.base iconv -f KOI8-U -t UTF-8 $V/catalog/uk_UA.KOI8-U.base > uk_UA.UTF-8.base .for c in dutch french german polish spanish swedish zh_CN ru_RU uk_UA CAT+= $c.UTF-8 .endfor .for c in ${CAT} ${c}: ${c}.base echo "... $c"; \ rm -f $c; \ env LANG=C sort -u ${.ALLSRC} | \ awk '{ \ if ($$1 == 1) { \ print "\nMESSAGE NUMBER 1 IS NOT LEGAL"; \ exit 1; \ } \ if (++nline > $$1) { \ print "DUPLICATE MESSAGE NUMBER " $$1; \ exit 1; \ } \ print $$0; \ }' | \ sed -e '1s/^/$$set 1~$$quote "~/; 1y/~/\n/' | \ gencat $c /dev/stdin; \ chmod 444 $c; \ if grep DUPLICATE $c > /dev/null; then \ grep DUPLICATE $@; \ fi; \ if grep 'NOT LEGAL' $c > /dev/null; then \ grep 'NOT LEGAL' $@; \ fi .endfor CHK= dutch.check english.check french.check german.check \ polish.check ru_RU.KOI8-R.check spanish.check swedish.check \ uk_UA.KOI8-U.check zh_CN.GB2312.check check: ${CHK} .for c in ${CAT} ${c}.check: ${c}.base @echo "... $c"; \ f=${.ALLSRC:S;.base$;;}; \ (echo "Unused message id's (this is okay):"; \ awk '{ \ while (++nline < $$1) \ printf "%03d\n", nline; \ }' < $$f.base; \ echo =========================; \ echo "MISSING ERROR MESSAGES (Please add!):"; \ awk '{print $$1}' < $$f.base | sort -u > __ck1; \ awk '{print $$1}' < english.base | sort -u > __ck2; \ comm -13 __ck1 __ck2; \ echo =========================; \ echo "Extra error messages (just delete them):"; \ comm -23 __ck1 __ck2; \ echo =========================; \ echo "MESSAGES WITH THE SAME MESSAGE ID's (FIX!):"; \ for j in \ `sed '/^$$/d' < $$f.base | LANG=C sort -u | \ awk '{print $$1}' | uniq -d`; do \ egrep $$j $$f.base; \ done; \ echo =========================; \ echo "Duplicate messages, both id and message (this is okay):"; \ sed '/^$$/d' < $$f.base | LANG=C sort | uniq -c | \ awk '$$1 != 1 { print $$0 }' | sort -n; \ echo =========================) > $c .endfor english.base: dump ${SCAN} #Makefile ./dump ${SCAN} |\ sed -e '/|/!d' \ -e 's/|/ "/' \ -e 's/^"//' |\ sort -nu > $@ dump: dump.c ${CC} -o ${.TARGET} ${.ALLSRC} CLEANFILES+= dump ${CAT} english.base *.check __ck1 __ck2 CATALOGS= ${CAT} NLLINKS= nl_NL ENLINKS= en_AU en_CA en_GB en_NZ en_US FRLINKS= fr_BE fr_CA fr_CH fr_FR DELINKS= de_AT de_CH de_DE ESLINKS= es_ES SVLINKS= sv_SE PLLINKS= pl_PL FILES= ${CATALOGS} -FILESDIR= /usr/share/vi/catalog +FILESDIR= ${SHAREDIR}/vi/catalog SYMLINKS= .for l in ${NLLINKS} SYMLINKS+= dutch ${FILESDIR}/$l.ISO8859-1 SYMLINKS+= dutch ${FILESDIR}/$l.ISO8859-15 SYMLINKS+= dutch.UTF-8 ${FILESDIR}/$l.UTF-8 .endfor .for l in ${ENLINKS} SYMLINKS+= english ${FILESDIR}/$l.ISO8859-1 SYMLINKS+= english ${FILESDIR}/$l.ISO8859-15 SYMLINKS+= english ${FILESDIR}/$l.US-ASCII SYMLINKS+= english ${FILESDIR}/$l.UTF-8 .endfor SYMLINKS+= english ${FILESDIR}/POSIX SYMLINKS+= english ${FILESDIR}/C .for l in ${FRLINKS} SYMLINKS+= french ${FILESDIR}/$l.ISO8859-1 SYMLINKS+= french ${FILESDIR}/$l.ISO8859-15 SYMLINKS+= french.UTF-8 ${FILESDIR}/$l.UTF-8 .endfor .for l in ${DELINKS} SYMLINKS+= german ${FILESDIR}/$l.ISO8859-1 SYMLINKS+= german ${FILESDIR}/$l.ISO8859-15 SYMLINKS+= german.UTF-8 ${FILESDIR}/$l.UTF-8 .endfor .for l in ${ESLINKS} SYMLINKS+= spanish ${FILESDIR}/$l.ISO8859-1 SYMLINKS+= spanish ${FILESDIR}/$l.ISO8859-15 SYMLINKS+= spanish.UTF-8 ${FILESDIR}/$l.UTF-8 .endfor .for l in ${SVLINKS} SYMLINKS+= swedish ${FILESDIR}/$l.ISO8859-1 SYMLINKS+= swedish ${FILESDIR}/$l.ISO8859-15 SYMLINKS+= swedish.UTF-8 ${FILESDIR}/$l.UTF-8 .endfor .for l in ${PLLINKS} SYMLINKS+= polish ${FILESDIR}/$l.ISO8859-2 SYMLINKS+= polish.UTF-8 ${FILESDIR}/$l.UTF-8 .endfor SYMLINKS+= zh_CN.GB2312 ${FILESDIR}/zh_CN.GB18030 SYMLINKS+= zh_CN.GB2312 ${FILESDIR}/zh_CN.GBK SYMLINKS+= zh_CN.GB2312 ${FILESDIR}/zh_CN.eucCN .include Index: head/usr.sbin/ndiscvt/Makefile =================================================================== --- head/usr.sbin/ndiscvt/Makefile (revision 290082) +++ head/usr.sbin/ndiscvt/Makefile (revision 290083) @@ -1,30 +1,30 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../sys/compat/ndis PROG= ndiscvt SRCS= ndiscvt.c SRCS+= subr_pe.c SRCS+= inf.c inf-token.l inf-parse.y y.tab.h MAN= ndiscvt.8 MAN+= ndisgen.8 WARNS?= 4 NO_WCAST_ALIGN= LIBADD= l YFLAGS+=-v CFLAGS+=-I. -I${.CURDIR} -I${.CURDIR}/../../sys CLEANFILES= y.output FILES= windrv_stub.c FILESNAME= windrv_stub.c -FILESDIR= /usr/share/misc +FILESDIR= ${SHAREDIR}/misc SCRIPTS= ndisgen.sh .include Index: head/usr.sbin/zic/zdump/Makefile =================================================================== --- head/usr.sbin/zic/zdump/Makefile (revision 290082) +++ head/usr.sbin/zic/zdump/Makefile (revision 290083) @@ -1,15 +1,15 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../../contrib/tzcode/zic PROG= zdump MAN= zdump.8 SRCS= zdump.c ialloc.c scheck.c CFLAGS+= -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone -DSTD_INSPIRED -DPCTS -CFLAGS+= -DHAVE_LONG_DOUBLE -DTZDIR=\"/usr/share/zoneinfo\" -Demkdir=mkdir +CFLAGS+= -DHAVE_LONG_DOUBLE -DTZDIR=\"${SHAREDIR}/zoneinfo\" -Demkdir=mkdir CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../../../contrib/tzcode/stdtime WARNS?= 2 .include Index: head/usr.sbin/zic/zic/Makefile =================================================================== --- head/usr.sbin/zic/zic/Makefile (revision 290082) +++ head/usr.sbin/zic/zic/Makefile (revision 290083) @@ -1,16 +1,16 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../../contrib/tzcode/zic PROG= zic MAN= zic.8 SRCS= zic.c ialloc.c scheck.c CFLAGS+= -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone -DSTD_INSPIRED -DPCTS -CFLAGS+= -DHAVE_LONG_DOUBLE -DTZDIR=\"/usr/share/zoneinfo\" -Demkdir=mkdir +CFLAGS+= -DHAVE_LONG_DOUBLE -DTZDIR=\"${SHAREDIR}/zoneinfo\" -Demkdir=mkdir CFLAGS+= -DHAVE_STRERROR -DHAVE_UNISTD_H CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../../../contrib/tzcode/stdtime WARNS?= 2 .include