Date: Wed, 31 Oct 2001 16:20:02 -0800 (PST) From: Cyrille Lefevre <clefevre@citeweb.net> To: freebsd-ports@FreeBSD.org Subject: Re: ports/31553: Maintainer update: mail/elm+ME (2.4.95a) Message-ID: <200111010020.fA10K2Z07439@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/31553; it has been noted by GNATS.
From: Cyrille Lefevre <clefevre@citeweb.net>
To: freebsd-gnats-submit@FreeBSD.org
Cc:
Subject: Re: ports/31553: Maintainer update: mail/elm+ME (2.4.95a)
Date: Thu, 1 Nov 2001 01:10:41 +0100 (CET)
the following patch is a superset to the upgrade patch. it fix a
problem which prevent to open some messages when linked w/ ports/iconv
instead if ports/libiconv (GNU).
impacted files are :
Makefile
LIB_DEPENDS changed to libiconv
files/patch-shared_libs-iconv-config
files/patch-shared_libs-iconv-elmiconv.h
new files
scripts/pre-configure
iconv changed to giconv
also, -g in CFLAGS implies -DDEBUG macro which
allow -d elm option.
diff -ruN -x CVS -x work -x #* -x *~ -x *.orig -x *.rej -I $Id.*$ -I $FreeBSD.*$ /tmp/ports/mail/elm+ME/Makefile ./Makefile
--- /tmp/ports/mail/elm+ME/Makefile Thu Nov 1 01:01:03 2001
+++ ./Makefile Thu Nov 1 00:58:33 2001
@@ -31,7 +31,7 @@
MAINTAINER= clefevre@citeweb.net
-LIB_DEPENDS= iconv.2:${PORTSDIR}/converters/iconv
+LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv
# not needed since config.sh is generated by scripts/pre-configure.
# BUILD_DEPENDS= ispell:${PORTSDIR}/textproc/ispell
diff -ruN -x CVS -x work -x #* -x *~ -x *.orig -x *.rej -I $Id.*$ -I $FreeBSD.*$ /tmp/ports/mail/elm+ME/files/patch-shared_libs-iconv-config ./files/patch-shared_libs-iconv-config
--- /tmp/ports/mail/elm+ME/files/patch-shared_libs-iconv-config Thu Jan 1 01:00:00 1970
+++ ./files/patch-shared_libs-iconv-config Thu Nov 1 00:25:17 2001
@@ -0,0 +1,113 @@
+--- shared_libs/iconv/config.orig Sun Oct 7 17:13:24 2001
++++ shared_libs/iconv/config Thu Nov 1 00:23:10 2001
+@@ -22,23 +22,23 @@
+ iconv_dir=system
+ ;;
+ systemlib)
+- if $test -r /usr/include/iconv.h
++ if $test -r /usr/include/giconv.h
+ then
+- echo "Found <iconv.h> from system headers"
++ echo "Found <giconv.h> from system headers"
+ iconv_dir=systemlib
+ fi
+ ;;
+ *)
+- if $test -r $a/include/iconv.h -a \
+- "`$ls $a/$libdirname/libiconv.* 2>/dev/null`" != ""
++ if $test -r $a/include/giconv.h -a \
++ "`$ls $a/$libdirname/libgiconv.* 2>/dev/null`" != ""
+ then
+ iconv_dir="$a"
+- echo "Found GNU libiconv from $iconv_dir"
+- elif $test -r $a/include/iconv.h -a \
+- "`$ls $a/lib/libiconv.* 2>/dev/null`" != ""
++ echo "Found GNU libgiconv from $iconv_dir"
++ elif $test -r $a/include/giconv.h -a \
++ "`$ls $a/lib/libgiconv.* 2>/dev/null`" != ""
+ then
+ iconv_dir="$a"
+- echo "Found GNU libiconv from $iconv_dir"
++ echo "Found GNU libgiconv from $iconv_dir"
+ fi
+ ;;
+ esac
+@@ -48,23 +48,23 @@
+
+ cat <<EOM
+
+-Elm ME+ can use GNU libiconv for character set conversions.
++Elm ME+ can use GNU libgiconv for character set conversions.
+ Support is implemented as shared library libelmme-iconv.so.
+
+ Give directory under which there are library and include files of OpenSSL.
+
+ Give "none" to disabled generation of shared library.
+-Give "system" to indicate that GNU libiconv include and library files
++Give "system" to indicate that GNU libgiconv include and library files
+ are search path of compiler.
+
+-Give "systemlib" to indicate that <iconv.h> and iconv routines are
++Give "systemlib" to indicate that <giconv.h> and iconv routines are
+ on system native library instead. That works on IRIX 6.5. It works also
+ Linux with (some) glibc 2.x.
+
+ EOM
+ dflt="$iconv_dir"
+
+- rp="GNU libiconv directory prefix? [$dflt]"
++ rp="GNU libgiconv directory prefix? [$dflt]"
+ echo $n "$rp $c"
+ . myread
+
+@@ -79,8 +79,8 @@
+ iconv_lib_dir=''
+ iconv_dir=system
+ iconv_ok="$define"
+- iconv_link=iconv
+- echo "GNU libiconv is assumed to found from system locations"
++ iconv_link=giconv
++ echo "GNU libgiconv is assumed to found from system locations"
+ ;;
+ systemlib)
+ iconv_include_dir=''
+@@ -93,23 +93,23 @@
+ *)
+ iconv_dir="$ans"
+ iconv_include_dir="$iconv_dir/include"
+- X="`$ls $iconv_dir/$libdirname/libiconv.* 2>/dev/null`"
++ X="`$ls $iconv_dir/$libdirname/libgiconv.* 2>/dev/null`"
+ if $test "$X" != ""
+ then
+ iconv_lib_dir="$iconv_dir/$libdirname"
+ else
+ iconv_lib_dir="$iconv_dir/lib"
+ fi
+- iconv_link=iconv
++ iconv_link=giconv
+ iconv_ok="$define"
+- echo "GNU libiconv is assumed to found from $iconv_dir directory"
++ echo "GNU libgiconv is assumed to found from $iconv_dir directory"
+ ;;
+ esac
+
+ if $test "$iconv_ok" = "$define"; then
+ $cat >try.c <<'EOF'
+ #include "stdio.h"
+-#include <iconv.h>
++#include <giconv.h>
+
+ int main(argc,argv)
+ int argc;
+@@ -164,9 +164,9 @@
+ '')
+ cat <<EOF
+
+-GNU libiconv location $iconv_dir seems not work. Select one of following
++GNU libgiconv location $iconv_dir seems not work. Select one of following
+ d) Disable iconv support
+- c) Change GNU libiconv directory prefix
++ c) Change GNU libgiconv directory prefix
+
+ EOF
+ dflt=d
diff -ruN -x CVS -x work -x #* -x *~ -x *.orig -x *.rej -I $Id.*$ -I $FreeBSD.*$ /tmp/ports/mail/elm+ME/files/patch-shared_libs-iconv-elmiconv.h ./files/patch-shared_libs-iconv-elmiconv.h
--- /tmp/ports/mail/elm+ME/files/patch-shared_libs-iconv-elmiconv.h Thu Jan 1 01:00:00 1970
+++ ./files/patch-shared_libs-iconv-elmiconv.h Thu Nov 1 00:25:41 2001
@@ -0,0 +1,11 @@
+--- shared_libs/iconv/elmiconv.h.orig Wed Oct 31 09:23:34 2001
++++ shared_libs/iconv/elmiconv.h Thu Nov 1 00:24:13 2001
+@@ -8,7 +8,7 @@
+
+ #include "elmshared.h"
+
+-#include <iconv.h>
++#include <giconv.h>
+
+ #include "../../hdrs/cs_imp.h"
+
diff -ruN -x CVS -x work -x #* -x *~ -x *.orig -x *.rej -I $Id.*$ -I $FreeBSD.*$ /tmp/ports/mail/elm+ME/scripts/pre-configure ./scripts/pre-configure
--- /tmp/ports/mail/elm+ME/scripts/pre-configure Thu Nov 1 01:01:03 2001
+++ ./scripts/pre-configure Thu Nov 1 00:39:13 2001
@@ -10,6 +10,11 @@
[ -d ${WRKSRC}/shlib ] || mkdir ${WRKSRC}/shlib
+case ${CFLAGS} in
+*-g*) DEBUG="-DDEBUG" ;;
+*) DEBUG= ;;
+esac
+
cat > ${WRKSRC}/config.sh << EOF
#!/bin/sh
# config.sh
@@ -298,7 +303,7 @@
suffix=''
packer=''
optimize='${CFLAGS}'
-ccflags='-D_LIBICONV_VERSION=200'
+ccflags='${DEBUG}'
cppflags=''
ldflags='-s'
cc='cc'
@@ -343,7 +348,7 @@
iconv_dir='${LOCALBASE}'
iconv_include_dir='${LOCALBASE}/include'
iconv_lib_dir='${LOCALBASE}/lib'
-iconv_link='iconv'
+iconv_link='giconv'
EOF
mv ${WRKSRC}/shared_libs/tls/README.ME+ \
Cyrille.
--
Cyrille Lefevre mailto:clefevre@citeweb.net
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200111010020.fA10K2Z07439>