From root@gits.dyndns.org  Sun Oct 28 06:22:56 2001
Return-Path: <root@gits.dyndns.org>
Received: from smtp.noos.fr (camus.noos.net [212.198.2.70])
	by hub.freebsd.org (Postfix) with ESMTP id 57AA637B401
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 28 Oct 2001 06:22:48 -0800 (PST)
Received: (qmail 89222550 invoked by uid 0); 28 Oct 2001 14:22:45 -0000
Received: from unknown (HELO gits.dyndns.org) ([212.198.229.145]) (envelope-sender <root@gits.dyndns.org>)
          by 212.198.2.70 (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP
          for <FreeBSD-gnats-submit@freebsd.org>; 28 Oct 2001 14:22:45 -0000
Received: (from root@localhost)
	by gits.dyndns.org (8.11.6/8.11.6) id f9SEMiM32685;
	Sun, 28 Oct 2001 15:22:44 +0100 (CET)
	(envelope-from root)
Message-Id: <200110281422.f9SEMiM32685@gits.dyndns.org>
Date: Sun, 28 Oct 2001 15:22:44 +0100 (CET)
From: Cyrille Lefevre <clefevre@citeweb.net>
Reply-To: Cyrille Lefevre <clefevre@citeweb.net>
To: FreeBSD-gnats-submit@freebsd.org
Subject: Maintainer update: mail/elm+ME (2.4.95a)
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         31553
>Category:       ports
>Synopsis:       Maintainer update: mail/elm+ME (2.4.95a)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Oct 28 06:30:00 PST 2001
>Closed-Date:    Thu Nov 1 15:07:30 PST 2001
>Last-Modified:  Thu Nov 01 15:07:47 PST 2001
>Originator:     Cyrille Lefevre
>Release:        FreeBSD 4.4-STABLE i386
>Organization:
ACME
>Environment:
System: FreeBSD gits 4.4-STABLE FreeBSD 4.4-STABLE #9: Sun Oct 21 22:55:26 CEST 2001 root@gits:/disk2/4.x-stable/src/sys/compile/CUSTOM i386

>Description:
	Makefile
		PORTVERSION bumped and heuristique changed
		non conforming MASTER_SITES commented
		elmrc-write.1 added to MAN1
		install-global-rc-file target added
	distinfo
		updated
	pkg-plist
		elmrc-write added
		%%LIB_SUBDIR%%/elm.rc heuristic added
		@dirrm %%LIB_SUBDIR%% changed to @unexec rmdir \
		%D/%%LIB_SUBDIR%% since %%LIB_SUBDIR%%/elm.rc may
		not be deleted at deinstallation time.
	scripts/pre-configure
		updated
>How-To-Repeat:
	n/a
>Fix:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/elm+ME/Makefile,v
retrieving revision 1.72
diff -u -r1.72 Makefile
--- Makefile	2001/10/06 18:19:43	1.72
+++ Makefile	2001/10/28 13:59:43
@@ -6,13 +6,9 @@
 #
 
 PORTNAME=	elm+ME
-PORTVERSION=	2.4.94.0c
+PORTVERSION=	2.4.95${PATCHLEVEL}
 CATEGORIES=	mail
-.if ${PORTVERSION:M*[a-z]} == ""
-DISTNAME=	${PORTNAME:S/+ME//}-${PORTVERSION:R}ME+${PORTVERSION:E}
-.else
-DISTNAME=	${PORTNAME:S/+ME//}-${PORTVERSION:R:R}ME+${PORTVERSION:R:E}
-.endif
+DISTNAME=	${PORTNAME:S/+ME//}-${PORTVERSION:R}ME+${PORTVERSION:E:S|${PATCHLEVEL}||}
 
 # here are the main repositories.
 MASTER_SITES=	ftp://ftp.ozone.fmi.fi/KEH/ \
@@ -25,13 +21,12 @@
 		ftp://ftp.eos.hokudai.ac.jp/pub/network/mail/elm-2.4ME+/ \
 		ftp://ftp.win.ne.jp/pub/network/mail/elm-2.4ME+/
 # the following repositories maybe conform to the main repository.
-MASTER_SITES+=	ftp://ftp.unina.it/pub/Unix/pkgs/network/mail/elm-me+/ \
-		ftp://ftp.rge.com/pub/mail/elm/elm-2.4ME+/ \
-		ftp://ftp.uni-trier.de/pub/unix/network/mail/elm-me+/
+# MASTER_SITES+=	ftp://ftp.unina.it/pub/Unix/pkgs/network/mail/elm-me+/ \
+# 		ftp://ftp.rge.com/pub/mail/elm/elm-2.4ME+/ \
+# 		ftp://ftp.uni-trier.de/pub/unix/network/mail/elm-me+/
 PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	${DISTNAME:S/+/+PL/}a.patch.gz \
-		${DISTNAME:S/+/+PL/}b.patch.gz \
-		${DISTNAME:S/+/+PL/}c.patch.gz
+PATCHFILES=	${DISTNAME:S/+/+PL/}a.patch.gz
+PATCHLEVEL=	a
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	clefevre@citeweb.net
@@ -66,8 +61,9 @@
 		LIB_SUBDIR="${LIB_SUBDIR}" SHLIB_SUBDIR="${SHLIB_SUBDIR}"
 
 MAN1=		answer.1 checkalias.1 elm.1 elmalias.1 elmcharset.1 \
-		elmterminal.1 elmunidata.1 fastmail.1 frm.1 listalias.1 \
-		messages.1 newalias.1 newmail.1 printmail.1 readmsg.1
+		elmrc-write.1 elmterminal.1 elmunidata.1 fastmail.1 frm.1 \
+		listalias.1 messages.1 newalias.1 newmail.1 printmail.1 \
+		readmsg.1
 MLINKS=		frm.1 nfrm.1	newmail.1 wnewmail.1
 
 # Local variables
@@ -115,7 +111,7 @@
 #
 
 post-install: install-startup-files install-nls-files \
-	      install-doc-files install-mime-types \
+	      install-doc-files install-mime-types install-global-rc-file \
 	      remove-catman-files remove-catman-links
 
 install-startup-files:
@@ -136,10 +132,24 @@
 install-mime-types:
 	@${INSTALL_DATA} ${FILESDIR}/${MIME_TYPES} \
 		${PREFIX}/${LIB_SUBDIR}/${MIME_TYPES}-dist
-	@if [ ! -f ${PREFIX}/${LIB_SUBDIR}/${MIME_TYPES} ]; then \
-		${INSTALL_DATA} ${FILESDIR}/${MIME_TYPES} \
-			${PREFIX}/${LIB_SUBDIR}; \
-	fi
+.if !exists(${PREFIX}/${LIB_SUBDIR}/${MIME_TYPES})
+	@${INSTALL_DATA} ${FILESDIR}/${MIME_TYPES} \
+		${PREFIX}/${LIB_SUBDIR}
+.endif
+
+# at installation time, elm already has merged changes to the global
+# rc file.  so, the only way to generate a -dist rc file is to
+# backup the original rc file, then to generate the -dist rc file
+# and to restore the backuped rc file. this allow us, at deinstallation
+# time, to not delete an existing customized rc file.
+install-global-rc-file:
+	@${MV} ${PREFIX}/${LIB_SUBDIR}/elm.rc \
+		${PREFIX}/${LIB_SUBDIR}/elm.rc.orig
+	@${PREFIX}/${LIB_SUBDIR}/elmrc-write -G -I
+	@${MV} ${PREFIX}/${LIB_SUBDIR}/elm.rc \
+		${PREFIX}/${LIB_SUBDIR}/elm.rc-dist
+	@${MV} ${PREFIX}/${LIB_SUBDIR}/elm.rc.orig \
+		${PREFIX}/${LIB_SUBDIR}/elm.rc
 
 remove-catman-files:
 .for sect in ${MSECS}
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/mail/elm+ME/distinfo,v
retrieving revision 1.41
diff -u -r1.41 distinfo
--- distinfo	2001/10/06 18:19:43	1.41
+++ distinfo	2001/10/28 02:47:09
@@ -1,4 +1,2 @@
-MD5 (elm-2.4ME+94.tar.gz) = 51e17fea6a2bd8fa49633d07f4047b12
-MD5 (elm-2.4ME+PL94a.patch.gz) = 2f9dafa7e0bfaa8b56566bc876f556ec
-MD5 (elm-2.4ME+PL94b.patch.gz) = 6db19ead83eafc7f6449fbbb9e20ee4c
-MD5 (elm-2.4ME+PL94c.patch.gz) = ca1a71e15b3fcbfc1c782407b8232751
+MD5 (elm-2.4ME+95.tar.gz) = ecb07943ff5e74a71ee39bb2ceb63187
+MD5 (elm-2.4ME+PL95a.patch.gz) = bd686b1cecc3412560d5080b68a9c306
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/mail/elm+ME/pkg-plist,v
retrieving revision 1.15
diff -u -r1.15 pkg-plist
--- pkg-plist	2001/08/30 14:08:27	1.15
+++ pkg-plist	2001/10/28 14:12:12
@@ -27,6 +27,7 @@
 @exec [ ! -f %B/elm.mimetypes ] && cp %B/%f %B/elm.mimetypes
 %%LIB_SUBDIR%%/elmcharset
 %%LIB_SUBDIR%%/elmrc-info
+%%LIB_SUBDIR%%/elmrc-write
 %%LIB_SUBDIR%%/elmterminal
 %%LIB_SUBDIR%%/elmunidata
 %%LIB_SUBDIR%%/prlong
@@ -43,7 +44,11 @@
 %%PORTDOCS%%%%DOC_SUBDIR%%/Ref.fmtd.gz
 %%PORTDOCS%%%%DOC_SUBDIR%%/Users.fmtd.gz
 share/nls/C/elm2.4me+.cat
+@exec if [ -f %D/%%LIB_SUBDIR%%/elm.rc ]; then mv %D/%%LIB_SUBDIR%%/elm.rc %D/%%LIB_SUBDIR%%/elm.rc.orig; fi
+@exec %D/%%LIB_SUBDIR%%/elmrc-write -G -I; mv %D/%%LIB_SUBDIR%%/elm.rc %D/%%LIB_SUBDIR%%/elm.rc-dist
+@exec if [ -f %D/%%LIB_SUBDIR%%/elm.rc.orig ]; then mv %D/%%LIB_SUBDIR%%/elm.rc.orig %D/%%LIB_SUBDIR%%/elm.rc; else cp -p %D/%%LIB_SUBDIR%%/elm.rc-dist %D/%%LIB_SUBDIR%%/elm.rc; fi
+@unexec if cmp -s %D/%%LIB_SUBDIR%%/elm.rc %D/%%LIB_SUBDIR%%/elm.rc-dist; then rm -f %D/%%LIB_SUBDIR%%/elm.rc; fi; rm -f %D/%%LIB_SUBDIR%%/elm.rc-dist
 @dirrm %%LIB_SUBDIR%%/elm.map.bin
-@dirrm %%LIB_SUBDIR%%
+@unexec rmdir %D/%%LIB_SUBDIR%% 2> /dev/null || :
 @dirrm %%SHLIB_SUBDIR%%
 %%PORTDOCS%%@dirrm %%DOC_SUBDIR%%
Index: scripts/pre-configure
===================================================================
RCS file: /home/ncvs/ports/mail/elm+ME/scripts/pre-configure,v
retrieving revision 1.29
diff -u -r1.29 pre-configure
--- scripts/pre-configure	2001/08/30 14:09:10	1.29
+++ scripts/pre-configure	2001/10/28 02:51:56
@@ -22,6 +22,7 @@
 contains='grep'
 cppstdin='/usr/bin/cpp'
 cppminus=''
+diff='/usr/bin/diff'
 d_getopt='define'
 d_memcpy='define'
 d_symlink='define'
@@ -64,8 +65,11 @@
 rm
 sed
 sleep
+sort
+diff
 touch
 tr
+uniq
 cut
 '
 expr='/bin/expr'
>Release-Note:
>Audit-Trail:

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
State-Changed-From-To: open->closed 
State-Changed-By: demon 
State-Changed-When: Thu Nov 1 15:07:30 PST 2001 
State-Changed-Why:  
Committed, thanks. 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=31553 
>Unformatted:
