Date: Mon, 22 May 2006 20:48:12 -0800 From: "\"Beech Rintoul\" <Beech Rintoul" <beech@mangohealth.org> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Cc: Beech Rintoul <beech@mangohealth.org> Subject: ports/97674: ftp/proftpd: [MAINTAINER UPDATE] : Fix 4.x build Message-ID: <1148359692.11652@stargate.alaskaparadise.com> Resent-Message-ID: <200605230450.k4N4oHUp007828@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 97674
>Category: ports
>Synopsis: ftp/proftpd: [MAINTAINER UPDATE] : Fix 4.x build
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue May 23 04:50:16 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Beech Rintoul
>Release: FreeBSD 7.0-CURRENT i386
>Organization:
NorthWind Communications
>Environment:
System: FreeBSD 7.0-CURRENT #65: Sun May 21 00:29:20 AKDT 2006
root@stargate.alaskaparadise.com:/usr/obj/usr/src/sys/STARGATE
>Description:
- Fix 4.x build with libgnugetopt
- Add file: extra_patch-configure.in
>How-To-Repeat:
>Fix:
diff -ruN --exclude=CVS /usr/ports/ftp/proftpd.orig/Makefile /usr/ports/ftp/proftpd/Makefile
--- /usr/ports/ftp/proftpd.orig/Makefile Sat May 20 01:52:39 2006
+++ /usr/ports/ftp/proftpd/Makefile Mon May 22 20:35:24 2006
@@ -7,7 +7,7 @@
PORTNAME= proftpd
DISTVERSION= 1.3.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= ftp
MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \
ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/ \
@@ -55,12 +55,12 @@
MODULES?=
-.include <bsd.port.pre.mk>
+.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)
diff -ruN --exclude=CVS /usr/ports/ftp/proftpd.orig/files/extra_patch-configure.in /usr/ports/ftp/proftpd/files/extra_patch-configure.in
--- /usr/ports/ftp/proftpd.orig/files/extra_patch-configure.in Wed Dec 31 14:00:00 1969
+++ /usr/ports/ftp/proftpd/files/extra_patch-configure.in Mon May 22 15:32:54 2006
@@ -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)
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1148359692.11652>