diff options
Diffstat (limited to 'net/netatalk/files')
| -rw-r--r-- | net/netatalk/files/netatalk.sh | 72 | ||||
| -rw-r--r-- | net/netatalk/files/patch-config_Makefile.in | 15 | ||||
| -rw-r--r-- | net/netatalk/files/patch-configure | 39 | ||||
| -rw-r--r-- | net/netatalk/files/patch-etc_afpd_unix.h | 12 | ||||
| -rw-r--r-- | net/netatalk/files/patch-ltmain.sh | 34 |
5 files changed, 64 insertions, 108 deletions
diff --git a/net/netatalk/files/netatalk.sh b/net/netatalk/files/netatalk.sh index 90290112db48..5fc30913f21f 100644 --- a/net/netatalk/files/netatalk.sh +++ b/net/netatalk/files/netatalk.sh @@ -1,33 +1,53 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/net/netatalk/files/Attic/netatalk.sh,v 1.1 2001-05-18 20:00:29 dinoex Exp $ +# $FreeBSD: /tmp/pcvs/ports/net/netatalk/files/Attic/netatalk.sh,v 1.2 2004-10-12 02:09:27 marcus Exp $ +# +# PROVIDE: netatalk +# REQUIRE: DAEMON +# KEYWORD: FreeBSD # # AppleTalk daemons. Make sure not to start atalkd in the background: # its data structures must have time to stablize before running the # other processes. # -if ! test -x %%PREFIX%%/sbin/atalkd -then -# exit 0 -fi -HOSTNAME=`hostname|sed 's/\..*$//'` -case $1 in -start) - echo -n ' netatalk' - %%PREFIX%%/sbin/atalkd - %%PREFIX%%/bin/nbprgstr -p 4 ${HOSTNAME}:Workstation & - %%PREFIX%%/bin/nbprgstr -p 4 ${HOSTNAME}:netatalk & - %%PREFIX%%/sbin/papd - %%PREFIX%%/sbin/afpd -s %%PREFIX%%/etc/AppleVolumes.system \ - -f %%PREFIX%%/etc/AppleVolumes.default - ;; -stop) - killall afpd - killall papd - killall atalkd - ;; -*) - echo "Usage: $0: [ start | stop ]" 2>&1 - exit 65 - ;; -esac + +netatalk_enable=${netatalk_enable-"NO"} +atalkd_enable=${atalkd_enable-"NO"} +papd_enable=${papd_enable-"NO"} +cnid_metad_enable=${cnid_metad_enable-"NO"} +afpd_enable=${afpd_enable-"NO"} +timelord_enable=${timelord_enable-"NO"} + +. %%RC_SUBR%% + +name=netatalk +rcvar=`set_rcvar` +hostname=`hostname -s` + +start_cmd=netatalk_start +stop_cmd=netatalk_stop + +netatalk_start() { + checkyesno atalkd_enable && %%PREFIX%%/sbin/atalkd + checkyesno atalkd_enable && \ + %%PREFIX%%/bin/nbprgstr -p 4 ${hostname}:Workstation & + checkyesno atalkd_enable && \ + %%PREFIX%%/bin/nbprgstr -p 4 ${hostname}:netatalk & + checkyesno papd_enable && %%PREFIX%%/sbin/papd + checkyesno cnid_metad_enable && %%PREFIX%%/sbin/cnid_metad + checkyesno afpd_enable && \ + %%PREFIX%%/sbin/afpd -s %%PREFIX%%/etc/AppleVolumes.system \ + -f %%PREFIX%%/etc/AppleVolumes.default + checkyesno timelord_enable && %%PREFIX%%/sbin/timelord +} + +netatalk_stop() { + checkyesno timelord_enable && killall timelord + checkyesno afpd_enable && killall afpd + checkyesno cnid_metad_enable && killall cnid_metad + checkyesno papd_enable && killall papd + checkyesno atalkd_enable && killall atalkd +} + +load_rc_config ${name} +run_rc_command "$1" diff --git a/net/netatalk/files/patch-config_Makefile.in b/net/netatalk/files/patch-config_Makefile.in index 54f7d74bb764..eb71290a3725 100644 --- a/net/netatalk/files/patch-config_Makefile.in +++ b/net/netatalk/files/patch-config_Makefile.in @@ -1,6 +1,6 @@ ---- config/Makefile.in.orig Tue Dec 2 15:19:05 2003 -+++ config/Makefile.in Sun Dec 7 13:29:53 2003 -@@ -378,23 +378,11 @@ +--- config/Makefile.in.orig Mon Mar 22 19:22:45 2004 ++++ config/Makefile.in Sat Jun 5 22:08:04 2004 +@@ -386,22 +386,11 @@ install-config-files: $(CONFFILES) $(GENFILES) $(mkinstalldirs) $(DESTDIR)$(pkgconfdir) for f in $(CONFFILES) $(GENFILES); do \ @@ -17,12 +17,11 @@ @USE_PAM_TRUE@install-data-local: install-config-files $(PAMFILES) -@USE_PAM_TRUE@ $(mkinstalldirs) $(DESTDIR)$(pamdir) -@USE_PAM_TRUE@ if test "x$(OVERWRITE_CONFIG)" = "xyes" -o ! -f $(DESTDIR)$(pamdir)/netatalk; then \ --@USE_PAM_TRUE@ echo "$(INSTALL_DATA) netatalk.pamd $(DESTDIR)$(pamdir)/netatalk"; \ --@USE_PAM_TRUE@ $(INSTALL_DATA) netatalk.pamd $(DESTDIR)$(pamdir)/netatalk || \ --@USE_PAM_TRUE@ echo "WARNING: Can't install PAM file"; \ +-@USE_PAM_TRUE@ echo "$(INSTALL_DATA) $$f $(DESTDIR)$(pamdir)/netatalk"; \ +-@USE_PAM_TRUE@ $(INSTALL_DATA) netatalk.pamd $(DESTDIR)$(pamdir)/netatalk || echo "WARNING: Can't install PAM files"; \ -@USE_PAM_TRUE@ else \ --@USE_PAM_TRUE@ echo "not overwriting $(DESTDIR)$(pamdir)/netatalk"; \ --@USE_PAM_TRUE@ fi; +-@USE_PAM_TRUE@ echo "not overwriting $(DESTDIR)$(pamdir)/netatalk"; \ +-@USE_PAM_TRUE@ fi; @USE_PAM_FALSE@install-data-local: install-config-files # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/net/netatalk/files/patch-configure b/net/netatalk/files/patch-configure index 713d43ec0079..d14d0f1f9714 100644 --- a/net/netatalk/files/patch-configure +++ b/net/netatalk/files/patch-configure @@ -1,28 +1,11 @@ ---- configure.orig Mon Jun 9 11:55:15 2003 -+++ configure Fri Jun 20 00:05:06 2003 -@@ -13327,13 +13327,13 @@ - savedldflags="$LDFLAGS" - CFLAGS="$CFLAGS -I$bdbdir" - LDFLAGS="-L$bdblibdir $LDFLAGS" -- echo "$as_me:$LINENO: checking for main in -ldb" >&5 --echo $ECHO_N "checking for main in -ldb... $ECHO_C" >&6 -+ echo "$as_me:$LINENO: checking for main in -ldb3" >&5 -+echo $ECHO_N "checking for main in -ldb3... $ECHO_C" >&6 - if test "${ac_cv_lib_db_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-ldb $LIBS" -+LIBS="-ldb3 $LIBS" - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" - /* confdefs.h. */ -@@ -13384,7 +13384,7 @@ - if test "$bdblibdir" != "/usr/lib"; then - BDB_LIBS="-L$bdblibdir" - fi -- BDB_LIBS="$BDB_LIBS -ldb" -+ BDB_LIBS="$BDB_LIBS -ldb3" - BDB_BIN=$bdbbindir - BDB_PATH="`echo $bdbdir | sed 's,include/db3$,,'`" - BDB_PATH="`echo $BDB_PATH | sed 's,include$,,'`" +--- configure.orig Sat Aug 28 03:20:01 2004 ++++ configure Sat Aug 28 03:20:14 2004 +@@ -15118,7 +15118,7 @@ + trybdbdir="" + dobdbsearch=yes + bdb_search_dirs="/usr/local/include /usr/include" +- search_subdirs="/db4.2 /db42 /db4.1 /db41 /db4 /" ++ search_subdirs="/db4.1 /db41 /db4 /" + + DB_MAJOR_REQ=4 + DB_MINOR_REQ=1 diff --git a/net/netatalk/files/patch-etc_afpd_unix.h b/net/netatalk/files/patch-etc_afpd_unix.h deleted file mode 100644 index cfc566530256..000000000000 --- a/net/netatalk/files/patch-etc_afpd_unix.h +++ /dev/null @@ -1,12 +0,0 @@ ---- etc/afpd/unix.h.orig Sun Sep 8 23:45:56 2002 -+++ etc/afpd/unix.h Mon Sep 9 00:03:58 2002 -@@ -30,7 +30,8 @@ - #if defined(TRU64) - #define f_frsize f_fsize - #else /* TRU64 */ --#if defined(HAVE_SYS_STATVFS_H) || defined(__svr4__) -+#if (defined(HAVE_SYS_STATVFS_H) || defined(__svr4__)) && \ -+ !defined(__FreeBSD__) - #include <sys/statvfs.h> - #define statfs statvfs - #else /* HAVE_SYS_STATVFS || __svr4__ */ diff --git a/net/netatalk/files/patch-ltmain.sh b/net/netatalk/files/patch-ltmain.sh deleted file mode 100644 index 786e33b951ac..000000000000 --- a/net/netatalk/files/patch-ltmain.sh +++ /dev/null @@ -1,34 +0,0 @@ ---- ltmain.sh.orig Sat Nov 29 08:54:27 2003 -+++ ltmain.sh Sun Dec 7 13:32:36 2003 -@@ -1286,7 +1286,7 @@ - esac - elif test "X$arg" = "X-lc_r"; then - case $host in -- *-*-openbsd* | *-*-freebsd*) -+ *-*-openbsd* | *-*-freebsd4*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; -@@ -1913,6 +1913,9 @@ - finalize_deplibs="$deplib $finalize_deplibs" - fi - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2 - ;; -@@ -5474,10 +5477,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" |