head	1.7;
access;
symbols
	old_PRE_XORG_7:1.6
	old_RELEASE_4_EOL:1.6
	old_RELEASE_4_10_0:1.2
	old_RELEASE_5_2_1:1.2
	old_RELEASE_5_2_0:1.2
	old_RELEASE_4_9_0:1.1
	old_RELEASE_5_1_0:1.1
	old_RELEASE_4_8_0:1.1;
locks; strict;
comment	@# @;


1.7
date	2007.07.06.05.45.08;	author beech;	state dead;
branches;
next	1.6;

1.6
date	2007.01.16.09.36.53;	author itetcu;	state Exp;
branches;
next	1.5;

1.5
date	2005.11.29.17.50.27;	author flz;	state dead;
branches;
next	1.4;

1.4
date	2005.10.13.15.29.43;	author flz;	state Exp;
branches;
next	1.3;

1.3
date	2004.05.14.06.46.12;	author mharo;	state dead;
branches;
next	1.2;

1.2
date	2003.11.03.19.40.38;	author mharo;	state Exp;
branches;
next	1.1;

1.1
date	2003.03.24.13.33.28;	author nectar;	state Exp;
branches;
next	;


desc
@@


1.7
log
@- Update to 1.3.1r3
- Remove patches integrated upstream
- Makefile cleanup
- Bugfixes:

    Fixed segfault which can occur if NLST is used twice, the first time
    on a path which does not exist.

    Fixed reporting of addresses via EPSV for IPv6 addresses.

    Fixes occurrences of "ai_family not supported" for inetd-run
    proftpd daemons.

    DisplayLogin, DisplayQuit, and DisplayTransferFiles files now work
    regardless of whether the session process is chrooted.

Approved by:	sat (mentor)
@
text
@--- configure.orig	Tue Jan  9 19:55:21 2007
+++ configure	Mon Jan 15 22:06:53 2007
@@@@ -19246,8 +19246,7 @@@@
 
     if test "$withval" != "no" ; then
 
-
-for ac_func in getopt getopt_long
+for ac_func in getopt
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_func" >&5
@@@@ -19495,6 +19494,108 @@@@
 done
 
 
+for ac_func in getopt_long
+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
+
+
 cat >>confdefs.h <<\_ACEOF
 #define PR_USE_SYSTEM_GETOPT 1
 _ACEOF
@@@@ -19510,8 +19611,7 @@@@
 else
 
 
-
-for ac_func in getopt getopt_long
+for ac_func in getopt
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_func" >&5
@@@@ -19759,6 +19859,108 @@@@
 done
 
 
+for ac_func in getopt_long
+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
+
+
 cat >>confdefs.h <<\_ACEOF
 #define PR_USE_SYSTEM_GETOPT 1
 _ACEOF
@@@@ -34961,11 +35163,6 @@@@
 #define PR_USE_SENDFILE 1
 _ACEOF
 
-  else
-    cat >>confdefs.h <<\_ACEOF
-#define PR_USE_SENDFILE 0
-_ACEOF
-
   fi
 
   case "$pr_cv_func_sendfile" in
@@@@ -36560,20 +36757,6 @@@@
       fi
 
       inclib=`cat $srcdir/contrib/$moduledir/$srcinc | grep "\\\$Libraries:" | sed -e 's/^.*\$Libraries: \(.*\)\\$/\1/'`
-    else
-      incarch=
-      inclib=
-    fi
-
-    srcinc_in="$srcinc.in"
-    if test -f $srcdir/contrib/$moduledir/$srcinc_in ; then
-      if test -z $srcarch -a -z $incarch ; then
-        incarch=`cat $srcdir/contrib/$moduledir/$srcinc_in | grep "\\\$Archive:" | sed -e 's/^.*\$Archive: \(.*\)\\$/\1/'`
-      else
-        incarch=
-      fi
-
-      inclib=`cat $srcdir/contrib/$moduledir/$srcinc_in | grep "\\\$Libraries:" | sed -e 's/^.*\$Libraries: \(.*\)\\$/\1/'`
     else
       incarch=
       inclib=
@


1.6
log
@Update to 1.3.1rc2

PR:		ports/107974
Submitted by:	Beech Rintoul (maintainer)
@
text
@@


1.5
log
@- Update to 1.3.0.rc3.
- Add SHA256 checksum.
- Remove patch-configure since it has been integrated in genuine configure script.
- Rename patch-af to patch-proftpd.8.in.

PR:		ports/88433
Submitted by:	Dmitry A Grigorovich <odip@@bionet.nsc.ru>
Approved by:	maintainer timeout (4 weeks)
@
text
@d1 5
a5 5
--- configure.orig      Fri Aug  5 23:18:35 2005
+++ configure   Fri Aug  5 23:19:29 2005
@@@@ -19685,11 +19685,11 @@@@
 if test "${enable_ipv6+set}" = set; then
   enableval="$enable_ipv6"
d8 111
a118 1
+  if test x"$enableval" = xyes ; then
d120 1
a120 1
 #define PR_USE_IPV6 1
d122 4
d127 8
a134 1
+  fi;
d136 138
a273 1
 fi;
@


1.4
log
@- Add a patch to fix ipv6 dependancy.

PR:		ports/84607
Submitted by:	Max Campos <mcampos@@bpsw.biz>
Approved by:	maintainer timeout (2 months)
Obtained from:	ProFTPD Bug Tracking System
@
text
@@


1.3
log
@Upgrade to 1.2.10rc1

Allow for slave ports
@
text
@d1 5
a5 9
--- ./configure.orig	Fri Mar 14 18:19:10 2003
+++ ./configure	Fri Mar 14 18:19:25 2003
@@@@ -11202,8 +11202,8 @@@@
     #if HAVE_NETDB_H
     #include <netdb.h>
     #endif
-    #include <sys/socket.h>
     #include <sys/types.h>
+    #include <sys/socket.h>
d7 9
a15 1
 int
@


1.2
log
@58774 Andrew J. Caines <A.J.Caines@@halplant.com>
upgrade to 1.2.9

58415 Melvyn Sopacua <mdev@@idg.nl>
add WITH_OPENSSL

57385 Martin Matuska <martin@@tradex.sk>
adds rc_subr support

54783 Bruce M Simpson <bms@@spc.org>
Ability to support multiple versions MYSQL and LDAP using the WITH_*
variables.
I ended up using the stuff provided in bsd.port.mk with his patches
@
text
@@


1.1
log
@Update 1.2.6 -> 1.2.8

PR:		ports/50031
Supersedes:	ports/44498, ports/46189, ports/47134, ports/48071,
		ports/48096, ports/48966
Submitted by:	Randy Philipp <randy@@umbc.edu>
@
text
@d4 6
a9 6
 #if HAVE_NETDB_H
 #include <netdb.h>
 #endif
-#include <sys/socket.h>
 #include <sys/types.h>
+#include <sys/socket.h>
a11 1
 main ()
@

