Date: 19 Mar 2004 01:58:11 -0000 From: Aaron Bannert <aaron-freebsd-ports@clove.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/64442: packaging fix and update for broken net/gale port Message-ID: <20040319015811.83585.qmail@mailhost.clove.org> Resent-Message-ID: <200403190200.i2J20Tgd037335@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 64442 >Category: ports >Synopsis: packaging fix and update for broken net/gale port >Confidential: no >Severity: serious >Priority: high >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Thu Mar 18 18:00:29 PST 2004 >Closed-Date: >Last-Modified: >Originator: Aaron Bannert >Release: FreeBSD 4.9-STABLE i386 >Organization: >Environment: System: FreeBSD grover.clove.org 4.9-STABLE FreeBSD 4.9-STABLE #4: Wed Mar 17 17:39:31 PST 2004 aaron@grover.clove.org:/usr/obj/usr/src/sys/turbo i386 >Description: The net/gale port is marked broken because of a packaging failure. I've attached a patch that fixes this packaging failure and also updates the port to the latest version of gale. I've tried contacting the maintainer but received no response. I'd be happy to become the new maintainer. >How-To-Repeat: This problem is being reported on bento, and can be reproduced by running the "package" make target. >Fix: Apparently some change between the older libtool 1.3.3 and freebsd's 1.3.5 libtool is causing the *.la files not to be copied into the destination lib directory. Since the pkg-plist still contains these files, pkg_create is not able to find them and fails. Removing the libgale.la from the pkg-plist would work, but wouldn't be robust. The attached patch fixes the *.la install problem, and also updates to the latest version of gale. Also note the added dependency on expat, which is only necessary because libwww doesn't remember its own shared library dependencies. The patch should remove the old files/patch-* files, as well as add some new ones, but I'm not sure if I did that correctly (it's obvious from the patch what needs to be removed). I've tested it in my own environment, but I don't have a -CURRENT machine to test against. --- gale-fbsd-port-fruit.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/net/gale/Makefile,v retrieving revision 1.18 diff -u -u -r1.18 Makefile --- Makefile 22 Feb 2004 01:22:45 -0000 1.18 +++ Makefile 28 Feb 2004 02:11:06 -0000 @@ -6,23 +6,24 @@ # PORTNAME= gale -PORTVERSION= 0.99e +PORTVERSION= 0.99f CATEGORIES= net -MASTER_SITES= http://www.mit.edu/afs/sipb/project/gale/src/ \ - # http://download.ofb.net/gale/ - original mastersite -DISTNAME= ${PORTNAME}-${PORTVERSION}gg +MASTER_SITES= http://download.ofb.net/gale/ +DISTNAME= ${PORTNAME}-${PORTVERSION}ruit MAINTAINER= peterh@sapros.com COMMENT= A secure instant messaging system BUILD_DEPENDS= ${LOCALBASE}/lib/libgc.a:${PORTSDIR}/devel/boehm-gc LIB_DEPENDS= wwwcore.1:${PORTSDIR}/www/libwww \ - adns.1:${PORTSDIR}/dns/adns + adns.1:${PORTSDIR}/dns/adns \ + expat.4:${PORTSDIR}/textproc/expat2 +#USE_BZIP2= yes USE_OPENSSL= yes -USE_AUTOCONF_VER=213 -USE_AUTOMAKE_VER=14 -USE_LIBTOOL= yes +WANT_AUTOCONF_VER=257 +WANT_AUTOMAKE_VER=15 +USE_LIBTOOL_VER=15 INSTALLS_SHLIB= yes CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib @@ -31,12 +32,16 @@ LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -BROKEN= "Broken pkg-plist" -DEPRECATED= ${BROKEN} -EXPIRATION_DATE=2004-04-07 - pre-configure: - cd ${WRKSRC} && ${ACLOCAL} -I ${LIBTOOL_SHAREDIR}/libltdl + cd ${WRKSRC} && ${LIBTOOLIZE} --copy --force + cd ${WRKSRC} && ${ACLOCAL} + cd ${WRKSRC} && ${AUTOHEADER} + cd ${WRKSRC} && ${AUTOMAKE} --add-missing + cd ${WRKSRC} && ${AUTOCONF} + cd ${WRKSRC}/liboop && ${LIBTOOLIZE} --copy --force + cd ${WRKSRC}/liboop && ${ACLOCAL} + cd ${WRKSRC}/liboop && ${AUTOMAKE} --add-missing + cd ${WRKSRC}/liboop && ${AUTOCONF} post-install: @${CAT} ${PKGMESSAGE} Index: distinfo =================================================================== RCS file: /home/ncvs/ports/net/gale/distinfo,v retrieving revision 1.3 diff -u -u -r1.3 distinfo --- distinfo 25 Nov 2001 00:12:27 -0000 1.3 +++ distinfo 28 Feb 2004 02:11:06 -0000 @@ -1 +1 @@ -MD5 (gale-0.99egg.tar.gz) = 5240b10de2c7998887b3bc3dd7e8b30b +MD5 (gale-0.99fruit.tar.gz) = b3bd4c412037d7e63fa9fde556045934 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/net/gale/pkg-plist,v retrieving revision 1.4 diff -u -u -r1.4 pkg-plist --- pkg-plist 25 Nov 2001 00:12:27 -0000 1.4 +++ pkg-plist 28 Feb 2004 02:11:06 -0000 @@ -28,33 +28,26 @@ include/oop-www.h include/oop.h lib/libgale.a -lib/libgale.la lib/libgale.so -lib/libgale.so.12 +lib/libgale.so.14 lib/liboop-adns.a -lib/liboop-adns.la lib/liboop-adns.so lib/liboop-adns.so.2 lib/liboop-glib.a -lib/liboop-glib.la lib/liboop-glib.so lib/liboop-glib.so.1 lib/liboop-rl.a -lib/liboop-rl.la lib/liboop-rl.so lib/liboop-rl.so.0 lib/liboop-tcl.a -lib/liboop-tcl.la lib/liboop-tcl.so lib/liboop-tcl.so.0 lib/liboop-www.a -lib/liboop-www.la lib/liboop-www.so lib/liboop-www.so.0 lib/liboop.a -lib/liboop.la lib/liboop.so -lib/liboop.so.3 +lib/liboop.so.4 sbin/gksign @exec mkdir -m 1777 %D/etc/gale/auth/cache @exec mkdir -m 1777 %D/etc/gale/auth/local --- /dev/null Fri Feb 27 18:05:55 2004 +++ files/patch-liboopconfigure.ac Fri Feb 27 17:36:32 2004 @@ -0,0 +1,11 @@ +--- ../gale-0.99fruit.orig/liboop/configure.ac Tue Dec 31 08:46:36 2002 ++++ ./liboop/configure.ac Fri Feb 27 17:35:26 2004 +@@ -70,7 +70,7 @@ + WWW_LIBS=" \ + -lwwwapp -lwwwcache -lwwwcore -lwwwdir -lwwwfile -lwwwftp -lwwwgopher \ + -lwwwhtml -lwwwhttp -lwwwinit -lwwwmime -lwwwmux -lwwwnews -lwwwstream \ +- -lwwwtelnet -lwwwtrans -lwwwutils -lwwwzip -lmd5" ++ -lwwwtelnet -lwwwtrans -lwwwutils -lwwwzip -lmd5 -lwwwxml -lexpat" + WWW_INCLUDES="-I/usr/include/w3c-libwww" # the libwww RPM puts headers here + ],,-lwwwutils) + --- files/patch-acinclude.m4 Fri Feb 27 18:11:46 2004 +++ /dev/null Fri Feb 27 18:05:55 2004 @@ -1,114 +0,0 @@ -diff -u -N /tmp/gale-0.99egg/acinclude.m4 ./acinclude.m4 ---- /tmp/gale-0.99egg/acinclude.m4 Wed Dec 31 16:00:00 1969 -+++ ./acinclude.m4 Tue Nov 6 13:55:13 2001 -@@ -0,0 +1,110 @@ -+dnl This is a subroutine of AC_OUTPUT. -+dnl It is called after running config.status. -+dnl AC_OUTPUT_SUBDIRS(DIRECTORY...) -+define([AC_OUTPUT_SUBDIRS], -+[ -+ifdef([AC_PROVIDE_AC_PROG_INSTALL], [ac_given_INSTALL="$INSTALL" -+])dnl -+if test "$no_recursion" != yes; then -+ -+ # Remove --cache-file and --srcdir arguments so they do not pile up. -+ ac_sub_configure_args= -+ ac_prev= -+ for ac_arg in $ac_configure_args; do -+ if test -n "$ac_prev"; then -+ ac_prev= -+ continue -+ fi -+ case "$ac_arg" in -+ -cache-file | --cache-file | --cache-fil | --cache-fi \ -+ | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) -+ ac_prev=cache_file ;; -+ -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ -+ | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) -+ ;; -+ -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) -+ ac_prev=srcdir ;; -+ -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) -+ ;; -+ *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;; -+ esac -+ done -+ -+ for ac_config_dir in $1; do -+ -+ # Do not complain, so a configure script can configure whichever -+ # parts of a large source tree are present. -+ if test ! -d $srcdir/$ac_config_dir; then -+ continue -+ fi -+ -+ echo configuring in $ac_config_dir -+ -+ case "$srcdir" in -+ .) ;; -+ *) -+ if test -d ./$ac_config_dir || mkdir ./$ac_config_dir; then :; -+ else -+ AC_MSG_ERROR(can not create `pwd`/$ac_config_dir) -+ fi -+ ;; -+ esac -+ -+ ac_popdir=`pwd` -+ cd $ac_config_dir -+ -+changequote(, )dnl -+ # A "../" for each directory in /$ac_config_dir. -+ ac_dots=`echo $ac_config_dir|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'` -+changequote([, ])dnl -+ -+ case "$srcdir" in -+ .) # No --srcdir option. We are building in place. -+ ac_sub_srcdir=$srcdir ;; -+ /*) # Absolute path. -+ ac_sub_srcdir=$srcdir/$ac_config_dir ;; -+ *) # Relative path. -+ ac_sub_srcdir=$ac_dots$srcdir/$ac_config_dir ;; -+ esac -+ -+ # Check for guested configure; otherwise get Cygnus style configure. -+ if test -f $ac_sub_srcdir/configure; then -+ ac_sub_configure=$ac_sub_srcdir/configure -+ elif test -f $ac_sub_srcdir/configure.in; then -+ ac_sub_configure=$ac_configure -+ else -+ AC_MSG_WARN(no configuration information is in $ac_config_dir) -+ ac_sub_configure= -+ fi -+ -+ # The recursion is here. -+ if test -n "$ac_sub_configure"; then -+ -+ # Make the cache file name correct relative to the subdirectory. -+ case "$cache_file" in -+ /*) ac_sub_cache_file=$cache_file ;; -+ *) # Relative path. -+ ac_sub_cache_file="$ac_dots$cache_file" ;; -+ esac -+ifdef([AC_PROVIDE_AC_PROG_INSTALL], -+ [ case "$ac_given_INSTALL" in -+changequote(, )dnl -+ [/$]*) INSTALL="$ac_given_INSTALL" ;; -+changequote([, ])dnl -+ *) INSTALL="$ac_dots$ac_given_INSTALL" ;; -+ esac -+])dnl -+ -+ echo "[running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file] --srcdir=$ac_sub_srcdir" -+ # The eval makes quoting arguments work. -+ if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir -+ then : -+ else -+ AC_MSG_ERROR($ac_sub_configure failed for $ac_config_dir) -+ fi -+ fi -+ -+ cd $ac_popdir -+ done -+fi -+]) --- files/patch-wcwidth Fri Feb 27 18:11:46 2004 +++ /dev/null Fri Feb 27 18:05:55 2004 @@ -1,20 +0,0 @@ ---- /tmp/wcwidth.c.orig Fri Oct 25 21:05:46 2002 -+++ libgale/wcwidth.c Fri Oct 25 21:05:51 2002 -@@ -6,10 +6,16 @@ - * Markus Kuhn -- 2000-02-08 -- public domain - */ - --#ifdef __FreeBSD__ /* peterh@sapros.com */ -+#ifdef __FreeBSD__ -+#include <osreldate.h> -+#if __FreeBSD_version >= 500000 -+#include <wchar.h> -+#else - #include <rune.h> - #endif -+#else - #include <wchar.h> -+#endif - - /* These functions define the column width of an ISO 10646 character - * as follows: --- gale-fbsd-port-fruit.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040319015811.83585.qmail>