diff options
author | Stefan Bethke <stb@FreeBSD.org> | 1998-09-09 01:31:06 +0000 |
---|---|---|
committer | Stefan Bethke <stb@FreeBSD.org> | 1998-09-09 01:31:06 +0000 |
commit | cd4a8fb9bcec6a622f1164f6b101917618b4db8e (patch) | |
tree | 0cc7b1bc71fe7db754db0ac777c331d6853f5405 /net/netatalk/files | |
parent | Fix MASTER_SITE. (diff) |
Minor additions and fix-ups:
- filenames of Custom Icons for folders ("Icon^M") are properly escaped
- Honors CFLAGS
- package can actually be installed elswhere (pkg_add -p)
- man pages are compressed and properly linked
Notes
Notes:
svn path=/head/; revision=13060
Diffstat (limited to 'net/netatalk/files')
-rw-r--r-- | net/netatalk/files/patch-aa | 65 | ||||
-rw-r--r-- | net/netatalk/files/patch-ab | 19 | ||||
-rw-r--r-- | net/netatalk/files/patch-ac | 99 | ||||
-rw-r--r-- | net/netatalk/files/patch-ah | 11 | ||||
-rw-r--r-- | net/netatalk/files/patch-ai | 8 | ||||
-rw-r--r-- | net/netatalk/files/patch-aj | 11 |
6 files changed, 116 insertions, 97 deletions
diff --git a/net/netatalk/files/patch-aa b/net/netatalk/files/patch-aa index 265e8f04a286..ae3c38bf154b 100644 --- a/net/netatalk/files/patch-aa +++ b/net/netatalk/files/patch-aa @@ -1,35 +1,30 @@ -*** ../netatalk-1.4b2/Makefile Wed Oct 9 20:14:20 1996 ---- ./Makefile Thu Jul 24 01:40:24 1997 -*************** -*** 1,15 **** - # Root of installation. Subdirectories will be ${DESTDIR}/etc, - # ${DESTDIR}/bin, and ${DESTDIR}/lib. -! DESTDIR=/usr/local/atalk - - # for system-level binaries -! SBINDIR=$(DESTDIR)/etc - # for user-level binaries - BINDIR=$(DESTDIR)/bin - # for program libraries (*.a) - LIBDIR=$(DESTDIR)/lib - # for machine-independent resources (pagecount.ps, etc.) -! RESDIR=$(DESTDIR)/etc - # for configuration files (AppleVolumes.system, etc.) - ETCDIR=$(DESTDIR)/etc - # for include files ---- 1,15 ---- - # Root of installation. Subdirectories will be ${DESTDIR}/etc, - # ${DESTDIR}/bin, and ${DESTDIR}/lib. -! DESTDIR=$(PREFIX) - - # for system-level binaries -! SBINDIR=$(DESTDIR)/libexec - # for user-level binaries - BINDIR=$(DESTDIR)/bin - # for program libraries (*.a) - LIBDIR=$(DESTDIR)/lib - # for machine-independent resources (pagecount.ps, etc.) -! RESDIR=$(DESTDIR)/share - # for configuration files (AppleVolumes.system, etc.) - ETCDIR=$(DESTDIR)/etc - # for include files +--- Makefile.old Wed Sep 9 02:42:06 1998 ++++ Makefile Wed Sep 9 02:42:37 1998 +@@ -1,15 +1,15 @@ + # Root of installation. Subdirectories will be ${DESTDIR}/etc, + # ${DESTDIR}/bin, and ${DESTDIR}/lib. +-DESTDIR=/usr/local/atalk ++DESTDIR=$(PREFIX) + + # for system-level binaries +-SBINDIR=$(DESTDIR)/etc ++SBINDIR=$(DESTDIR)/libexec + # for user-level binaries + BINDIR=$(DESTDIR)/bin + # for program libraries (*.a) + LIBDIR=$(DESTDIR)/lib + # for machine-independent resources (pagecount.ps, etc.) +-RESDIR=$(DESTDIR)/etc ++RESDIR=$(DESTDIR)/share + # for configuration files (AppleVolumes.system, etc.) + ETCDIR=$(DESTDIR)/etc + # for include files +@@ -54,7 +54,7 @@ + SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}"\ + ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \ + DESTDIR="${DESTDIR}" MANDIR="${MANDIR}" \ +- AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" $@ ++ AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" OPTOPTS="${CFLAGS}" $@ + + FRC: + diff --git a/net/netatalk/files/patch-ab b/net/netatalk/files/patch-ab index 433387c6cb5e..4c760c2adbbd 100644 --- a/net/netatalk/files/patch-ab +++ b/net/netatalk/files/patch-ab @@ -3,20 +3,27 @@ diff -crP ../netatalk-1.4b2/rc.atalk.freebsd ./rc.atalk.freebsd --- ./rc.atalk.freebsd Thu Jul 24 02:14:39 1997 *************** *** 0 **** ---- 1,19 ---- +--- 1,26 ---- + # + # AppleTalk daemons. Make sure not to start atalkd in the background: + # its data structures must have time to stablize before running the + # other processes. + # ++ PREFIX=/`expr $0 : '/\(.*\)/etc/rc.d/netatalk.sh'` ++ if [ "x${PREFIX}" = "x/" ]; then ++ printf "\nnetatalk: Cannot determine PREFIX.\n" >&2 ++ exit 64 ++ fi ++ HOSTNAME=`hostname|sed 's/\..*$//'` + + case $1 in + start) echo -n ' netatalk' -+ :SBINDIR:/atalkd -+ :BINDIR:/nbprgstr -p 4 `hostname|sed 's/\..*$//'`:Workstation -+ :BINDIR:/nbprgstr -p 4 `hostname|sed 's/\..*$//'`:netatalk -+ :SBINDIR:/papd -+ :SBINDIR:/afpd ++ ${PREFIX}/libexec/atalkd ++ ${PREFIX}/bin/nbprgstr -p 4 ${HOSTNAME}:Workstation & ++ ${PREFIX}/bin/nbprgstr -p 4 ${HOSTNAME}:netatalk & ++ ${PREFIX}/libexec/papd ++ ${PREFIX}/libexec/afpd -s ${PREFIX}/etc/AppleVolumes.system \ ++ -f ${PREFIX}/etc/AppleVolumes.default + ;; + stop) killall afpd + killall papd diff --git a/net/netatalk/files/patch-ac b/net/netatalk/files/patch-ac index 55fdc164df70..e6ec20e0ab56 100644 --- a/net/netatalk/files/patch-ac +++ b/net/netatalk/files/patch-ac @@ -1,56 +1,43 @@ -*** ../netatalk-1.4b2/sys/freebsd/Makefile Tue Oct 22 23:31:01 1996 ---- ./sys/freebsd/Makefile Thu Jul 24 02:32:58 1997 -*************** -*** 21,27 **** - FRC: - - install : -! -mkdir ${DESTDIR} ${SBINDIR} ${BINDIR} ${ETCDIR} ${LIBDIR} - for i in ${ALL}; \ - do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \ - ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \ ---- 21,28 ---- - FRC: - - install : -! -mkdir ${DESTDIR} ${SBINDIR} ${BINDIR} ${ETCDIR} ${LIBDIR} \ -! ${ETCDIR}/rc.d ${RESDIR}/examples/netatalk - for i in ${ALL}; \ - do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \ - ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \ -*************** -*** 30,46 **** - AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" \ - INSTALL="${INSTALL}" $@); \ - done -- rm -f ${ETCDIR}/rc.atalk - 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 -! @echo -! @echo "Install is done. Don't forget to add lines from" -! @echo "services.atalk to /etc/services and to call rc.atalk" -! @echo "in /etc/rc. See README and README.FREEBSD for more" -! @echo "information." - - clean : - for i in ${ALL}; \ ---- 31,46 ---- - AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" \ - INSTALL="${INSTALL}" $@); \ - done - 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.freebsd > ${ETCDIR}/rc.d/netatalk.sh -! chmod +x ${ETCDIR}/rc.d/netatalk.sh -! cp ../../config/AppleVolumes.default ${ETCDIR}/AppleVolumes.default.dist -! cp ../../config/AppleVolumes.system ${ETCDIR}/AppleVolumes.system.dist -! cp ../../config/atalkd.conf ../../config/papd.conf \ -! ${RESDIR}/examples/netatalk - - clean : - for i in ${ALL}; \ +--- sys/freebsd/Makefile.orig Tue Oct 22 23:31:01 1996 ++++ sys/freebsd/Makefile Wed Sep 9 02:09:02 1998 +@@ -1,6 +1,5 @@ + # FreeBSD specific defines, passed to subdirectories. + DEFS= -DBSD4_4 +-OPTOPTS= -O2 + CC= gcc + INSTALL= install + ADDLIBS= -lcrypt +@@ -21,7 +20,8 @@ + FRC: + + install : +- -mkdir ${DESTDIR} ${SBINDIR} ${BINDIR} ${ETCDIR} ${LIBDIR} ++ -mkdir ${DESTDIR} ${SBINDIR} ${BINDIR} ${ETCDIR} ${LIBDIR} \ ++ ${ETCDIR}/rc.d ${RESDIR}/examples/netatalk + for i in ${ALL}; \ + do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \ + ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \ +@@ -30,17 +30,16 @@ + AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" \ + INSTALL="${INSTALL}" $@); \ + done +- rm -f ${ETCDIR}/rc.atalk + 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 +- @echo +- @echo "Install is done. Don't forget to add lines from" +- @echo "services.atalk to /etc/services and to call rc.atalk" +- @echo "in /etc/rc. See README and README.FREEBSD for more" +- @echo "information." ++ < ../../rc.atalk.freebsd > ${ETCDIR}/rc.d/netatalk.sh ++ chmod +x ${ETCDIR}/rc.d/netatalk.sh ++ cp ../../config/AppleVolumes.default ${ETCDIR}/AppleVolumes.default.dist ++ cp ../../config/AppleVolumes.system ${ETCDIR}/AppleVolumes.system.dist ++ cp ../../config/atalkd.conf ../../config/papd.conf \ ++ ${RESDIR}/examples/netatalk + + clean : + for i in ${ALL}; \ diff --git a/net/netatalk/files/patch-ah b/net/netatalk/files/patch-ah new file mode 100644 index 000000000000..30164e7616fc --- /dev/null +++ b/net/netatalk/files/patch-ah @@ -0,0 +1,11 @@ +--- etc/afpd/desktop.c.orig Tue Aug 25 21:59:28 1998 ++++ etc/afpd/desktop.c Tue Aug 25 22:00:23 1998 +@@ -429,7 +429,7 @@ + m = mpath; + u = upath; + while ( *m != '\0' ) { +- if ( !isascii( *m ) || *m == '/' || ( i == 0 && *m == '.' )) { ++ if ( !isprint( (unsigned char)*m ) || *m == '/' || ( i == 0 && *m == '.' )) { + *u++ = ':'; + *u++ = hexdig[ ( *m & 0xf0 ) >> 4 ]; + *u++ = hexdig[ *m & 0x0f ]; diff --git a/net/netatalk/files/patch-ai b/net/netatalk/files/patch-ai new file mode 100644 index 000000000000..d0c82037f226 --- /dev/null +++ b/net/netatalk/files/patch-ai @@ -0,0 +1,8 @@ +--- Makefile.orig Tue Feb 20 17:38:02 1996 ++++ Makefile Mon Sep 7 22:23:04 1998 +@@ -1,4 +1,4 @@ +-TARGETS= atalk netatalk ++TARGETS= atalk + + INSTALL= install + diff --git a/net/netatalk/files/patch-aj b/net/netatalk/files/patch-aj new file mode 100644 index 000000000000..869cb02661a6 --- /dev/null +++ b/net/netatalk/files/patch-aj @@ -0,0 +1,11 @@ +--- man/man1/Makefile.orig Tue Feb 20 18:16:24 1996 ++++ man/man1/Makefile Tue Sep 8 23:40:31 1998 +@@ -1,6 +1,5 @@ +-SRC= aecho.1 getzones.1 nbp.1 nbplkup.1 nbprgstr.1 nbplkup.1 \ +- pap.1 papstatus.1 psorder.1 megatron.1 unhex.1 unbin.1 \ +- unsingle.1 macbinary.1 hqx2bin.1 single2bin.1 ++SRC= aecho.1 getzones.1 nbp.1 \ ++ pap.1 psorder.1 megatron.1 + + INCPATH= + CFLAGS= |