Fixed Makefile Added patch - patch-getopt.c (Upgrades lib/getopt.c to version 1.4 Bumped PORTREVISION Fixed pkg-plist
Class Changed From-To: sw-bug->maintainer-update Fix category (submitter is maintainer)
Responsible Changed From-To: freebsd-ports-bugs->miwi I'll take it.
I have run into a serious portability issue with the new mod_wrap2 that breaks the build. I have contacted the developers and have gotten limited response. Actually they have been very good in their support of this port, but an answer may not be available until after the holiday. In the mean time I'm working to resolve this issue on my own and any help would be appreciated. The work in progress port can be found here: http://www.alaskaparadise.com/freebsd/proftpd_test.tar.gz I hope to have this fixed and committed ASAP. Beech -- --------------------------------------------------------------------------------------- Beech Rintoul - Sys. Administrator - beech@alaskaparadise.com /"\ ASCII Ribbon Campaign | Alaska Paradise Travel \ / - NO HTML/RTF in e-mail | 201 East 9Th Avenue Ste.310 X - NO Word docs in e-mail | Anchorage, AK 99501 / \ - Please visit Alaska Paradise - http://www.alaskaparadise.com ---------------------------------------------------------------------------------------
Beech Rintoul napisa?(a): > I have run into a serious portability issue with the new mod_wrap2 that breaks > the build. I have contacted the developers and have gotten limited response. > Actually they have been very good in their support of this port, but an > answer may not be available until after the holiday. In the mean time I'm > working to resolve this issue on my own and any help would be appreciated. > The work in progress port can be found here: > > http://www.alaskaparadise.com/freebsd/proftpd_test.tar.gz > > I hope to have this fixed and committed ASAP. I'm sending patch that solve one problem in Makefile.in in mod_wrap2. Problem with linking still exists. I have no idea where is problem. Best regards michalw
On Thursday 28 December 2006 11:24, Micha? Wójcik wrote: > Beech Rintoul napisa?(a): > > I have run into a serious portability issue with the new mod_wrap2 that > > breaks the build. I have contacted the developers and have gotten limited > > response. Actually they have been very good in their support of this > > port, but an answer may not be available until after the holiday. In the > > mean time I'm working to resolve this issue on my own and any help would > > be appreciated. The work in progress port can be found here: > > > > http://www.alaskaparadise.com/freebsd/proftpd_test.tar.gz > > > > I hope to have this fixed and committed ASAP. > > I'm sending patch that solve one problem in Makefile.in in mod_wrap2. > Problem with linking still exists. I have no idea where is problem. > > Best regards > michalw Thanks, that fixed mod_wrap2, but unfortunately it exposed another build error farther down: cc -L./lib -L/usr/local/lib -L/usr/local/lib -o ftptop utils/ftptop.o utils/scoreboard.o -lncurses -lsupp ./lib/libsupp.a(getopt.o)(.text+0x5c5): In function `_getopt_internal': : undefined reference to `libintl_gettext' ./lib/libsupp.a(getopt.o)(.text+0x687): In function `_getopt_internal': : undefined reference to `libintl_gettext' ./lib/libsupp.a(getopt.o)(.text+0x8b1): In function `_getopt_internal': : undefined reference to `libintl_gettext' ./lib/libsupp.a(getopt.o)(.text+0xa3a): In function `_getopt_internal': : undefined reference to `libintl_gettext' ./lib/libsupp.a(getopt.o)(.text+0xa99): In function `_getopt_internal': : undefined reference to `libintl_gettext' ./lib/libsupp.a(getopt.o)(.text+0xb04): more undefined references to `libintl_gettext' follow gmake: *** [ftptop] Error 1 The other linker error was fixed with a patch to getopt.c but it didn't fix this one. I'm working on it. If someone wants to give me a hand it would be appreciated. I updated http://www.alaskaparadise.com/freebsd/proftpd_test.tar.gz with the latest fixes. Beech -- --------------------------------------------------------------------------------------- Beech Rintoul - Sys. Administrator - beech@alaskaparadise.com /"\ ASCII Ribbon Campaign | Alaska Paradise Travel \ / - NO HTML/RTF in e-mail | 201 East 9Th Avenue Ste.310 X - NO Word docs in e-mail | Anchorage, AK 99501 / \ - Please visit Alaska Paradise - http://www.alaskaparadise.com ---------------------------------------------------------------------------------------
Here is the final set of patches. All errors that I could find have been fixed. diff -ruN --exclude=CVS /usr/ports/ftp/proftpd.orig/Makefile /usr/ports/ftp/proftpd/Makefile --- /usr/ports/ftp/proftpd.orig/Makefile Tue Dec 26 07:59:14 2006 +++ /usr/ports/ftp/proftpd/Makefile Thu Dec 28 20:19:07 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/ \ @@ -54,11 +55,10 @@ WRAP "Include mod_wrap2" on \ WRAP_FILE "include mod_wrap2_file" off \ WRAP_SQL "include mod_wrap2_sql" off \ - LANG "include mod_lang" off \ RADIUS "Include mod_radius" off \ QUOTATAB_RADIUS "include mod_quotatab_radius" off \ BAN "include mod_ban (Requires CTRLS)" off \ - NLS "Use nls" off + NLS "Use nls-builds mod_lang" off MODULES?= LIBDIRS?= @@ -109,10 +109,6 @@ MODULES:=${MODULES}:mod_quotatab_radius .endif -.if defined(WITH_LANG) -MODULES:=${MODULES}:mod_lang -.endif - .if defined(WITH_BAN) MODULES:=${MODULES}:mod_ban .endif @@ -137,10 +133,13 @@ INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib CONFIGURE_ARGS+= --enable-nls +USE_GETTEXT=yes +PROFTPD_LIBS+= -lintl -L${LOCALBASE}/lib +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-nls-Makefile.in .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?= @@ -218,6 +217,7 @@ pre-configure: @${ECHO_MSG} "==> Configuring with ${MODULES}" + @${ECHO_MSG} "==> ${CONFIGURE_ENV}" post-configure: ${REINPLACE_CMD} -e 's:${EXAMPLESDIR}:${PREFIX}:' ${WRKSRC}/config.h diff -ruN --exclude=CVS /usr/ports/ftp/proftpd.orig/files/extra-patch-nls-Makefile.in /usr/ports/ftp/proftpd/files/extra-patch-nls-Makefile.in --- /usr/ports/ftp/proftpd.orig/files/extra-patch-nls-Makefile.in Wed Dec 31 14:00:00 1969 +++ /usr/ports/ftp/proftpd/files/extra-patch-nls-Makefile.in Thu Dec 28 19:19:31 2006 @@ -0,0 +1,15 @@ +--- Makefile.in Fri Dec 29 09:19:12 2006 ++++ Makefile.in.new Fri Dec 29 09:19:22 2006 +@@ -63,10 +63,10 @@ + $(CC) $(LDFLAGS) -o $@ $(BUILD_FTPSHUT_OBJS) + + ftptop$(EXEEXT): lib utils +- $(CC) $(LDFLAGS) -o $@ $(BUILD_FTPTOP_OBJS) $(CURSES_LIBS) -lsupp ++ $(CC) $(LDFLAGS) -o $@ $(BUILD_FTPTOP_OBJS) $(CURSES_LIBS) -lsupp -lintl + + ftpwho$(EXEEXT): lib utils +- $(CC) $(LDFLAGS) -o $@ $(BUILD_FTPWHO_OBJS) -lsupp ++ $(CC) $(LDFLAGS) -o $@ $(BUILD_FTPWHO_OBJS) -lsupp -lintl + + + # BSD install -d doesn't work, so ... diff -ruN --exclude=CVS /usr/ports/ftp/proftpd.orig/files/patch-contrib-mod_wrap2-Makefile.in /usr/ports/ftp/proftpd/files/patch-contrib-mod_wrap2-Makefile.in --- /usr/ports/ftp/proftpd.orig/files/patch-contrib-mod_wrap2-Makefile.in Wed Dec 31 14:00:00 1969 +++ /usr/ports/ftp/proftpd/files/patch-contrib-mod_wrap2-Makefile.in Thu Dec 28 11:44:08 2006 @@ -0,0 +1,11 @@ +--- contrib/mod_wrap2/Makefile.in.orig Wed Sep 6 15:11:47 2006 ++++ contrib/mod_wrap2/Makefile.in Thu Dec 28 11:41:24 2006 +@@ -13,7 +13,7 @@ + MODULE_NAME=mod_wrap2 + + # Necessary redefinitions +-INCLUDES=-I. -I../.. -I../../include ++INCLUDES=-I. -I../.. -I../../include -I/usr/local/include + CPPFLAGS= -DHAVE_CONFIG_H $(DEFAULT_PATHS) $(PLATFORM) $(INCLUDES) + LDFLAGS=-L../../lib + 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' -- --------------------------------------------------------------------------------------- Beech Rintoul - Sys. Administrator - beech@alaskaparadise.com /"\ ASCII Ribbon Campaign | Alaska Paradise Travel \ / - NO HTML/RTF in e-mail | 201 East 9Th Avenue Ste.310 X - NO Word docs in e-mail | Anchorage, AK 99501 / \ - Please visit Alaska Paradise - http://www.alaskaparadise.com ---------------------------------------------------------------------------------------
miwi 2006-12-30 22:45:40 UTC FreeBSD ports repository Modified files: ftp/proftpd Makefile Added files: ftp/proftpd/files extra-patch-nls-Makefile.in patch-contrib-mod_wrap2-Makefile.in patch-getopt.c Log: - Fixed Makefile - Added patch - patch-getopt.c (Upgrades lib/getopt.c to version 1.4 - Bumped PORTREVISION PR: ports/107221 ports/107107 ports/105947 Submitted by: Beech Rintoul <beech@alaskaparadise.com> (maintainer) Johan Svensson<johan@loxley.se> Matus UHLAR - fantomas<uhlar@fantomas.sk> Revision Changes Path 1.96 +6 -7 ports/ftp/proftpd/Makefile 1.1 +15 -0 ports/ftp/proftpd/files/extra-patch-nls-Makefile.in (new) 1.1 +11 -0 ports/ftp/proftpd/files/patch-contrib-mod_wrap2-Makefile.in (new) 1.1 +20 -0 ports/ftp/proftpd/files/patch-getopt.c (new) _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed. Thanks!