summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mail/elm-me/Makefile10
-rw-r--r--mail/elm-me/distinfo12
-rw-r--r--mail/elm-me/patches/patch-ab18
-rw-r--r--mail/elm-me/patches/patch-cb19
-rw-r--r--mail/elm-me/patches/patch-cd99
-rw-r--r--mail/elm-me/patches/patch-ce20
-rw-r--r--mail/elm-me/patches/patch-cf110
-rw-r--r--mail/elm-me/patches/patch-cg24
8 files changed, 296 insertions, 16 deletions
diff --git a/mail/elm-me/Makefile b/mail/elm-me/Makefile
index a19eced8682..62b9eab624f 100644
--- a/mail/elm-me/Makefile
+++ b/mail/elm-me/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2009/06/30 00:07:19 joerg Exp $
+# $NetBSD: Makefile,v 1.31 2010/04/15 08:13:34 dholland Exp $
DISTNAME= elm-2.4ME+93
PKGNAME= elm-me-2.4.93
@@ -10,6 +10,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.instinct.org/elm/
COMMENT= ELM Mail User Agent with ME extensions
+PKG_DESTDIR_SUPPORT= user-destdir
+
MAKE_JOBS_SAFE= no
CONFLICTS= elm-[0-9]*
@@ -35,6 +37,10 @@ SUBST_MESSAGE.errno= Fixing declaration of errno.
SUBST_FILES.errno= */*.c
SUBST_SED.errno= -e 's,^extern int errno;,\#include <errno.h>,'
+# currently not set in files/config.sh
+# (should probably be a package option)
+#SPECIAL_PERMS+= bin/elm ${ROOT_USER} mail 2755
+
pre-configure:
${CP} ${FILESDIR}/config.sh ${WRKSRC}/
${MV} ${WRKSRC}/nls/LANGS ${WRKSRC}/nls/LANGS.tmpl
@@ -42,7 +48,7 @@ pre-configure:
post-install:
${INSTALL_DATA} ${FILESDIR}/elm.mimetypes \
- ${PREFIX}/lib/elm.mimetypes-dist
+ ${DESTDIR}${PREFIX}/lib/elm.mimetypes-dist
post-configure:
${TOUCH} ${WRKSRC}/config.sh
diff --git a/mail/elm-me/distinfo b/mail/elm-me/distinfo
index 503d55f3bc3..576cd4823d3 100644
--- a/mail/elm-me/distinfo
+++ b/mail/elm-me/distinfo
@@ -1,17 +1,19 @@
-$NetBSD: distinfo,v 1.4 2008/01/05 19:21:00 rillig Exp $
+$NetBSD: distinfo,v 1.5 2010/04/15 08:13:34 dholland Exp $
SHA1 (elm-2.4ME+93.tar.gz) = 2ce3cee8eb7af9b73e11fb99b901357b1bd5cd4d
RMD160 (elm-2.4ME+93.tar.gz) = 46b36b2fdc78924ffbbced66c93defa431508e29
Size (elm-2.4ME+93.tar.gz) = 1569204 bytes
SHA1 (patch-aa) = 22f5b0219ada56c90cd26b47e9f5beac3af00c4a
-SHA1 (patch-ab) = 288893a202522d3197cd5092273c1dfbcd31f3da
+SHA1 (patch-ab) = 6445b6573934c9497c15050917da6738e883c576
SHA1 (patch-ac) = c76cbb5adc548bdc68fc860063e5280ff90d7e59
SHA1 (patch-ad) = 73875671aa53548e1cbe1bfae56acb4792ee4b24
SHA1 (patch-ae) = 600dbb380442dcbaef51c69d81847b400538bf0f
SHA1 (patch-bb) = ba9a5645f5dbc66723e8a6b21666b4009fe31f66
SHA1 (patch-bv) = dc11b6ef449d041ff63055924686d2da2138088f
SHA1 (patch-ca) = df5ea5f20ffc2c26f8ba2cd5d3a341fbd0ec6f54
-SHA1 (patch-cb) = 2f9dde23fbe375be32d91b6df60c81427c7bf3d0
+SHA1 (patch-cb) = ba7c02eb16746f04c2abf264dd73ed73bcdad8ba
SHA1 (patch-cc) = 59cae75adfd90c2a14f6c55e83b36bc701cbed97
-SHA1 (patch-cd) = 63f9d58211888d9383e0b2b3d62c0d08ff94d78b
-SHA1 (patch-ce) = 3b692fb3814ceca41c3ba192398468166b46d64b
+SHA1 (patch-cd) = f734efccc0f0c99637a3a527a920e6aa5543da48
+SHA1 (patch-ce) = 862968b558af3a30b2a523566f5e327d579e3f87
+SHA1 (patch-cf) = 4a5c2a09d90358bde1697bb79e09944014a3da72
+SHA1 (patch-cg) = 75e26fab55016ccbe6b1c248d7fd31150971f36d
diff --git a/mail/elm-me/patches/patch-ab b/mail/elm-me/patches/patch-ab
index 68039ccf894..c7957c1b988 100644
--- a/mail/elm-me/patches/patch-ab
+++ b/mail/elm-me/patches/patch-ab
@@ -1,7 +1,10 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/07/18 19:59:14 martin Exp $
+$NetBSD: patch-ab,v 1.2 2010/04/15 08:13:34 dholland Exp $
---- nls/Makefile.orig Thu Nov 18 14:41:07 1999
-+++ nls/Makefile Thu Nov 18 14:46:27 1999
+use right gencat
+DESTDIR support
+
+--- nls/Makefile.orig 2001-06-19 17:03:18.000000000 +0000
++++ nls/Makefile
@@ -3,7 +3,7 @@
#
LANGFILE=LANGS
@@ -11,3 +14,12 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/07/18 19:59:14 martin Exp $
HDIR= ../hdrs
SDIR= C/C/C
+@@ -41,7 +41,7 @@ nls-headers: clean $(HFILES)
+ all:
+
+ install:
+- ./Install $(LANGFILE) $(GENCAT) $(CATNAME)
++ DESTDIR=$(DESTDIR) ./Install $(LANGFILE) $(GENCAT) $(CATNAME)
+
+ $(HFILES): $(MFILES)
+ gencat/gencat $(MSGCAT) "$(SDIR)/`basename $@ .h`".m -h $@
diff --git a/mail/elm-me/patches/patch-cb b/mail/elm-me/patches/patch-cb
index 27885b921cb..0abf6683cac 100644
--- a/mail/elm-me/patches/patch-cb
+++ b/mail/elm-me/patches/patch-cb
@@ -1,7 +1,22 @@
-$NetBSD: patch-cb,v 1.1 2006/01/24 19:01:45 joerg Exp $
+$NetBSD: patch-cb,v 1.2 2010/04/15 08:13:34 dholland Exp $
---- lib/Makefile.SH.orig 2006-01-24 18:04:57.000000000 +0000
+fix CFLAGS
+DESTDIR support
+
+--- lib/Makefile.SH.orig 2001-06-19 17:03:40.000000000 +0000
+++ lib/Makefile.SH
+@@ -102,9 +102,9 @@ if $test "$d_shared" = "$define" ; then
+
+ cat >>Makefile <<SUBSTITUTE
+ SHLIST = ../shlib/libelmme-base.so
+-INSTLIB = $shlib/libelmme-base.so$d_shared_rev
++INSTLIB = \$(DESTDIR)$shlib/libelmme-base.so$d_shared_rev
+ SONAME = ${soname_opt}$shlib/libelmme-base.so$d_shared_rev
+-SHLIB = $shlib
++SHLIB = \$(DESTDIR)$shlib
+ SUBSTITUTE
+
+ else
@@ -121,7 +121,7 @@ fi
$cat >>Makefile <<'!NO!SUBS!'
diff --git a/mail/elm-me/patches/patch-cd b/mail/elm-me/patches/patch-cd
index 846b2fdfd88..215ff5d65fc 100644
--- a/mail/elm-me/patches/patch-cd
+++ b/mail/elm-me/patches/patch-cd
@@ -1,7 +1,19 @@
-$NetBSD: patch-cd,v 1.1 2006/01/24 19:01:45 joerg Exp $
+$NetBSD: patch-cd,v 1.2 2010/04/15 08:13:34 dholland Exp $
---- src/Makefile.SH.orig 2006-01-24 18:05:41.000000000 +0000
+fix CFLAGS
+DESTDIR support
+
+--- src/Makefile.SH.orig 2001-06-19 17:03:45.000000000 +0000
+++ src/Makefile.SH
+@@ -22,7 +22,7 @@ fi
+
+ case "$d_locale" in
+ define)
+- localetarget='$(LIB)/elm.mimecharsets'
++ localetarget='$(DESTDIR)$(LIB)/elm.mimecharsets'
+ ;;
+ *)
+ localetarget=
@@ -83,7 +83,7 @@ cat >>Makefile <<'!NO!SUBS!'
# Other general variables
@@ -11,3 +23,86 @@ $NetBSD: patch-cd,v 1.1 2006/01/24 19:01:45 joerg Exp $
INCLDIR = ../hdrs
LINTFLAGS = -I$(INCLDIR)
SHELL = /bin/sh
+@@ -216,19 +216,19 @@ ELM_OBJ = addr_util.o \
+ # Standard targets
+ all: Makefile $(BIN)/elm $(SHLIST)
+
+-install: Makefile $(DEST) $(LIB) $(DEST)/elm $(LOCALETARG) $(LIB)/elm.map.bin/unidata.bin
++install: Makefile $(DESTDIR)$(DEST) $(DESTDIR)$(LIB) $(DESTDIR)$(DEST)/elm $(LOCALETARG) $(DESTDIR)$(LIB)/elm.map.bin/unidata.bin
+
+-$(DEST):
+- mkdir $(DEST)
++$(DESTDIR)$(DEST):
++ mkdir $(DESTDIR)$(DEST)
+
+-$(LIB):
+- mkdir $(LIB)
++$(DESTDIR)$(LIB):
++ mkdir $(DESTDIR)$(LIB)
+
+-$(LIB)/elm.map.bin:
+- mkdir $(LIB)/elm.map.bin
++$(DESTDIR)$(LIB)/elm.map.bin:
++ mkdir $(DESTDIR)$(LIB)/elm.map.bin
+
+ uninstall:
+- $(RM) $(DEST)/elm $(LOCALETARG) $(LIB)/elm.map.bin/unidata.bin
++ $(RM) $(DESTDIR)$(DEST)/elm $(LOCALETARG) $(DESTDIR)$(LIB)/elm.map.bin/unidata.bin
+
+ Makefile: Makefile.SH ../config.sh
+ @echo "You must run 'sh Configure -S' or 'sh Configure'"
+@@ -323,17 +323,17 @@ syscall.o: $(INCLDIR)/headers.h $(INCLDI
+ utils.o: $(INCLDIR)/headers.h $(INCLDIR)/s_elm.h $(INCLDIR)/me.h
+
+ # Dependencies and rules for compiling C programs
+-$(BIN)/elm: $& $(ELM_OBJ) ../melib/libme.a ../lib/libutil.a
++$(DESTDIR)$(BIN)/elm: $& $(ELM_OBJ) ../melib/libme.a ../lib/libutil.a
+ $(CC) $(LFLAGS) -o $@ $(ELM_OBJ) ../melib/libme.a ../lib/libutil.a $(LIBS) $(LIB2)
+
+ # Dependencies and rules for installing C programs
+
+-$(LIB)/elm.mimecharsets: $(BIN)/elm.mimecharsets $(BIN)/elmcharset ../ConfTool/killsets
++$(DESTDIR)$(LIB)/elm.mimecharsets: $(BIN)/elm.mimecharsets $(BIN)/elmcharset ../ConfTool/killsets
+ $(BIN)/elmcharset -G -I ../ConfTool/killsets -w $@ $(BIN)/elm.mimecharsets
+ $(CHMOD) u=rw,go=r $@
+
+-$(LIB)/elm.map.bin/unidata.bin: $(LIB) $(LIB)/elm.map.bin ../charset/UNIDATA/UNIDATA2.TXT $(BIN)/elmunidata
+- $(BIN)/elmunidata -I -s ../charset/UNIDATA/UNIDATA2.TXT
++$(DESTDIR)$(LIB)/elm.map.bin/unidata.bin: $(DESTDIR)$(LIB) $(DESTDIR)$(LIB)/elm.map.bin ../charset/UNIDATA/UNIDATA2.TXT $(BIN)/elmunidata
++ $(BIN)/elmunidata -w $@ -s ../charset/UNIDATA/UNIDATA2.TXT
+ $(CHMOD) ugo=r $@
+
+ !NO!SUBS!
+@@ -346,24 +346,26 @@ $(BIN)/elm-shared: $& $(ELM_OBJ) ../meli
+ $(CC) $(LFLAGS) -o $@ $(RPATH) $(ELM_OBJ) ../melib/libme.a ../shlib/libelmme-base.so $(LIBS) $(LIB2)
+
+
+-$(DEST)/elm: $(BIN)/elm-shared
++$(DESTDIR)$(DEST)/elm: $(BIN)/elm-shared
+ -$(MV) $@ $@.old
+ -$(RM) $@.old
+ $(CP) $(BIN)/elm-shared $@
+- $(CHGRP) $(MAILGRP) $@
+- $(CHMOD) $(MAILERMODE) $@
++ $(CHMOD) a+x $@
++ #$(CHGRP) $(MAILGRP) $@
++ #$(CHMOD) $(MAILERMODE) $@
+
+ !NO!SUBS!
+
+ else
+
+ cat >>Makefile <<'!NO!SUBS!'
+-$(DEST)/elm: $(BIN)/elm
++$(DESTDIR)$(DEST)/elm: $(BIN)/elm
+ -$(MV) $@ $@.old
+ -$(RM) $@.old
+ $(CP) $(BIN)/elm $@
+- $(CHGRP) $(MAILGRP) $@
+- $(CHMOD) $(MAILERMODE) $@
++ $(CHMOD) a+x $@
++ #$(CHGRP) $(MAILGRP) $@
++ #$(CHMOD) $(MAILERMODE) $@
+ !NO!SUBS!
+
+ fi
diff --git a/mail/elm-me/patches/patch-ce b/mail/elm-me/patches/patch-ce
index 70af08b7da4..a8427dba2f2 100644
--- a/mail/elm-me/patches/patch-ce
+++ b/mail/elm-me/patches/patch-ce
@@ -1,7 +1,23 @@
-$NetBSD: patch-ce,v 1.1 2006/01/24 19:01:45 joerg Exp $
+$NetBSD: patch-ce,v 1.2 2010/04/15 08:13:34 dholland Exp $
---- utils/Makefile.SH.orig 2006-01-24 18:05:58.000000000 +0000
+fix CFLAGS
+DESTDIR support
+
+--- utils/Makefile.SH.orig 2001-06-19 17:03:48.000000000 +0000
+++ utils/Makefile.SH
+@@ -30,10 +30,10 @@ CC = $cc
+ CCFLAGS = $ccflags $xencf
+ CHMOD = $chmod
+ CP = $cp
+-DEST = $bin
++DEST = \$(DESTDIR)$bin
+ ECHO = $echo
+ LFLAGS = $ldflags $dynamic_opt $xenlf
+-LIB = $lib
++LIB = \$(DESTDIR)$lib
+ LIB2 = $dlopen_lib $libs
+ LIBS = $termlib $dbm
+ LINT = $lint
@@ -74,7 +74,7 @@ fi
cat >>Makefile <<'!NO!SUBS!'
# Other general variables
diff --git a/mail/elm-me/patches/patch-cf b/mail/elm-me/patches/patch-cf
new file mode 100644
index 00000000000..fe2d3c76587
--- /dev/null
+++ b/mail/elm-me/patches/patch-cf
@@ -0,0 +1,110 @@
+$NetBSD: patch-cf,v 1.1 2010/04/15 08:13:34 dholland Exp $
+
+DESTDIR support
+
+--- doc/Makefile.SH~ 2001-06-19 17:03:39.000000000 +0000
++++ doc/Makefile.SH
+@@ -32,12 +32,15 @@ DEST = $bin
+ ECHO = $echo
+ FORMATTER = $roff
+ FORMATTER_OPTS = $roffopts
+-LIB = $lib
++PLIB = $lib
++LIB = \$(DESTDIR)$lib
+ LN = $ln
+ MAKE = $make
+-MAN = $mansrc
++PMAN = $mansrc
++MAN = \$(DESTDIR)$mansrc
+ MANEXT = $manext
+-CATMAN = $catmansrc
++PCATMAN = $catmansrc
++CATMAN = \$(DESTDIR)$catmansrc
+ CATMANEXT = $catmanext
+ RM = $rm -f
+ TBL = $tbl
+@@ -134,42 +137,42 @@ FORMATTED_LIST = Alias.fmtd \
+
+ # Targets
+ all:
+- @if $(TEST) '$(CATMAN)' != none; then $(MAKE) formatted_pages ; else true ; fi
++ @if $(TEST) '$(PCATMAN)' != none; then $(MAKE) formatted_pages ; else true ; fi
+
+ # The following are no-ops
+ lint:
+ clean:
+
+ elm.1.subs: elm.1
+- $(SED) 's"#LIB#"$(LIB)"g;' < elm.1 > elm.1.subs
++ $(SED) 's"#LIB#"$(PLIB)"g;' < elm.1 > elm.1.subs
+ answer.1.subs: answer.1
+- $(SED) 's"#LIB#"$(LIB)"g;' < answer.1 > answer.1.subs
++ $(SED) 's"#LIB#"$(PLIB)"g;' < answer.1 > answer.1.subs
+ chkalias.1.subs: chkalias.1
+- $(SED) 's"#LIB#"$(LIB)"g;' < chkalias.1 > chkalias.1.subs
++ $(SED) 's"#LIB#"$(PLIB)"g;' < chkalias.1 > chkalias.1.subs
+ elmalias.1.subs: elmalias.1
+- $(SED) 's"#LIB#"$(LIB)"g;' < elmalias.1 > elmalias.1.subs
++ $(SED) 's"#LIB#"$(PLIB)"g;' < elmalias.1 > elmalias.1.subs
+ elmcharset.1.subs: elmcharset.1
+- $(SED) 's"#LIB#"$(LIB)"g;' < elmcharset.1 > elmcharset.1.subs
++ $(SED) 's"#LIB#"$(PLIB)"g;' < elmcharset.1 > elmcharset.1.subs
+ elmterminal.1.subs: elmterminal.1
+- $(SED) 's"#LIB#"$(LIB)"g;' < elmterminal.1 > elmterminal.1.subs
++ $(SED) 's"#LIB#"$(PLIB)"g;' < elmterminal.1 > elmterminal.1.subs
+ elmunidata.1.subs: elmunidata.1
+- $(SED) 's"#LIB#"$(LIB)"g;' < elmunidata.1 > elmunidata.1.subs
++ $(SED) 's"#LIB#"$(PLIB)"g;' < elmunidata.1 > elmunidata.1.subs
+ fastmail.1.subs: fastmail.1
+- $(SED) 's"#LIB#"$(LIB)"g;' < fastmail.1 > fastmail.1.subs
++ $(SED) 's"#LIB#"$(PLIB)"g;' < fastmail.1 > fastmail.1.subs
+ frm.1.subs: frm.1
+- $(SED) 's"#LIB#"$(LIB)"g;' < frm.1 > frm.1.subs
++ $(SED) 's"#LIB#"$(PLIB)"g;' < frm.1 > frm.1.subs
+ listalias.1.subs: listalias.1
+- $(SED) 's"#LIB#"$(LIB)"g;' < listalias.1 > listalias.1.subs
++ $(SED) 's"#LIB#"$(PLIB)"g;' < listalias.1 > listalias.1.subs
+ messages.1.subs: messages.1
+- $(SED) 's"#LIB#"$(LIB)"g;' < messages.1 > messages.1.subs
++ $(SED) 's"#LIB#"$(PLIB)"g;' < messages.1 > messages.1.subs
+ newalias.1.subs: newalias.1
+- $(SED) 's"#LIB#"$(LIB)"g;' < newalias.1 > newalias.1.subs
++ $(SED) 's"#LIB#"$(PLIB)"g;' < newalias.1 > newalias.1.subs
+ printmail.1.subs: printmail.1
+- $(SED) 's"#LIB#"$(LIB)"g;' < printmail.1 > printmail.1.subs
++ $(SED) 's"#LIB#"$(PLIB)"g;' < printmail.1 > printmail.1.subs
+ readmsg.1.subs: readmsg.1
+- $(SED) 's"#LIB#"$(LIB)"g;' < readmsg.1 > readmsg.1.subs
++ $(SED) 's"#LIB#"$(PLIB)"g;' < readmsg.1 > readmsg.1.subs
+ newmail.1.subs: newmail.1
+- $(SED) 's"#LIB#"$(LIB)"g;' < newmail.1 > newmail.1.subs
++ $(SED) 's"#LIB#"$(PLIB)"g;' < newmail.1 > newmail.1.subs
+
+
+
+@@ -180,8 +183,8 @@ catman:
+ mkdir catman
+
+ install: $(LIB_LIST)
+- @if $(TEST) '$(MAN)' != none; then $(MAKE) install_man ; else true ; fi
+- @if $(TEST) '$(CATMAN)' != none; then $(MAKE) install_catman ; else true ; fi
++ @if $(TEST) '$(PMAN)' != none; then $(MAKE) install_man ; else true ; fi
++ @if $(TEST) '$(PCATMAN)' != none; then $(MAKE) install_catman ; else true ; fi
+
+ install_man: $(MANROOT) $(MAN) $(MAN_LIST) $(MAN)/wnewmail$(MANEXT)
+
+@@ -195,12 +198,12 @@ $(CATMAN):
+
+ uninstall:
+ $(RM) $(LIB_LIST)
+- @if $(TEST) '$(MAN)' != none; then \
++ @if $(TEST) '$(PMAN)' != none; then \
+ $(RM) $(MAN_LIST) $(MAN)/wnewmail$(MANEXT) ; \
+ else \
+ true ; \
+ fi
+- @if $(TEST) '$(CATMAN)' != none; then \
++ @if $(TEST) '$(PCATMAN)' != none; then \
+ $(RM) $(CATMAN_LIST) $(CATMAN)/wnewmail$(CATMANEXT)$(SUFFIX) ; \
+ else \
+ true ; \
diff --git a/mail/elm-me/patches/patch-cg b/mail/elm-me/patches/patch-cg
new file mode 100644
index 00000000000..cdc7e4b612a
--- /dev/null
+++ b/mail/elm-me/patches/patch-cg
@@ -0,0 +1,24 @@
+$NetBSD: patch-cg,v 1.1 2010/04/15 08:13:34 dholland Exp $
+
+DESTDIR support
+
+--- nls/Install~ 2001-06-19 17:03:18.000000000 +0000
++++ nls/Install
+@@ -39,12 +39,12 @@ do
+ echo "\"$InDir\" is not a directory"
+ continue
+ fi
+- if [ ! -d $DestDir ]
++ if [ ! -d $DESTDIR$DestDir ]
+ then
+- echo "\"$DestDir\" is not a directory"
++ echo "\"$DESTDIR$DestDir\" is not a directory"
+ continue
+ fi
+- /bin/rm -f $DestDir/$CATNAME
+- echo "$GENCAT $DestDir/$CATNAME $InDir/*.m"
+- $GENCAT $DestDir/$CATNAME $InDir/*.m
++ /bin/rm -f $DESTDIR$DestDir/$CATNAME
++ echo "$GENCAT $DESTDIR$DestDir/$CATNAME $InDir/*.m"
++ $GENCAT $DESTDIR$DestDir/$CATNAME $InDir/*.m
+ done < $LANGFILE
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-01 03:25:20 +0000