diff options
-rw-r--r-- | net/gofish/Makefile | 4 | ||||
-rw-r--r-- | net/gofish/PLIST | 4 | ||||
-rw-r--r-- | net/gofish/distinfo | 12 | ||||
-rw-r--r-- | net/gofish/patches/patch-aa | 63 | ||||
-rw-r--r-- | net/gofish/patches/patch-ab | 14 | ||||
-rw-r--r-- | net/gofish/patches/patch-ac | 114 | ||||
-rw-r--r-- | net/gofish/patches/patch-ad | 14 |
7 files changed, 7 insertions, 218 deletions
diff --git a/net/gofish/Makefile b/net/gofish/Makefile index 017718dcb9c..66762ee0dba 100644 --- a/net/gofish/Makefile +++ b/net/gofish/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.1.1.1 2005/10/26 03:42:21 minskim Exp $ +# $NetBSD: Makefile,v 1.2 2005/11/02 19:13:00 wiz Exp $ -DISTNAME= gofish-1.0 +DISTNAME= gofish-1.1 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gofish/} diff --git a/net/gofish/PLIST b/net/gofish/PLIST index 3c4d3b3989e..2139789045e 100644 --- a/net/gofish/PLIST +++ b/net/gofish/PLIST @@ -1,8 +1,6 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2005/10/26 03:42:21 minskim Exp $ +@comment $NetBSD: PLIST,v 1.2 2005/11/02 19:13:00 wiz Exp $ bin/check-files -bin/gmap2cache bin/mkcache -man/man1/gmap2cache.1 man/man1/gofish.1 man/man1/gopherd.1 man/man1/mkcache.1 diff --git a/net/gofish/distinfo b/net/gofish/distinfo index 942dab977ee..566c7b0c637 100644 --- a/net/gofish/distinfo +++ b/net/gofish/distinfo @@ -1,9 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2005/10/26 03:42:21 minskim Exp $ +$NetBSD: distinfo,v 1.2 2005/11/02 19:13:00 wiz Exp $ -SHA1 (gofish-1.0.tar.gz) = 7581acb68e1facf0619c4ab0759f0743ab7479aa -RMD160 (gofish-1.0.tar.gz) = 0b4ebc1cf639a4aa8cae83a00becbc5877ddb9e6 -Size (gofish-1.0.tar.gz) = 141992 bytes -SHA1 (patch-aa) = f2fb96c12b65e00933a0e70b7299ebd16d53b73f -SHA1 (patch-ab) = 1520fc6b28c5dd2f11adbcb3a20cd56f4854c858 -SHA1 (patch-ac) = a0f4b84b2656695b09a0a6e771b11e713ee2e030 -SHA1 (patch-ad) = cf6d1502fada48bbede3d87e35fd335d6f6bcbb4 +SHA1 (gofish-1.1.tar.gz) = fb971d039bf2271fe9cb2df4a8bc20a489da9e4c +RMD160 (gofish-1.1.tar.gz) = 97c0bf1e201a7326d650e4f132d65c6b94ed609c +Size (gofish-1.1.tar.gz) = 215963 bytes diff --git a/net/gofish/patches/patch-aa b/net/gofish/patches/patch-aa deleted file mode 100644 index 4960fcb21ed..00000000000 --- a/net/gofish/patches/patch-aa +++ /dev/null @@ -1,63 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2005/10/26 03:42:21 minskim Exp $ - ---- Makefile.in.orig 2004-12-09 03:59:10.000000000 +0000 -+++ Makefile.in -@@ -636,7 +636,7 @@ info: info-am - - info-am: - --install-data-am: install-data-local install-man -+install-data-am: install-man - - install-exec-am: install-binPROGRAMS install-binSCRIPTS \ - install-sbinPROGRAMS -@@ -678,7 +678,7 @@ uninstall-man: uninstall-man1 uninstall- - distclean-generic distclean-hdr distclean-tags distcleancheck \ - distdir distuninstallcheck dvi dvi-am info info-am install \ - install-am install-binPROGRAMS install-binSCRIPTS install-data \ -- install-data-am install-data-local install-exec install-exec-am \ -+ install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-man1 \ - install-man5 install-sbinPROGRAMS install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ -@@ -693,40 +693,6 @@ uninstall-man: uninstall-man1 uninstall- - install-exec-hook: - ln -s $(sbindir)/gofish $(DESTDIR)$(sbindir)/gopherd - --# Do not override the gofish.conf or icons directories if they exist --install-data-local: install-root-dir -- $(mkinstalldirs) $(DESTDIR)$(sysconfdir) -- if test -f $(DESTDIR)$(sysconfdir)/gofish.conf; then \ -- $(INSTALL_DATA) gofish.conf $(DESTDIR)$(sysconfdir)/gofish.conf.new; \ -- else \ -- $(INSTALL_DATA) gofish.conf $(DESTDIR)$(sysconfdir)/gofish.conf; \ -- fi -- if test -f $(DESTDIR)$(sysconfdir)/gofish-www.conf; then \ -- $(INSTALL_DATA) gofish-www.conf $(DESTDIR)$(sysconfdir)/gofish-www.conf.new; \ -- else \ -- $(INSTALL_DATA) gofish-www.conf $(DESTDIR)$(sysconfdir)/gofish-www.conf; \ -- fi -- --# 1. Only install Configure_GoFish if /var/gopher does not exist. --# We don't want to keep installing it for users who are upgrading. --# 2. Only install the .gopher+ file if it dosen't exist. We don't want to --# override any user changes. --# 3. Only install icon directory if it dosen't exist. We don't want to --# override any user installed icons. --install-root-dir: -- if test ! -d $(DESTDIR)$(gopherroot); then \ -- $(mkinstalldirs) $(DESTDIR)$(gopherroot); \ -- $(INSTALL_DATA) Configure_GoFish $(DESTDIR)$(gopherroot)/Configure_GoFish; \ -- $(INSTALL_DATA) _cache $(DESTDIR)$(gopherroot)/.cache; \ -- fi -- if test ! -f $(DESTDIR)$(gopherroot)/.gopher+; then \ -- $(INSTALL_DATA) _gopher+ $(DESTDIR)$(gopherroot)/.gopher+; \ -- fi -- if test ! -f $(DESTDIR)$(gopherroot)/icons; then \ -- $(mkinstalldirs) $(DESTDIR)$(gopherroot)/icons; \ -- $(INSTALL_DATA) $(srcdir)/icons/*.gif $(DESTDIR)$(gopherroot)/icons; \ -- fi -- - # Do not remove the root_dir or any part of it - uninstall-local: - rm -f $(DESTDIR)$(sysconfdir)/gofish.conf diff --git a/net/gofish/patches/patch-ab b/net/gofish/patches/patch-ab deleted file mode 100644 index 8125c69087b..00000000000 --- a/net/gofish/patches/patch-ab +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2005/10/26 03:42:21 minskim Exp $ - ---- configure.in.orig Sun May 25 03:52:57 2003 -+++ configure.in -@@ -44,6 +44,9 @@ AC_FUNC_STRFTIME - AC_CHECK_FUNCS(gethostname select socket strdup strerror strstr strtol uname) - AC_CHECK_FUNCS(writev daemon) - -+dnl Interix does not have initgroups -+AC_CHECK_FUNCS(initgroups) -+ - dnl poll does not work on the arm - dnl if this goes, AC_CANONICAL_HOST and the files - dnl config.sub and config.guess can go diff --git a/net/gofish/patches/patch-ac b/net/gofish/patches/patch-ac deleted file mode 100644 index e2442d0ae91..00000000000 --- a/net/gofish/patches/patch-ac +++ /dev/null @@ -1,114 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 2005/10/26 03:42:21 minskim Exp $ - ---- configure.orig Thu Dec 9 03:59:13 2004 -+++ configure -@@ -5145,6 +5145,109 @@ fi - done - - -+ -+for ac_func in initgroups -+do -+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -+echo "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -+if eval "test \"\${$as_ac_var+set}\" = set"; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. -+ For example, HP-UX 11i <limits.h> declares gettimeofday. */ -+#define $ac_func innocuous_$ac_func -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char $ac_func (); below. -+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ <limits.h> exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif -+ -+#undef $ac_func -+ -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+{ -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char $ac_func (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -+choke me -+#else -+char (*f) () = $ac_func; -+#endif -+#ifdef __cplusplus -+} -+#endif -+ -+int -+main () -+{ -+return f != $ac_func; -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ eval "$as_ac_var=yes" -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+eval "$as_ac_var=no" -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -+if test `eval echo '${'$as_ac_var'}'` = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+_ACEOF -+ -+fi -+done -+ -+ - case $host in - armv4l-*) ;; - *) diff --git a/net/gofish/patches/patch-ad b/net/gofish/patches/patch-ad deleted file mode 100644 index dcd619a95ff..00000000000 --- a/net/gofish/patches/patch-ad +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ad,v 1.1.1.1 2005/10/26 03:42:21 minskim Exp $ - ---- gofish.c.orig Wed Dec 31 18:12:02 2003 -+++ gofish.c -@@ -209,7 +209,9 @@ setup_privs (void) - uid = pwd->pw_uid; - if(gid == (uid_t)-1) - gid = pwd->pw_gid; -+#ifdef HAVE_INITGROUPS - initgroups (pwd->pw_name, pwd->pw_gid); -+#endif - } - - setgid(gid); |