Date: Tue, 26 Dec 2006 14:09:03 -0900 From: "Beech Rintoul" <beech@alaskaparadise.com> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Cc: beech@alaskaparadise.com Subject: ports/107221: [Maintainer Update] ftp/proftpd fixed linker errors Message-ID: <1167174543.25893@stargate.alaskaparadise.com> Resent-Message-ID: <200612262310.kBQNAFsj054841@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 107221
>Category: ports
>Synopsis: [Maintainer Update] ftp/proftpd fixed linker errors
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Tue Dec 26 23:10:14 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Beech Rintoul
>Release: FreeBSD 7.0-CURRENT i386
>Organization:
Alaska Paradise
>Environment:
System: FreeBSD 7.0-CURRENT #94: Tue Dec 19 15:08:55 AKST 2006
root@stargate.alaskaparadise.com:/usr/obj/usr/src/sys/STARGATE
>Description:
Fixed Makefile
Added patch - patch-getopt.c (Upgrades lib/getopt.c to version 1.4
Bumped PORTREVISION
Fixed pkg-plist
>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 Tue Dec 26 11:12:52 2006
+++ /usr/ports/ftp/proftpd/Makefile Tue Dec 26 12:00:33 2006
@@ -7,6 +7,7 @@
PORTNAME= proftpd
DISTVERSION= 1.3.1rc1
+PORTREVISION= 1
CATEGORIES= ftp
MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \
ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/ \
@@ -140,7 +141,7 @@
.endif
#allow user to override
-MODULES?= mod_ratio:mod_readme:mod_rewrite:mod_wrap:mod_ifsession
+MODULES?= mod_ratio:mod_readme:mod_rewrite:mod_wrap2:mod_ifsession
INCLUDEDIRS?=
LIBDIRS?=
diff -ruN --exclude=CVS /usr/ports/ftp/proftpd.orig/files/patch-getopt.c /usr/ports/ftp/proftpd/files/patch-getopt.c
--- /usr/ports/ftp/proftpd.orig/files/patch-getopt.c Wed Dec 31 14:00:00 1969
+++ /usr/ports/ftp/proftpd/files/patch-getopt.c Tue Dec 26 13:45:08 2006
@@ -0,0 +1,20 @@
+--- lib/getopt.c.orig Thu Feb 28 10:30:01 2002
++++ lib/getopt.c Tue Dec 26 13:39:53 2006
+@@ -76,7 +76,7 @@
+ # endif
+ #endif
+
+-#ifndef _
++#if defined(PR_USE_NLS) && !defined(_)
+ /* This is for other GNU distributions with internationalized messages.
+ When compiling libc, the _ macro is predefined. */
+ # ifdef HAVE_LIBINTL_H
+@@ -85,6 +85,8 @@
+ # else
+ # define _(msgid) (msgid)
+ # endif
++#else
++# define _(msgid) (msgid)
+ #endif
+
+ /* This version of `getopt' appears to the caller like standard Unix `getopt'
diff -ruN --exclude=CVS /usr/ports/ftp/proftpd.orig/pkg-plist /usr/ports/ftp/proftpd/pkg-plist
--- /usr/ports/ftp/proftpd.orig/pkg-plist Thu Dec 21 13:13:40 2006
+++ /usr/ports/ftp/proftpd/pkg-plist Tue Dec 26 14:01:31 2006
@@ -30,6 +30,7 @@
include/proftpd/mkhome.h
include/proftpd/mod_ctrls.h
include/proftpd/mod_wrap2.h
+include/proftpd/mod_sql.h
include/proftpd/modules.h
include/proftpd/netacl.h
include/proftpd/netaddr.h
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1167174543.25893>