diff options
Diffstat (limited to 'net/netatalk-asun/patches/patch-bj')
| -rw-r--r-- | net/netatalk-asun/patches/patch-bj | 98 |
1 files changed, 67 insertions, 31 deletions
diff --git a/net/netatalk-asun/patches/patch-bj b/net/netatalk-asun/patches/patch-bj index c75383a7658..03cf87928f0 100644 --- a/net/netatalk-asun/patches/patch-bj +++ b/net/netatalk-asun/patches/patch-bj @@ -1,35 +1,71 @@ -$NetBSD: patch-bj,v 1.1 2001/04/13 19:18:13 jonb Exp $ +$NetBSD: patch-bj,v 1.2 2001/05/21 18:42:22 abs Exp $ ---- include/atalk/paths.h.orig Wed Apr 11 23:51:32 2001 -+++ include/atalk/paths.h Wed Apr 11 23:52:17 2001 -@@ -12,7 +12,7 @@ - /* lock file path. this should be re-organized a bit. */ - #ifndef _PATH_LOCKDIR - #ifdef BSD4_4 --#define _PATH_LOCKDIR "/var/spool/lock/" -+#define _PATH_LOCKDIR "/var/run/" - #else - #ifdef linux - #define _PATH_LOCKDIR "/var/lock/" -@@ -42,18 +42,18 @@ - */ - #define _PATH_ATALKDEBUG "/tmp/atalkd.debug" - #define _PATH_ATALKDTMP "atalkd.tmp" --#define _PATH_ATALKDLOCK ATALKPATHCAT(_PATH_LOCKDIR,"atalkd") -+#define _PATH_ATALKDLOCK ATALKPATHCAT(_PATH_LOCKDIR,"atalkd.pid") +--- sys/netbsd/Makefile.orig Thu Feb 4 07:30:30 1999 ++++ sys/netbsd/Makefile +@@ -1,10 +1,10 @@ + # NetBSD specific defines, passed to subdirectories. + DEFS= -DBSD4_4 +-OPTOPTS= -O2 +-CC= gcc -I../../sys/netbsd/ -I/usr/include/kerberosIV ++OPTOPTS= -Werror -I../../sys/netbsd/ ++#CC= gcc -I../../sys/netbsd/ -I/usr/include/kerberosIV + INSTALL= install + AFPLIBS = -lcrypt -lrpcsvc +-ADDLIBS = ++ADDLIBS= -Wl,-R${LIBDIR} - /* - * psorder paths - */ - #define _PATH_TMPPAGEORDER "/tmp/psorderXXXXXX" --#define _PATH_PAPDLOCK ATALKPATHCAT(_PATH_LOCKDIR,"papd") -+#define _PATH_PAPDLOCK ATALKPATHCAT(_PATH_LOCKDIR,"papd.pid") + ALL= ../../libatalk ../../include ../../bin ../../etc ../../man - /* - * afpd paths - */ - #define _PATH_AFPTKT "/tmp/AFPtktXXXXXX" --#define _PATH_AFPDLOCK ATALKPATHCAT(_PATH_LOCKDIR,"afpd") -+#define _PATH_AFPDLOCK ATALKPATHCAT(_PATH_LOCKDIR,"afpd.pid") +@@ -19,6 +19,7 @@ + ${ALL}: FRC + cd $@; ${MAKE} ${MFLAGS} CC="${CC}" \ + ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \ ++ LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \ + SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \ + ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \ + AFPLIBS="${AFPLIBS}" \ +@@ -28,30 +29,34 @@ - #endif /* atalk/paths.h */ + install : + -mkdir ${DESTDIR} ${SBINDIR} ${BINDIR} ${ETCDIR} ${LIBDIR} ++ -mkdir ${LIBEXECDIR} ${EXAMPLEDIR} ${RCDIR} + for i in ${ALL}; \ + do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \ + ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \ ++ LIBEXECDIR="${LIBEXECDIR}" EXAMPLEDIR="${EXAMPLEDIR}" \ + SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \ + ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \ + AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" AFPLIBS="${AFPLIBS}" \ + INSTALL="${INSTALL}" $@); \ + done +- rm -f ${ETCDIR}/rc.atalk ++ for i in `ls ../../config`; \ ++ do ${INSTALL} -c ../../config/$$i ${EXAMPLEDIR}; \ ++ done ++ rm -f ${RCDIR}/netatalk + sed -e s@:DESTDIR:@${DESTDIR}@ -e s@:SBINDIR:@${SBINDIR}@ \ + -e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \ + -e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \ + -e s@:INCDIR:@${INCDIR}@ \ +- < ../../rc.atalk.bsd > ${ETCDIR}/rc.atalk ++ -e s@:LIBEXECDIR:@${LIBEXECDIR}@ \ ++ -e s@:EXAMPLEDIR:@${EXAMPLEDIR}@ \ ++ < ../../rc.atalk.bsd > ${RCDIR}/netatalk ++ chmod 755 ${RCDIR}/netatalk ++ @echo "Install is done." + @echo +- @echo "Install is done. You might need to add services from" +- @echo "services.atalk to /etc/services. The ddp services need to be" +- @echo "added for NetBSD versions earlier than 1.3, and the AFP over" +- @echo "TCP services need to be added for NetBSD 1.3.X, and for" +- @echo "1.3-current dated June 27, 1998 and earlier." ++ @echo "Example configuration files are in ${EXAMPLEDIR}." + @echo +- @echo "Don't forget to call rc.atalk in /etc/rc.local. See README" +- @echo "and README.NETBSD for more information." +- ++ @echo "Don't forget to call ${RCDIR}/netatalk in /etc/rc.local." ++ @echo "See README.NETBSD for kernel configuration information." + clean : + for i in ${ALL}; \ + do (cd $$i; ${MAKE} ${MFLAGS} clean); \ |