diff options
author | stb <stb@FreeBSD.org> | 1998-11-24 22:13:47 +0800 |
---|---|---|
committer | stb <stb@FreeBSD.org> | 1998-11-24 22:13:47 +0800 |
commit | f90e4b8e9ed8265df8165e565bacb6c95faf09b8 (patch) | |
tree | 386c86cf36951737502cea326a72771f1f06764d /net/netatalk-asun | |
parent | 122d92919bdb014b9965c9983abc8dda75bf226e (diff) | |
download | freebsd-ports-graphics-f90e4b8e9ed8265df8165e565bacb6c95faf09b8.tar.gz freebsd-ports-graphics-f90e4b8e9ed8265df8165e565bacb6c95faf09b8.tar.zst freebsd-ports-graphics-f90e4b8e9ed8265df8165e565bacb6c95faf09b8.zip |
- obey CFLAGS
- put pid files in /var/run
- make start-up script work on different PREFIX
Diffstat (limited to 'net/netatalk-asun')
-rw-r--r-- | net/netatalk-asun/files/patch-aa | 17 | ||||
-rw-r--r-- | net/netatalk-asun/files/patch-ab | 59 | ||||
-rw-r--r-- | net/netatalk-asun/files/patch-ac | 10 | ||||
-rw-r--r-- | net/netatalk-asun/files/patch-ah | 33 |
4 files changed, 87 insertions, 32 deletions
diff --git a/net/netatalk-asun/files/patch-aa b/net/netatalk-asun/files/patch-aa index f5dc3752ee7..f6ae3df16e4 100644 --- a/net/netatalk-asun/files/patch-aa +++ b/net/netatalk-asun/files/patch-aa @@ -1,7 +1,8 @@ ---- Makefile.orig Mon Oct 13 08:41:56 1997 -+++ Makefile Tue Sep 8 01:44:22 1998 +--- Makefile.orig Mon Sep 28 21:48:41 1998 ++++ Makefile Tue Nov 24 14:19:18 1998 @@ -1,15 +1,15 @@ - # Root of installation. Subdirectories will be ${DESTDIR}/etc, +-# Root of installation. Subdirectories will be ${DESTDIR}/etc, ++TARGETS= atalk # ${DESTDIR}/bin, and ${DESTDIR}/lib. -DESTDIR=/usr/local/atalk +DESTDIR=${PREFIX} @@ -39,3 +40,13 @@ # Location of the AFS and Kerberos libraries and include files. Uncomment +@@ -74,7 +74,8 @@ + ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \ + DESTDIR="${DESTDIR}" MANDIR="${MANDIR}" \ + TCPWRAPDIR="${TCPWRAPDIR}" PAMDIR="${PAMDIR}" \ +- AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" DESDIR="${DESDIR}" $@ ++ AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" DESDIR="${DESDIR}" \ ++ OPTOPTS="${CFLAGS}" $@ + + FRC: + diff --git a/net/netatalk-asun/files/patch-ab b/net/netatalk-asun/files/patch-ab index 1aab359d2dc..16d04640a79 100644 --- a/net/netatalk-asun/files/patch-ab +++ b/net/netatalk-asun/files/patch-ab @@ -1,28 +1,31 @@ -diff -crP ../netatalk-1.4b2/rc.atalk.freebsd ./rc.atalk.freebsd -*** ../netatalk-1.4b2/rc.atalk.freebsd Thu Jan 1 01:00:00 1970 ---- ./rc.atalk.freebsd Thu Jul 24 02:14:39 1997 -*************** -*** 0 **** ---- 1,22 ---- -+ # -+ # AppleTalk daemons. Make sure not to start atalkd in the background: -+ # its data structures must have time to stablize before running the -+ # other processes. -+ # -+ -+ 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 -+ ;; -+ stop) killall afpd -+ killall papd -+ killall atalkd -+ ;; -+ *) echo "usage: $0 {start|stop}" -+ exit 64 -+ ;; -+ esac +--- rc.atalk.freebsd.orig Tue Nov 24 13:08:44 1998 ++++ rc.atalk.freebsd Tue Nov 24 13:56:05 1998 +@@ -0,0 +1,28 @@ ++# ++# 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' ++ ${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) for i in afpd papd atalkd; do ++ if [ -f /var/run/$i.pid ]; then ++ kill `cat /var/run/$i.pid` ++ fi ++ done ++ ;; ++esac diff --git a/net/netatalk-asun/files/patch-ac b/net/netatalk-asun/files/patch-ac index 3a355b13718..0f9aaa05b38 100644 --- a/net/netatalk-asun/files/patch-ac +++ b/net/netatalk-asun/files/patch-ac @@ -1,5 +1,13 @@ --- sys/freebsd/Makefile.orig Fri Sep 18 05:19:27 1998 -+++ sys/freebsd/Makefile Tue Nov 24 01:22:24 1998 ++++ sys/freebsd/Makefile Tue Nov 24 14:12:32 1998 +@@ -1,6 +1,6 @@ + # FreeBSD specific defines, passed to subdirectories. + DEFS= -DBSD4_4 +-OPTOPTS= -O2 ++#OPTOPTS= -O2 + CC= gcc + INSTALL= install + AFPLIBS= -lcrypt -lrpcsvc @@ -23,7 +23,8 @@ FRC: diff --git a/net/netatalk-asun/files/patch-ah b/net/netatalk-asun/files/patch-ah new file mode 100644 index 00000000000..4dd5d0124cf --- /dev/null +++ b/net/netatalk-asun/files/patch-ah @@ -0,0 +1,33 @@ +--- include/atalk/paths.h.orig Fri Aug 15 07:25:58 1997 ++++ include/atalk/paths.h Tue Nov 24 13:14:14 1998 +@@ -17,7 +17,7 @@ + #ifdef linux + #define _PATH_LOCKDIR "/var/lock/" + #else +-#define _PATH_LOCKDIR "/var/spool/locks/" ++#define _PATH_LOCKDIR "/var/run/" + #endif /* linux */ + #endif /* BSD4_4 */ + #endif +@@ -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") + + /* + * psorder paths + */ + #define _PATH_TMPPAGEORDER "/tmp/psorderXXXXXX" +-#define _PATH_PAPDLOCK ATALKPATHCAT(_PATH_LOCKDIR,"papd") ++#define _PATH_PAPDLOCK ATALKPATHCAT(_PATH_LOCKDIR,"papd.pid") + + /* + * afpd paths + */ + #define _PATH_AFPTKT "/tmp/AFPtktXXXXXX" +-#define _PATH_AFPDLOCK ATALKPATHCAT(_PATH_LOCKDIR,"afpd") ++#define _PATH_AFPDLOCK ATALKPATHCAT(_PATH_LOCKDIR,"afpd.pid") + + #endif /* atalk/paths.h */ |