Date: Sun, 28 Oct 2001 15:22:44 +0100 (CET) From: Cyrille Lefevre <clefevre@citeweb.net> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/31553: Maintainer update: mail/elm+ME (2.4.95a) Message-ID: <200110281422.f9SEMiM32685@gits.dyndns.org>
next in thread | raw e-mail | index | archive | help
>Number: 31553
>Category: ports
>Synopsis: Maintainer update: mail/elm+ME (2.4.95a)
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Oct 28 06:30:00 PST 2001
>Closed-Date:
>Last-Modified:
>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:
>Unformatted:
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?200110281422.f9SEMiM32685>