mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-23 04:23:08 +00:00
Code Issues Releases Activity

- Fix build on FreeBSD 4.X

Browse Source 
PR:		ports/97674
Submitted by:	Beech Rintoul <beech@mangohealth.org> (maintainer)
This commit is contained in:
Pav Lucistnik 2006-05-26 18:39:15 +00:00
parent c857393ce1
commit f8105b3752
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=163527
4 changed files with 82 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ftp/proftpd-devel/Makefile
View File

@ -58,9 +58,9 @@ MODULES?=
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500000
.if exists (${LOCALBASE}/include/getopt.h)
BROKEN= Does not build when libgnugetopt is installed
.endif
CONFIGURE_ARGS+= --without-getopt
EXTRA_PATCHES= ${FILESDIR}/extra_patch-configure.in
USE_AUTOTOOLS= autoconf:259
.endif
.if !defined(WITHOUT_RATIO)
@ -133,7 +133,7 @@ USE_OPENSSL= yes
PROFTPD_LIBS+= -lssl -lcrypto -L${LOCALBASE}/lib
MODULES:=${MODULES}:mod_tls
.if defined(WITH_LDAP_TLS)
EXTRA_PATCHES=${FILESDIR}/extra_patch-ldap-tls-mod_ldap.c
EXTRA_PATCHES+= ${FILESDIR}/extra_patch-ldap-tls-mod_ldap.c
.endif
.endif

37
ftp/proftpd-devel/files/extra_patch-configure.in Normal file
View File

@ -0,0 +1,37 @@
--- configure.in Thu Mar 9 09:12:35 2006
+++ configure.in Mon May 22 15:01:23 2006
@@ -161,12 +161,14 @@
[
if test "$withval" != "no" ; then
LIB_OBJS="$LIB_OBJS getopt.o getopt1.o"
- AC_CHECK_FUNCS(getopt)
+ AC_CHECK_FUNCS(getopt getopt_long)
+ AC_CHECK_HEADERS(getopt.h)
fi
],
[
LIB_OBJS="$LIB_OBJS getopt.o getopt1.o"
- AC_CHECK_FUNCS(getopt)
+ AC_CHECK_FUNCS(getopt getopt_long)
+ AC_CHECK_HEADERS(getopt.h)
])
dnl Modules...'nuff said.
@@ -850,7 +852,7 @@
ac_build_static_modules="modules/mod_cap.o $ac_build_static_modules"
fi
-AC_CHECK_HEADERS(ctype.h getopt.h crypt.h bstring.h iconv.h inttypes.h langinfo.h limits.h)
+AC_CHECK_HEADERS(ctype.h crypt.h bstring.h iconv.h inttypes.h langinfo.h limits.h)
AC_CHECK_HEADERS(string.h strings.h stropts.h)
AC_CHECK_HEADERS(sys/file.h sys/mman.h sys/types.h sys/uio.h)
@@ -1110,7 +1112,7 @@
)
AC_CHECK_FUNCS(getcwd getenv gethostbyname2 gethostname getnameinfo)
-AC_CHECK_FUNCS(getopt_long gettimeofday hstrerror inet_aton inet_ntop inet_pton)
+AC_CHECK_FUNCS(gettimeofday hstrerror inet_aton inet_ntop inet_pton)
AC_CHECK_FUNCS(memcpy mempcpy mkdir mkstemp mlock mlockall munlock munlockall)
AC_CHECK_FUNCS(rmdir select setgroups socket statfs strchr strcoll strerror)
AC_CHECK_FUNCS(strsep strtol strtoull setprotoent setspent endprotoent)

8
ftp/proftpd/Makefile
View File

@ -58,9 +58,9 @@ MODULES?=
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500000
.if exists (${LOCALBASE}/include/getopt.h)
BROKEN= Does not build when libgnugetopt is installed
.endif
CONFIGURE_ARGS+= --without-getopt
EXTRA_PATCHES= ${FILESDIR}/extra_patch-configure.in
USE_AUTOTOOLS= autoconf:259
.endif
.if !defined(WITHOUT_RATIO)
@ -133,7 +133,7 @@ USE_OPENSSL= yes
PROFTPD_LIBS+= -lssl -lcrypto -L${LOCALBASE}/lib
MODULES:=${MODULES}:mod_tls
.if defined(WITH_LDAP_TLS)
EXTRA_PATCHES=${FILESDIR}/extra_patch-ldap-tls-mod_ldap.c
EXTRA_PATCHES+= ${FILESDIR}/extra_patch-ldap-tls-mod_ldap.c
.endif
.endif

37
ftp/proftpd/files/extra_patch-configure.in Normal file
View File

@ -0,0 +1,37 @@
--- configure.in Thu Mar 9 09:12:35 2006
+++ configure.in Mon May 22 15:01:23 2006
@@ -161,12 +161,14 @@
[
if test "$withval" != "no" ; then
LIB_OBJS="$LIB_OBJS getopt.o getopt1.o"
- AC_CHECK_FUNCS(getopt)
+ AC_CHECK_FUNCS(getopt getopt_long)
+ AC_CHECK_HEADERS(getopt.h)
fi
],
[
LIB_OBJS="$LIB_OBJS getopt.o getopt1.o"
- AC_CHECK_FUNCS(getopt)
+ AC_CHECK_FUNCS(getopt getopt_long)
+ AC_CHECK_HEADERS(getopt.h)
])
dnl Modules...'nuff said.
@@ -850,7 +852,7 @@
ac_build_static_modules="modules/mod_cap.o $ac_build_static_modules"
fi
-AC_CHECK_HEADERS(ctype.h getopt.h crypt.h bstring.h iconv.h inttypes.h langinfo.h limits.h)
+AC_CHECK_HEADERS(ctype.h crypt.h bstring.h iconv.h inttypes.h langinfo.h limits.h)
AC_CHECK_HEADERS(string.h strings.h stropts.h)
AC_CHECK_HEADERS(sys/file.h sys/mman.h sys/types.h sys/uio.h)
@@ -1110,7 +1112,7 @@
)
AC_CHECK_FUNCS(getcwd getenv gethostbyname2 gethostname getnameinfo)
-AC_CHECK_FUNCS(getopt_long gettimeofday hstrerror inet_aton inet_ntop inet_pton)
+AC_CHECK_FUNCS(gettimeofday hstrerror inet_aton inet_ntop inet_pton)
AC_CHECK_FUNCS(memcpy mempcpy mkdir mkstemp mlock mlockall munlock munlockall)
AC_CHECK_FUNCS(rmdir select setgroups socket statfs strchr strcoll strerror)
AC_CHECK_FUNCS(strsep strtol strtoull setprotoent setspent endprotoent)