diff options
-rw-r--r-- | editors/pico/Makefile | 10 | ||||
-rw-r--r-- | editors/pico/files/md5 | 4 | ||||
-rw-r--r-- | editors/pico/files/patch-sum | 10 | ||||
-rw-r--r-- | editors/pico/patches/patch-aa | 6 | ||||
-rw-r--r-- | editors/pico/patches/patch-ab | 8 | ||||
-rw-r--r-- | editors/pico/patches/patch-ac | 38 | ||||
-rw-r--r-- | editors/pico/patches/patch-ae | 4 | ||||
-rw-r--r-- | editors/pico/pkg/PLIST | 6 |
8 files changed, 53 insertions, 33 deletions
diff --git a/editors/pico/Makefile b/editors/pico/Makefile index 9891e2001c8..9377b8b8470 100644 --- a/editors/pico/Makefile +++ b/editors/pico/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.20 2000/06/21 03:53:35 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2000/11/09 03:34:13 hubertf Exp $ # -DISTNAME= pine4.21 -PKGNAME= pico-3.7 +DISTNAME= pine4.30 +PKGNAME= pico-3.8 CATEGORIES= editors MASTER_SITES= ftp://ftp.cac.washington.edu/pine/ -MAINTAINER= root@garbled.net +MAINTAINER= hubertf@netbsd.org HOMEPAGE= http://www.washington.edu/pine/ USE_LIBTOOL= # defined @@ -19,6 +19,8 @@ BUILDNAME= so5 BUILDNAME= neb .endif +MAKE_ENV+= STRIPFLAG= # debug... + do-build: cd ${WRKSRC} && ./build ${BUILDNAME} CC="${LIBTOOL} ${CC}" \ PREFIX=${PREFIX} diff --git a/editors/pico/files/md5 b/editors/pico/files/md5 index a631af4f523..100e9db60cb 100644 --- a/editors/pico/files/md5 +++ b/editors/pico/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.11 1999/11/22 00:59:42 jwise Exp $ +$NetBSD: md5,v 1.12 2000/11/09 03:34:14 hubertf Exp $ -MD5 (pine4.21.tar.gz) = 9252a061387de806f8aa1ced885d41f6 +MD5 (pine4.30.tar.gz) = 21e16ae355a3c78cbe128876e3e65350 diff --git a/editors/pico/files/patch-sum b/editors/pico/files/patch-sum index 1452a697420..e3682aa9d56 100644 --- a/editors/pico/files/patch-sum +++ b/editors/pico/files/patch-sum @@ -1,7 +1,7 @@ -$NetBSD: patch-sum,v 1.3 1999/12/02 17:01:05 bouyer Exp $ +$NetBSD: patch-sum,v 1.4 2000/11/09 03:34:14 hubertf Exp $ -MD5 (patch-aa) = cc2914e60f45e6c431f5225d75ad45df -MD5 (patch-ab) = c3011e2ac8f241ae76ecbed1a7c88293 -MD5 (patch-ac) = be4c35a3c79a469da96ff1f1c1a9f17d +MD5 (patch-aa) = 873c9eb42fec1a540c32edf8c0dd731b +MD5 (patch-ab) = 11865801c12b7c532d52b333c37e0106 +MD5 (patch-ac) = f880fa2ecd9e81beb056c853fd6a89a6 MD5 (patch-ad) = cb38f893ce88b8a3a78b29af793e4c40 -MD5 (patch-ae) = 345453e3cd7ab8772cdf0c61db16220c +MD5 (patch-ae) = 68df18454d6f10dbbd965123135d560e diff --git a/editors/pico/patches/patch-aa b/editors/pico/patches/patch-aa index 21d82a54091..c85fa7f510b 100644 --- a/editors/pico/patches/patch-aa +++ b/editors/pico/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.9 1999/11/11 17:40:17 tv Exp $ +$NetBSD: patch-aa,v 1.10 2000/11/09 03:34:14 hubertf Exp $ --- pico/makefile.neb.orig Mon Jun 29 18:23:50 1998 +++ pico/makefile.neb Sun Sep 27 12:30:46 1998 @@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.9 1999/11/11 17:40:17 tv Exp $ +OPTIMIZE= -O2 PROFILE= # -pg -DEBUG= -g -DDEBUG -+DEBUG= # -g -DDEBUG ++DEBUG= -g # -g -DDEBUG STDCFLAGS= -Dneb -DJOB_CONTROL -DPOSIX -DMOUSE CFLAGS= $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(STDCFLAGS) @@ -43,7 +43,7 @@ $NetBSD: patch-aa,v 1.9 1999/11/11 17:40:17 tv Exp $ - $(RANLIB) libpico.a +libpico.la: $(OFILES) + $(CC) -o libpico.la $(OFILES:.o=.lo) -rpath $(PREFIX)/lib \ -+ -version-info 3:0 ++ -version-info 3:1 clean: rm -f *.a *.o *~ pico_os.c os.h pico pilot diff --git a/editors/pico/patches/patch-ab b/editors/pico/patches/patch-ab index 3179591bd6f..ab1bb745a87 100644 --- a/editors/pico/patches/patch-ab +++ b/editors/pico/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.4 1999/11/11 17:40:17 tv Exp $ +$NetBSD: patch-ab,v 1.5 2000/11/09 03:34:14 hubertf Exp $ ---- pico/osdep/unix.orig Mon Sep 13 15:35:36 1999 -+++ pico/osdep/unix Thu Nov 11 11:04:09 1999 -@@ -2301,7 +2301,7 @@ +--- pico/osdep/unix.orig Fri Sep 15 01:45:19 2000 ++++ pico/osdep/unix +@@ -2300,7 +2300,7 @@ errstr(err) int err; { diff --git a/editors/pico/patches/patch-ac b/editors/pico/patches/patch-ac index d81ce5449bc..9395b69dac8 100644 --- a/editors/pico/patches/patch-ac +++ b/editors/pico/patches/patch-ac @@ -1,9 +1,9 @@ -$NetBSD: patch-ac,v 1.4 1999/11/11 17:40:17 tv Exp $ +$NetBSD: patch-ac,v 1.5 2000/11/09 03:34:14 hubertf Exp $ ---- build.orig Thu Nov 11 11:04:15 1999 -+++ build Thu Nov 11 11:13:47 1999 -@@ -276,28 +276,12 @@ - esac +--- build.orig Tue Aug 1 00:28:01 2000 ++++ build +@@ -303,17 +303,20 @@ + echo "Including SSL functionality" fi - if [ -s c-client ] ; then rm -f c-client ; fi @@ -13,14 +13,28 @@ $NetBSD: patch-ac,v 1.4 1999/11/11 17:40:17 tv Exp $ - if [ -s imapd ] ; then rm -f imapd ; fi - ln -s imap/imapd imapd - echo "Making c-client library, mtest and imapd" -- eval echo make "$makeargs" "$K1" "$K2" $ccltarg +- eval echo make "$makeargs" "$SSL" "$K1" "$K2" $ccltarg - cd $PHOME/imap -- eval make "$makeargs" "$K1" "$K2" $ccltarg +- eval make "$makeargs" "$SSL" "$K1" "$K2" $ccltarg - echo '' -- ++# ++# Built in mail/imap-uw: ++# ++# if [ -s c-client ] ; then rm -f c-client ; fi ++# ln -s imap/c-client c-client ++# if [ -s mtest ] ; then rm -f mtest ; fi ++# ln -s imap/mtest mtest ++# if [ -s imapd ] ; then rm -f imapd ; fi ++# ln -s imap/imapd imapd ++# echo "Making c-client library, mtest and imapd" ++# eval echo make "$makeargs" "$SSL" "$K1" "$K2" $ccltarg ++# cd $PHOME/imap ++# eval make "$makeargs" "$SSL" "$K1" "$K2" $ccltarg ++# echo '' + echo "Making Pico and Pilot" cd $PHOME/pico - eval echo make "$makeargs" -f makefile.$picotarg +@@ -321,10 +324,10 @@ eval make "$makeargs" -f makefile.$picotarg echo '' @@ -28,10 +42,14 @@ $NetBSD: patch-ac,v 1.4 1999/11/11 17:40:17 tv Exp $ - cd $PHOME/pine - eval echo make "$makeargs" "$L1" "$L2" -f makefile.$pinetarg - eval make "$makeargs" "$L1" "$L2" -f makefile.$pinetarg ++# echo "Making Pine". ++# cd $PHOME/pine ++# eval echo make "$makeargs" "$L1" "$L2" -f makefile.$pinetarg ++# eval make "$makeargs" "$L1" "$L2" -f makefile.$pinetarg cd $PHOME if [ ! -d bin ] ; then mkdir bin; fi cd $PHOME/bin -@@ -309,8 +293,6 @@ +@@ -336,8 +339,6 @@ if [ -s ../pico/pilot ] ; then ln ../pico/pilot pilot ; fi cd $PHOME echo '' diff --git a/editors/pico/patches/patch-ae b/editors/pico/patches/patch-ae index dc02ff843ba..7ad7b46d77a 100644 --- a/editors/pico/patches/patch-ae +++ b/editors/pico/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.3 1999/12/02 17:01:05 bouyer Exp $ +$NetBSD: patch-ae,v 1.4 2000/11/09 03:34:14 hubertf Exp $ --- pico/makefile.sol.orig Tue Jun 30 00:23:56 1998 +++ pico/makefile.sol Thu Dec 2 17:54:23 1999 @@ -50,7 +50,7 @@ $NetBSD: patch-ae,v 1.3 1999/12/02 17:01:05 bouyer Exp $ - $(RANLIB) libpico.a +libpico.la: $(OFILES) + $(CC) -o libpico.la $(OFILES:.o=.lo) -rpath $(PREFIX)/lib \ -+ -version-info 3:0 ++ -version-info 3:1 clean: rm -f *.a *.o *~ pico_os.c os.h pico pilot diff --git a/editors/pico/pkg/PLIST b/editors/pico/pkg/PLIST index 2640073bf8f..ff95c0f5eaf 100644 --- a/editors/pico/pkg/PLIST +++ b/editors/pico/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.11 2000/06/21 03:53:35 jlam Exp $ +@comment $NetBSD: PLIST,v 1.12 2000/11/09 03:34:14 hubertf Exp $ bin/pico bin/pilot include/pico/ebind.h @@ -10,9 +10,9 @@ include/pico/msmenu.h include/pico/os.h include/pico/pico.h include/pico/resource.h -@dirrm include/pico lib/libpico.a lib/libpico.la -lib/libpico.so.3.0 +lib/libpico.so.3.1 man/man1/pico.1 man/man1/pilot.1 +@dirrm include/pico |