summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorhubertf <hubertf>1997-12-04 22:53:34 +0000
committerhubertf <hubertf>1997-12-04 22:53:34 +0000
commit2a03a6481dd9f90ad6e79f0f844968449b632325 (patch)
tree22f6c9be53a938e5442641f66e2a6b97bf59d656 /mail
parente686a31353ec851c2e2132390dd644c3bd40b9b6 (diff)
downloadpkgsrc-2a03a6481dd9f90ad6e79f0f844968449b632325.tar.gz
Move back to static libpine, to build on alpha.
Diffstat (limited to 'mail')
-rw-r--r--mail/pine/Makefile5
-rw-r--r--mail/pine/patches/patch-aa12
-rw-r--r--mail/pine/pkg/PLIST7
3 files changed, 10 insertions, 14 deletions
diff --git a/mail/pine/Makefile b/mail/pine/Makefile
index b0679a80593..065031ffdf7 100644
--- a/mail/pine/Makefile
+++ b/mail/pine/Makefile
@@ -4,7 +4,7 @@
# Date created: 03 September 1994
# Whom: mr
#
-# $NetBSD: Makefile,v 1.3 1997/11/22 05:42:42 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 1997/12/04 22:53:34 hubertf Exp $
# FreeBSD Id: Makefile,v 1.21 1997/03/26 02:12:07 ache Exp
#
@@ -29,8 +29,7 @@ do-build:
cd ${WRKSRC} && ./build neb
do-install:
- install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ${WRKSRC}/bin/libpico.so.1.3 ${PREFIX}/lib/libpico.so.1.3
- /sbin/ldconfig -m ${PREFIX}/lib
+ install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ${WRKSRC}/pico/libpico.a ${PREFIX}/lib/libpico.a
install -c -s -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ${WRKSRC}/bin/pico ${PREFIX}/bin/pico
install -c -s -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ${WRKSRC}/bin/pilot ${PREFIX}/bin/pilot
install -c -s -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ${WRKSRC}/bin/pine ${PREFIX}/bin/pine
diff --git a/mail/pine/patches/patch-aa b/mail/pine/patches/patch-aa
index 6683845690a..7f39284254c 100644
--- a/mail/pine/patches/patch-aa
+++ b/mail/pine/patches/patch-aa
@@ -1,5 +1,5 @@
---- pico/makefile.neb.orig Fri Nov 21 17:53:07 1997
-+++ pico/makefile.neb Fri Nov 21 17:54:36 1997
+--- pico/makefile.neb.orig Fri Apr 5 10:07:56 1996
++++ pico/makefile.neb Thu Dec 4 14:17:13 1997
@@ -28,12 +28,12 @@
#
@@ -37,17 +37,15 @@
$(LIBCMD) $(LIBARGS) libpico.a $(OFILES)
$(RANLIB) libpico.a
--pico: main.c libpico.a
-- $(CC) $(CFLAGS) main.c libpico.a $(LIBS) -o pico
+libpico.so.1.3: osdep.c osdep.h $(SOFILES)
+ ld -Bshareable -x -o libpico.so.1.3 $(SOFILES)
+
-+pico: main.c libpico.so.1.3
+ pico: main.c libpico.a
+- $(CC) $(CFLAGS) main.c libpico.a $(LIBS) -o pico
+ $(CC) $(CFLAGS) main.c -L. -lpico $(LIBS) -o pico
--pilot: pilot.c libpico.a
+ pilot: pilot.c libpico.a
- $(CC) $(CFLAGS) pilot.c libpico.a $(LIBS) -o pilot
-+pilot: pilot.c libpico.so.1.3
+ $(CC) $(CFLAGS) pilot.c -L. -lpico $(LIBS) -o pilot
+
+.c.so: ; $(CC) -fPIC -DPIC -c $(CFLAGS) ${@:.so=.c} -o $@
diff --git a/mail/pine/pkg/PLIST b/mail/pine/pkg/PLIST
index 1bbe522a70a..c4bd2860b72 100644
--- a/mail/pine/pkg/PLIST
+++ b/mail/pine/pkg/PLIST
@@ -1,10 +1,8 @@
-@comment $NetBSD: PLIST,v 1.3 1997/12/02 23:25:14 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.4 1997/12/04 22:53:38 hubertf Exp $
bin/pico
bin/pilot
bin/pine
-lib/libpico.so.1.3
-@exec /sbin/ldconfig -m %B || true
-@unexec /sbin/ldconfig -m %B || true
+lib/libpico.a
lib/pine.conf
lib/pine.conf.fixed
bin/pgpencrypt
@@ -15,3 +13,4 @@ man/man1/pico.1.gz
man/man1/pilot.1.gz
man/man1/pine.1.gz
share/doc/pine/tech-notes.txt
+@dirrm share/doc/pine