From 2d417964d6861b8d0f8b746926ab9fe7de3be14a Mon Sep 17 00:00:00 2001 From: Michiel Broek Date: Sun, 12 Jan 2003 15:03:17 +0000 Subject: [PATCH] Fixed makefiles for FreeBSD 4.7 --- ChangeLog | 4 ++++ Makefile | 50 ++++++++++++++++++++++++------------------------- html/Makefile | 16 ++++++++-------- mbfido/Makefile | 2 +- 4 files changed, 38 insertions(+), 34 deletions(-) diff --git a/ChangeLog b/ChangeLog index c6df3966..03465adc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,10 @@ v0.37.00 26-Dec-2002. configuration. Debug logging for mail and news now have one setting, the M. Nodelist debug logging now uses the N character. + In some makefiles the chown user.group syntax changed to + user:group to follow the new POSIX syntax. Please let me know + if you are using an older distribution that complains about + this. This was needed for FreeBSD 4.7. libs: The nodelist lookup functions are now in a separate library. diff --git a/Makefile b/Makefile index 8302f7a2..ccc1e980 100644 --- a/Makefile +++ b/Makefile @@ -30,13 +30,13 @@ install: fi @if [ ! -d ${PREFIX}/bin ] ; then \ mkdir ${PREFIX}/bin ; \ - ${CHOWN} ${OWNER}.${GROUP} ${PREFIX}/bin ; \ + ${CHOWN} ${OWNER}:${GROUP} ${PREFIX}/bin ; \ fi @if [ ! -d ${PREFIX}/etc ] ; then \ mkdir ${PREFIX}/etc ; \ mkdir ${PREFIX}/etc/maptabs ; \ - ${CHOWN} ${OWNER}.${GROUP} ${PREFIX}/etc ; \ - ${CHOWN} ${OWNER}.${GROUP} ${PREFIX}/etc/maptabs ; \ + ${CHOWN} ${OWNER}:${GROUP} ${PREFIX}/etc ; \ + ${CHOWN} ${OWNER}:${GROUP} ${PREFIX}/etc/maptabs ; \ fi @chmod 0775 ${PREFIX}/etc @if [ -f ${PREFIX}/etc/lastcall.data ] ; then \ @@ -47,34 +47,34 @@ install: fi @if [ ! -d ${PREFIX}/doc ] ; then \ mkdir ${PREFIX}/doc ; \ - ${CHOWN} ${OWNER}.${GROUP} ${PREFIX}/doc ; \ + ${CHOWN} ${OWNER}:${GROUP} ${PREFIX}/doc ; \ fi @if [ ! -d ${PREFIX}/fdb ] ; then \ mkdir ${PREFIX}/fdb ; \ - ${CHOWN} ${OWNER}.${GROUP} ${PREFIX}/fdb ; \ + ${CHOWN} ${OWNER}:${GROUP} ${PREFIX}/fdb ; \ fi @chmod 0775 ${PREFIX}/fdb @if [ ! -d ${PREFIX}/log ] ; then \ mkdir ${PREFIX}/log ; \ - ${CHOWN} ${OWNER}.${GROUP} ${PREFIX}/log ; \ + ${CHOWN} ${OWNER}:${GROUP} ${PREFIX}/log ; \ fi @chmod 0775 ${PREFIX}/log @if [ ! -d ${PREFIX}/magic ] ; then \ mkdir ${PREFIX}/magic ; \ - ${CHOWN} ${OWNER}.${GROUP} ${PREFIX}/magic ; \ + ${CHOWN} ${OWNER}:${GROUP} ${PREFIX}/magic ; \ fi @if [ ! -d ${PREFIX}/sema ] ; then \ mkdir ${PREFIX}/sema ; \ - ${CHOWN} ${OWNER}.${GROUP} ${PREFIX}/sema ; \ + ${CHOWN} ${OWNER}:${GROUP} ${PREFIX}/sema ; \ fi @chmod 0777 ${PREFIX}/sema @if [ ! -d ${PREFIX}/var ] ; then \ mkdir ${PREFIX}/var ; \ - ${CHOWN} ${OWNER}.${GROUP} ${PREFIX}/var ; \ + ${CHOWN} ${OWNER}:${GROUP} ${PREFIX}/var ; \ fi @if [ ! -d ${PREFIX}/tmp ] ; then \ mkdir ${PREFIX}/tmp ; \ - ${CHOWN} ${OWNER}.${GROUP} ${PREFIX}/tmp ; \ + ${CHOWN} ${OWNER}:${GROUP} ${PREFIX}/tmp ; \ fi @chmod 0775 ${PREFIX}/tmp @if [ ! -d ${PREFIX}/dutch ] ; then \ @@ -82,55 +82,55 @@ install: mkdir ${PREFIX}/dutch/txtfiles ; \ mkdir ${PREFIX}/dutch/menus ; \ mkdir ${PREFIX}/dutch/macro ; \ - ${CHOWN} -R ${OWNER}.${GROUP} ${PREFIX}/dutch ; \ + ${CHOWN} -R ${OWNER}:${GROUP} ${PREFIX}/dutch ; \ fi @if [ ! -d ${PREFIX}/english ] ; then \ mkdir ${PREFIX}/english ; \ mkdir ${PREFIX}/english/txtfiles ; \ mkdir ${PREFIX}/english/menus ; \ mkdir ${PREFIX}/english/macro ; \ - ${CHOWN} -R ${OWNER}.${GROUP} ${PREFIX}/english ; \ + ${CHOWN} -R ${OWNER}:${GROUP} ${PREFIX}/english ; \ fi @if [ ! -d ${PREFIX}/italian ] ; then \ mkdir ${PREFIX}/italian ; \ mkdir ${PREFIX}/italian/txtfiles ; \ mkdir ${PREFIX}/italian/menus ; \ mkdir ${PREFIX}/italian/macro ; \ - ${CHOWN} -R ${OWNER}.${GROUP} ${PREFIX}/italian ; \ + ${CHOWN} -R ${OWNER}:${GROUP} ${PREFIX}/italian ; \ fi @if [ ! -d ${PREFIX}/spanish ] ; then \ mkdir ${PREFIX}/spanish ; \ mkdir ${PREFIX}/spanish/txtfiles ; \ mkdir ${PREFIX}/spanish/menus ; \ mkdir ${PREFIX}/spanish/macro ; \ - ${CHOWN} -R ${OWNER}.${GROUP} ${PREFIX}/spanish ; \ + ${CHOWN} -R ${OWNER}:${GROUP} ${PREFIX}/spanish ; \ fi @if [ ! -d ${PREFIX}/galego ] ; then \ mkdir ${PREFIX}/galego ; \ mkdir ${PREFIX}/galego/txtfiles ; \ mkdir ${PREFIX}/galego/menus ; \ mkdir ${PREFIX}/galego/macro ; \ - ${CHOWN} -R ${OWNER}.${GROUP} ${PREFIX}/galego ; \ + ${CHOWN} -R ${OWNER}:${GROUP} ${PREFIX}/galego ; \ fi @if [ ! -d ${PREFIX}/german ] ; then \ mkdir ${PREFIX}/german; \ mkdir ${PREFIX}/german/txtfiles ; \ mkdir ${PREFIX}/german/menus ; \ mkdir ${PREFIX}/german/macro ; \ - ${CHOWN} -R ${OWNER}.${GROUP} ${PREFIX}/german; \ + ${CHOWN} -R ${OWNER}:${GROUP} ${PREFIX}/german; \ fi @if [ ! -d ${PREFIX}/ftp ] ; then \ mkdir ${PREFIX}/ftp ; \ mkdir ${PREFIX}/ftp/pub ; \ mkdir ${PREFIX}/ftp/incoming ; \ mkdir ${PREFIX}/ftp/pub/local ; \ - ${CHOWN} `id -un`.`id -gn` ${PREFIX}/ftp ; \ + ${CHOWN} `id -un`:`id -gn` ${PREFIX}/ftp ; \ chmod 0755 ${PREFIX}/ftp ; \ - ${CHOWN} ${OWNER}.${GROUP} ${PREFIX}/ftp/pub ; \ + ${CHOWN} ${OWNER}:${GROUP} ${PREFIX}/ftp/pub ; \ chmod 0755 ${PREFIX}/ftp/pub ; \ - ${CHOWN} `id -un`.`id -gn` ${PREFIX}/ftp/incoming ; \ + ${CHOWN} `id -un`:`id -gn` ${PREFIX}/ftp/incoming ; \ chmod 0755 ${PREFIX}/ftp/incoming ; \ - ${CHOWN} ${OWNER}.${GROUP} ${PREFIX}/ftp/pub/local ; \ + ${CHOWN} ${OWNER}:${GROUP} ${PREFIX}/ftp/pub/local ; \ chmod 0755 ${PREFIX}/ftp/pub/local ; \ fi @if [ ! -d ${PREFIX}/var/bso ] ; then \ @@ -142,19 +142,19 @@ install: mkdir ${PREFIX}/var/badtic ; \ mkdir ${PREFIX}/var/ticqueue ; \ mkdir ${PREFIX}/var/mail ; \ - ${CHOWN} -R ${OWNER}.${GROUP} ${PREFIX}/var ; \ + ${CHOWN} -R ${OWNER}:${GROUP} ${PREFIX}/var ; \ chmod -R 0750 ${PREFIX}/var ; \ fi @if [ ! -d ${PREFIX}/var/boxes ]; then \ mkdir ${PREFIX}/var/boxes ; \ - ${CHOWN} ${OWNER}.${GROUP} ${PREFIX}/var/boxes ; \ + ${CHOWN} ${OWNER}:${GROUP} ${PREFIX}/var/boxes ; \ chmod 0750 ${PREFIX}/var/boxes ; \ fi @if [ ! -d ${PREFIX}/var/unknown ] ; then \ mkdir ${PREFIX}/var/unknown ; \ mkdir ${PREFIX}/var/inbound ; \ - ${CHOWN} ${OWNER}.${GROUP} ${PREFIX}/var/unknown ; \ - ${CHOWN} ${OWNER}.${GROUP} ${PREFIX}/var/inbound ; \ + ${CHOWN} ${OWNER}:${GROUP} ${PREFIX}/var/unknown ; \ + ${CHOWN} ${OWNER}:${GROUP} ${PREFIX}/var/inbound ; \ chmod 0750 ${PREFIX}/var/unknown ; \ chmod 0750 ${PREFIX}/var/inbound ; \ fi @@ -162,7 +162,7 @@ install: @chmod 0770 ${PREFIX}/var/mail @if [ ! -d ${PREFIX}/var/arealists ] ; then \ mkdir ${PREFIX}/var/arealists ; \ - ${CHOWN} ${OWNER}.${GROUP} ${PREFIX}/var/arealists ; \ + ${CHOWN} ${OWNER}:${GROUP} ${PREFIX}/var/arealists ; \ chmod 0750 ${PREFIX}/var/arealists ; \ fi @if [ -x ${BINDIR}/mbfbgen ]; then \ diff --git a/html/Makefile b/html/Makefile index 20c398b7..477d0ace 100644 --- a/html/Makefile +++ b/html/Makefile @@ -103,14 +103,14 @@ install: @mkdir -p ${PREFIX}/html/misc @mkdir -p ${PREFIX}/html/programs @mkdir -p ${PREFIX}/html/setup - @${CHOWN} ${OWNER}.${GROUP} ${PREFIX}/html - @${CHOWN} ${OWNER}.${GROUP} ${PREFIX}/html/ftsc - @${CHOWN} ${OWNER}.${GROUP} ${PREFIX}/html/images - @${CHOWN} ${OWNER}.${GROUP} ${PREFIX}/html/license - @${CHOWN} ${OWNER}.${GROUP} ${PREFIX}/html/menus - @${CHOWN} ${OWNER}.${GROUP} ${PREFIX}/html/misc - @${CHOWN} ${OWNER}.${GROUP} ${PREFIX}/html/programs - @${CHOWN} ${OWNER}.${GROUP} ${PREFIX}/html/setup + @${CHOWN} ${OWNER}:${GROUP} ${PREFIX}/html + @${CHOWN} ${OWNER}:${GROUP} ${PREFIX}/html/ftsc + @${CHOWN} ${OWNER}:${GROUP} ${PREFIX}/html/images + @${CHOWN} ${OWNER}:${GROUP} ${PREFIX}/html/license + @${CHOWN} ${OWNER}:${GROUP} ${PREFIX}/html/menus + @${CHOWN} ${OWNER}:${GROUP} ${PREFIX}/html/misc + @${CHOWN} ${OWNER}:${GROUP} ${PREFIX}/html/programs + @${CHOWN} ${OWNER}:${GROUP} ${PREFIX}/html/setup @${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0444 ${H_BASE} ${PREFIX}/html @${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0444 ${H_FTSC} ${PREFIX}/html/ftsc @${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0444 ${H_IMAGES} ${PREFIX}/html/images diff --git a/mbfido/Makefile b/mbfido/Makefile index 0376882e..f94c66e5 100644 --- a/mbfido/Makefile +++ b/mbfido/Makefile @@ -103,7 +103,7 @@ install: all ln -s ${BINDIR}/mbfido ${BINDIR}/mbmail rm -f ${BINDIR}/mbnews ln -s ${BINDIR}/mbfido ${BINDIR}/mbnews - (cp maptabs.tgz ${PREFIX}; cd ${PREFIX}; tar xfz maptabs.tgz; ${CHOWN} ${OWNER}.${GROUP} etc/maptabs/*; rm ${PREFIX}/maptabs.tgz) + (cp maptabs.tgz ${PREFIX}; cd ${PREFIX}; tar xfz maptabs.tgz; ${CHOWN} ${OWNER}:${GROUP} etc/maptabs/*; rm ${PREFIX}/maptabs.tgz) chmod 0775 ${PREFIX}/etc filelist: Makefile