- Update to 1.1

- Pass maintainership to submitter

PR:             109654
Submitted by:   Kai Wang <kaiw27@gmail.com>

4 files changed, 29 insertions, 856 deletions

diff --git a/net/gofish/Makefile b/net/gofish/Makefile
index b77430c30146..841a0f1317c8 100644
--- a/net/gofish/Makefile
+++ b/net/gofish/Makefile
@@ -7,21 +7,35 @@
 #
 
 PORTNAME=	gofish
-PORTVERSION=	0.29
+PORTVERSION=	1.1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	kaiw27@gmail.com
 COMMENT=	GoFish Gopher Server
 
+WRKSRC=		${WRKDIR}/${PORTNAME}
 GOPHERROOT?=	${PREFIX}/gopher
 GOPHERUSER?=	nobody
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-gopherroot=${GOPHERROOT} \
 		--with-gopheruser=${GOPHERUSER}
+MAKE_ENV=	localstatedir=/var
 
-MAN1=	gmap2cache.1 gofish.1 gopherd.1 mkcache.1
-MAN5=	dotcache.5 gofish.5
+MAN1=		gofish.1 mkcache.1
+MAN5=		dotcache.5 gofish.5
+MLINKS=		gofish.1 gopherd.1
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+post-install:
+.for i in ${PREFIX}/etc/gofish.conf ${PREFIX}/etc/gofish-www.conf
+	if test -f ${i}.new; then \
+		${MV} ${i}.new ${i}.sample; \
+	else \
+		${CP} -p ${i} ${i}.sample; \
+	fi
+.endfor
+
+.include <bsd.port.post.mk>
diff --git a/net/gofish/distinfo b/net/gofish/distinfo
index d5aa77fa59a2..fac3643e2be9 100644
--- a/net/gofish/distinfo
+++ b/net/gofish/distinfo
@@ -1,3 +1,3 @@
-MD5 (gofish-0.29.tar.gz) = 090010dff4dca4f9c3c6bcad61038665
-SHA256 (gofish-0.29.tar.gz) = 66af0a7886d2081a61e1349f22212e952be63f411b3ddad91d9e901b148f0e79
-SIZE (gofish-0.29.tar.gz) = 122098
+MD5 (gofish-1.1.tar.gz) = 09a95295c74fc37d5e4cb8a0ad7c9b12
+SHA256 (gofish-1.1.tar.gz) = a5864851dd96058d13988aa70bb9c5dc8da605675d5d453d0e7eb3b4959a77e2
+SIZE (gofish-1.1.tar.gz) = 215963
diff --git a/net/gofish/files/patch-configure b/net/gofish/files/patch-configure
deleted file mode 100644
index 2e8cc96576e0..000000000000
--- a/net/gofish/files/patch-configure
+++ /dev/null
@@ -1,843 +0,0 @@
---- configure	Fri Apr  4 05:33:10 2003
-+++ configure.new	Fri Mar  5 12:44:05 2004
-@@ -32,6 +32,7 @@
- program_transform_name=s,x,x,
- silent=
- site=
-+sitefile=
- srcdir=
- target=NONE
- verbose=
-@@ -146,6 +147,7 @@
-   --help                  print this message
-   --no-create             do not create output files
-   --quiet, --silent       do not print \`checking...' messages
-+  --site-file=FILE        use FILE as the site file
-   --version               print the version of autoconf that created configure
- Directory and file names:
-   --prefix=PREFIX         install architecture-independent files in PREFIX
-@@ -316,6 +318,11 @@
-   -site=* | --site=* | --sit=*)
-     site="$ac_optarg" ;;
- 
-+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
-+    ac_prev=sitefile ;;
-+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
-+    sitefile="$ac_optarg" ;;
-+
-   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-     ac_prev=srcdir ;;
-   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-@@ -481,12 +488,16 @@
- srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
- 
- # Prefer explicitly selected file to automatically selected ones.
--if test -z "$CONFIG_SITE"; then
--  if test "x$prefix" != xNONE; then
--    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
--  else
--    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-+if test -z "$sitefile"; then
-+  if test -z "$CONFIG_SITE"; then
-+    if test "x$prefix" != xNONE; then
-+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-+    else
-+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-+    fi
-   fi
-+else
-+  CONFIG_SITE="$sitefile"
- fi
- for ac_site_file in $CONFIG_SITE; do
-   if test -r "$ac_site_file"; then
-@@ -556,7 +567,7 @@
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # ./install, which can be erroneously created by make from ./install.sh.
- echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
--echo "configure:560: checking for a BSD compatible install" >&5
-+echo "configure:571: checking for a BSD compatible install" >&5
- if test -z "$INSTALL"; then
- if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -609,7 +620,7 @@
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
- 
- echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
--echo "configure:613: checking whether build environment is sane" >&5
-+echo "configure:624: checking whether build environment is sane" >&5
- # Just in case
- sleep 1
- echo timestamp > conftestfile
-@@ -666,7 +677,7 @@
- test "$program_transform_name" = "" && program_transform_name="s,x,x,"
- 
- echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
--echo "configure:670: checking whether ${MAKE-make} sets \${MAKE}" >&5
-+echo "configure:681: checking whether ${MAKE-make} sets \${MAKE}" >&5
- set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -712,7 +723,7 @@
- 
- missing_dir=`cd $ac_aux_dir && pwd`
- echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
--echo "configure:716: checking for working aclocal" >&5
-+echo "configure:727: checking for working aclocal" >&5
- # Run test in a subshell; some versions of sh will print an error if
- # an executable is not found, even if stderr is redirected.
- # Redirect stdin to placate older versions of autoconf.  Sigh.
-@@ -725,7 +736,7 @@
- fi
- 
- echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
--echo "configure:729: checking for working autoconf" >&5
-+echo "configure:740: checking for working autoconf" >&5
- # Run test in a subshell; some versions of sh will print an error if
- # an executable is not found, even if stderr is redirected.
- # Redirect stdin to placate older versions of autoconf.  Sigh.
-@@ -738,7 +749,7 @@
- fi
- 
- echo $ac_n "checking for working automake""... $ac_c" 1>&6
--echo "configure:742: checking for working automake" >&5
-+echo "configure:753: checking for working automake" >&5
- # Run test in a subshell; some versions of sh will print an error if
- # an executable is not found, even if stderr is redirected.
- # Redirect stdin to placate older versions of autoconf.  Sigh.
-@@ -751,7 +762,7 @@
- fi
- 
- echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
--echo "configure:755: checking for working autoheader" >&5
-+echo "configure:766: checking for working autoheader" >&5
- # Run test in a subshell; some versions of sh will print an error if
- # an executable is not found, even if stderr is redirected.
- # Redirect stdin to placate older versions of autoconf.  Sigh.
-@@ -764,7 +775,7 @@
- fi
- 
- echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
--echo "configure:768: checking for working makeinfo" >&5
-+echo "configure:779: checking for working makeinfo" >&5
- # Run test in a subshell; some versions of sh will print an error if
- # an executable is not found, even if stderr is redirected.
- # Redirect stdin to placate older versions of autoconf.  Sigh.
-@@ -788,7 +799,7 @@
- fi
- 
- echo $ac_n "checking host system type""... $ac_c" 1>&6
--echo "configure:792: checking host system type" >&5
-+echo "configure:803: checking host system type" >&5
- 
- host_alias=$host
- case "$host_alias" in
-@@ -821,7 +832,7 @@
- # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:825: checking for $ac_word" >&5
-+echo "configure:836: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -851,7 +862,7 @@
-   # Extract the first word of "cc", so it can be a program name with args.
- set dummy cc; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:855: checking for $ac_word" >&5
-+echo "configure:866: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -902,7 +913,7 @@
-       # Extract the first word of "cl", so it can be a program name with args.
- set dummy cl; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:906: checking for $ac_word" >&5
-+echo "configure:917: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -934,7 +945,7 @@
- fi
- 
- echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
--echo "configure:938: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-+echo "configure:949: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
- 
- ac_ext=c
- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-@@ -945,12 +956,12 @@
- 
- cat > conftest.$ac_ext << EOF
- 
--#line 949 "configure"
-+#line 960 "configure"
- #include "confdefs.h"
- 
- main(){return(0);}
- EOF
--if { (eval echo configure:954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   ac_cv_prog_cc_works=yes
-   # If we can't run a trivial program, we are probably using a cross compiler.
-   if (./conftest; exit) 2>/dev/null; then
-@@ -976,12 +987,12 @@
-   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
- fi
- echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
--echo "configure:980: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-+echo "configure:991: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
- echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
- cross_compiling=$ac_cv_prog_cc_cross
- 
- echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
--echo "configure:985: checking whether we are using GNU C" >&5
-+echo "configure:996: checking whether we are using GNU C" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -990,7 +1001,7 @@
-   yes;
- #endif
- EOF
--if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:994: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1005: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-   ac_cv_prog_gcc=yes
- else
-   ac_cv_prog_gcc=no
-@@ -1009,7 +1020,7 @@
- ac_save_CFLAGS="$CFLAGS"
- CFLAGS=
- echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
--echo "configure:1013: checking whether ${CC-cc} accepts -g" >&5
-+echo "configure:1024: checking whether ${CC-cc} accepts -g" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1052,7 +1063,7 @@
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # ./install, which can be erroneously created by make from ./install.sh.
- echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
--echo "configure:1056: checking for a BSD compatible install" >&5
-+echo "configure:1067: checking for a BSD compatible install" >&5
- if test -z "$INSTALL"; then
- if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1106,7 +1117,7 @@
- 
- 
- echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
--echo "configure:1110: checking for socket in -lsocket" >&5
-+echo "configure:1121: checking for socket in -lsocket" >&5
- ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1114,7 +1125,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lsocket  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1118 "configure"
-+#line 1129 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -1125,7 +1136,7 @@
- socket()
- ; return 0; }
- EOF
--if { (eval echo configure:1129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:1140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -1152,27 +1163,27 @@
-   echo "$ac_t""no" 1>&6
- fi
- 
--echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
--echo "configure:1157: checking for gethostbyname in -lnsl" >&5
--ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for  in -lgethostbyname""... $ac_c" 1>&6
-+echo "configure:1168: checking for  in -lgethostbyname" >&5
-+ac_lib_var=`echo gethostbyname'_' | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lnsl  $LIBS"
-+LIBS="-lgethostbyname  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1165 "configure"
-+#line 1176 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
--char gethostbyname();
-+char ();
- 
- int main() {
--gethostbyname()
-+()
- ; return 0; }
- EOF
--if { (eval echo configure:1176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:1187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -1187,13 +1198,13 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--    ac_tr_lib=HAVE_LIB`echo nsl | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-+    ac_tr_lib=HAVE_LIB`echo gethostbyname | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-     -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-   cat >> confdefs.h <<EOF
- #define $ac_tr_lib 1
- EOF
- 
--  LIBS="-lnsl $LIBS"
-+  LIBS="-lgethostbyname $LIBS"
- 
- else
-   echo "$ac_t""no" 1>&6
-@@ -1205,12 +1216,12 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
--echo "configure:1209: checking for $ac_hdr that defines DIR" >&5
-+echo "configure:1220: checking for $ac_hdr that defines DIR" >&5
- if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1214 "configure"
-+#line 1225 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <$ac_hdr>
-@@ -1218,7 +1229,7 @@
- DIR *dirp = 0;
- ; return 0; }
- EOF
--if { (eval echo configure:1222: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1233: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   eval "ac_cv_header_dirent_$ac_safe=yes"
- else
-@@ -1243,7 +1254,7 @@
- # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
- if test $ac_header_dirent = dirent.h; then
- echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
--echo "configure:1247: checking for opendir in -ldir" >&5
-+echo "configure:1258: checking for opendir in -ldir" >&5
- ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1251,7 +1262,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-ldir  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1255 "configure"
-+#line 1266 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -1262,7 +1273,7 @@
- opendir()
- ; return 0; }
- EOF
--if { (eval echo configure:1266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:1277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -1284,7 +1295,7 @@
- 
- else
- echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
--echo "configure:1288: checking for opendir in -lx" >&5
-+echo "configure:1299: checking for opendir in -lx" >&5
- ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1292,7 +1303,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lx  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1296 "configure"
-+#line 1307 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -1303,7 +1314,7 @@
- opendir()
- ; return 0; }
- EOF
--if { (eval echo configure:1307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:1318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -1326,7 +1337,7 @@
- fi
- 
- echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
--echo "configure:1330: checking how to run the C preprocessor" >&5
-+echo "configure:1341: checking how to run the C preprocessor" >&5
- # On Suns, sometimes $CPP names a directory.
- if test -n "$CPP" && test -d "$CPP"; then
-   CPP=
-@@ -1341,13 +1352,13 @@
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp.
-   cat > conftest.$ac_ext <<EOF
--#line 1345 "configure"
-+#line 1356 "configure"
- #include "confdefs.h"
- #include <assert.h>
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1351: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:1362: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   :
-@@ -1358,13 +1369,13 @@
-   rm -rf conftest*
-   CPP="${CC-cc} -E -traditional-cpp"
-   cat > conftest.$ac_ext <<EOF
--#line 1362 "configure"
-+#line 1373 "configure"
- #include "confdefs.h"
- #include <assert.h>
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1368: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:1379: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   :
-@@ -1375,13 +1386,13 @@
-   rm -rf conftest*
-   CPP="${CC-cc} -nologo -E"
-   cat > conftest.$ac_ext <<EOF
--#line 1379 "configure"
-+#line 1390 "configure"
- #include "confdefs.h"
- #include <assert.h>
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1385: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:1396: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   :
-@@ -1406,12 +1417,12 @@
- echo "$ac_t""$CPP" 1>&6
- 
- echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
--echo "configure:1410: checking for ANSI C header files" >&5
-+echo "configure:1421: checking for ANSI C header files" >&5
- if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1415 "configure"
-+#line 1426 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -1419,7 +1430,7 @@
- #include <float.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1423: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:1434: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -1436,7 +1447,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat > conftest.$ac_ext <<EOF
--#line 1440 "configure"
-+#line 1451 "configure"
- #include "confdefs.h"
- #include <string.h>
- EOF
-@@ -1454,7 +1465,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat > conftest.$ac_ext <<EOF
--#line 1458 "configure"
-+#line 1469 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- EOF
-@@ -1475,7 +1486,7 @@
-   :
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1479 "configure"
-+#line 1490 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-@@ -1486,7 +1497,7 @@
- exit (0); }
- 
- EOF
--if { (eval echo configure:1490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:1501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   :
- else
-@@ -1513,17 +1524,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:1517: checking for $ac_hdr" >&5
-+echo "configure:1528: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1522 "configure"
-+#line 1533 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1527: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:1538: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -1551,12 +1562,12 @@
- 
- 
- echo $ac_n "checking for working const""... $ac_c" 1>&6
--echo "configure:1555: checking for working const" >&5
-+echo "configure:1566: checking for working const" >&5
- if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1560 "configure"
-+#line 1571 "configure"
- #include "confdefs.h"
- 
- int main() {
-@@ -1605,7 +1616,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:1609: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1620: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_c_const=yes
- else
-@@ -1626,12 +1637,12 @@
- fi
- 
- echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
--echo "configure:1630: checking for uid_t in sys/types.h" >&5
-+echo "configure:1641: checking for uid_t in sys/types.h" >&5
- if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1635 "configure"
-+#line 1646 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- EOF
-@@ -1660,21 +1671,21 @@
- fi
- 
- echo $ac_n "checking for inline""... $ac_c" 1>&6
--echo "configure:1664: checking for inline" >&5
-+echo "configure:1675: checking for inline" >&5
- if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_cv_c_inline=no
- for ac_kw in inline __inline__ __inline; do
-   cat > conftest.$ac_ext <<EOF
--#line 1671 "configure"
-+#line 1682 "configure"
- #include "confdefs.h"
- 
- int main() {
- } $ac_kw foo() {
- ; return 0; }
- EOF
--if { (eval echo configure:1678: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1689: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_c_inline=$ac_kw; break
- else
-@@ -1700,12 +1711,12 @@
- esac
- 
- echo $ac_n "checking for off_t""... $ac_c" 1>&6
--echo "configure:1704: checking for off_t" >&5
-+echo "configure:1715: checking for off_t" >&5
- if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1709 "configure"
-+#line 1720 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if STDC_HEADERS
-@@ -1733,12 +1744,12 @@
- fi
- 
- echo $ac_n "checking for pid_t""... $ac_c" 1>&6
--echo "configure:1737: checking for pid_t" >&5
-+echo "configure:1748: checking for pid_t" >&5
- if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1742 "configure"
-+#line 1753 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if STDC_HEADERS
-@@ -1766,12 +1777,12 @@
- fi
- 
- echo $ac_n "checking for size_t""... $ac_c" 1>&6
--echo "configure:1770: checking for size_t" >&5
-+echo "configure:1781: checking for size_t" >&5
- if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1775 "configure"
-+#line 1786 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if STDC_HEADERS
-@@ -1799,12 +1810,12 @@
- fi
- 
- echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
--echo "configure:1803: checking whether struct tm is in sys/time.h or time.h" >&5
-+echo "configure:1814: checking whether struct tm is in sys/time.h or time.h" >&5
- if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1808 "configure"
-+#line 1819 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <time.h>
-@@ -1812,7 +1823,7 @@
- struct tm *tp; tp->tm_sec;
- ; return 0; }
- EOF
--if { (eval echo configure:1816: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1827: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_struct_tm=time.h
- else
-@@ -1837,12 +1848,12 @@
- for ac_func in mmap
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:1841: checking for $ac_func" >&5
-+echo "configure:1852: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1846 "configure"
-+#line 1857 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -1865,7 +1876,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:1869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:1880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -1890,12 +1901,12 @@
- done
- 
- echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
--echo "configure:1894: checking return type of signal handlers" >&5
-+echo "configure:1905: checking return type of signal handlers" >&5
- if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1899 "configure"
-+#line 1910 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <signal.h>
-@@ -1912,7 +1923,7 @@
- int i;
- ; return 0; }
- EOF
--if { (eval echo configure:1916: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1927: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_type_signal=void
- else
-@@ -1931,12 +1942,12 @@
- 
- 
- echo $ac_n "checking for strftime""... $ac_c" 1>&6
--echo "configure:1935: checking for strftime" >&5
-+echo "configure:1946: checking for strftime" >&5
- if eval "test \"`echo '$''{'ac_cv_func_strftime'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1940 "configure"
-+#line 1951 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char strftime(); below.  */
-@@ -1959,7 +1970,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:1963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:1974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_strftime=yes"
- else
-@@ -1981,7 +1992,7 @@
-   echo "$ac_t""no" 1>&6
- # strftime is in -lintl on SCO UNIX.
- echo $ac_n "checking for strftime in -lintl""... $ac_c" 1>&6
--echo "configure:1985: checking for strftime in -lintl" >&5
-+echo "configure:1996: checking for strftime in -lintl" >&5
- ac_lib_var=`echo intl'_'strftime | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1989,7 +2000,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lintl  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1993 "configure"
-+#line 2004 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -2000,7 +2011,7 @@
- strftime()
- ; return 0; }
- EOF
--if { (eval echo configure:2004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -2029,12 +2040,12 @@
- for ac_func in gethostname select socket strdup strerror strstr strtol uname
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:2033: checking for $ac_func" >&5
-+echo "configure:2044: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2038 "configure"
-+#line 2049 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -2057,7 +2068,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:2061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -2084,12 +2095,12 @@
- for ac_func in writev daemon
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:2088: checking for $ac_func" >&5
-+echo "configure:2099: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2093 "configure"
-+#line 2104 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -2112,7 +2123,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:2116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -2142,12 +2153,12 @@
-   *) for ac_func in poll
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:2146: checking for $ac_func" >&5
-+echo "configure:2157: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2151 "configure"
-+#line 2162 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -2170,7 +2181,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:2174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -2201,7 +2212,7 @@
- fi
- 
- echo $ac_n "checking mmap_cache""... $ac_c" 1>&6
--echo "configure:2205: checking mmap_cache" >&5
-+echo "configure:2216: checking mmap_cache" >&5
- if test "$enable_mmap_cache" = "yes"; then
-   cat >> confdefs.h <<\EOF
- #define MMAP_CACHE 1
-@@ -2213,7 +2224,7 @@
- echo "$ac_t""$enable_mmap_cache" 1>&6
- 
- echo $ac_n "checking gopheruser""... $ac_c" 1>&6
--echo "configure:2217: checking gopheruser" >&5
-+echo "configure:2228: checking gopheruser" >&5
- gopheruser="gopher"
- # Check whether --with-gopheruser or --without-gopheruser was given.
- if test "${with_gopheruser+set}" = set; then
diff --git a/net/gofish/pkg-plist b/net/gofish/pkg-plist
index 3ba37dde9a47..acae67422e0a 100644
--- a/net/gofish/pkg-plist
+++ b/net/gofish/pkg-plist
@@ -1,11 +1,13 @@
 bin/mkcache
-bin/gmap2cache
 bin/check-files
-etc/gofish.conf
-etc/gofish-www.conf
+@unexec if cmp -s %D/etc/gofish.conf.sample %D/etc/gofish.conf; then rm -f %D/etc/gofish.conf; fi
+etc/gofish.conf.sample
+@exec if [ ! -f %D/etc/gofish.conf ] ; then cp -p %D/%F %B/gofish.conf; fi
+@unexec if cmp -s %D/etc/gofish-www.conf.sample %D/etc/gofish-www.conf; then rm -f %D/etc/gofish-www.conf; fi
+etc/gofish-www.conf.sample
+@exec if [ ! -f %D/etc/gofish-www.conf ] ; then cp -p %D/%F %B/gofish-www.conf; fi
 sbin/gofish
-@exec ln -sf %D/sbin/gofish %D/sbin/gopherd
-@unexec rm -f %D/sbin/gofish %D/sbin/gopherd
+sbin/gopherd
 gopher/Configure_GoFish
 gopher/.cache
 gopher/.gopher+