summaryrefslogtreecommitdiff
path: root/korean/pine
diff options
context:
space:
mode:
authorSteve Price <steve@FreeBSD.org>1999-05-31 04:59:04 +0000
committerSteve Price <steve@FreeBSD.org>1999-05-31 04:59:04 +0000
commitee58665c7dc47398b91649bd7f92ca909aa7e6f2 (patch)
tree7e0d36630421616f359fb3907f15f67de95d066b /korean/pine
parentFix build on Alpha. (diff)
Unbreak for ELF.
Notes
Notes: svn path=/head/; revision=19137
Diffstat (limited to 'korean/pine')
-rw-r--r--korean/pine/Makefile4
-rw-r--r--korean/pine/files/patch-aa22
-rw-r--r--korean/pine/pkg-plist18
3 files changed, 27 insertions, 17 deletions
diff --git a/korean/pine/Makefile b/korean/pine/Makefile
index 6648590760bc..4a5622f877fd 100644
--- a/korean/pine/Makefile
+++ b/korean/pine/Makefile
@@ -6,7 +6,7 @@
#
# k3 means pico hangul patch
#
-# $Id: Makefile,v 1.8 1998/10/16 03:03:08 jseger Exp $
+# $Id: Makefile,v 1.9 1998/12/18 11:19:01 asami Exp $
#
DISTNAME= pine3.96
@@ -22,8 +22,6 @@ PATCHFILES= pico-3.96-hangul.patch
MAINTAINER= junker@jazz.snu.ac.kr
-BROKEN_ELF= yes
-
MAKE_ENV= FILESDIR=${FILESDIR}
MAN1= pine.1 pico.1 pilot.1
diff --git a/korean/pine/files/patch-aa b/korean/pine/files/patch-aa
index af355149310f..6d2479a55ac8 100644
--- a/korean/pine/files/patch-aa
+++ b/korean/pine/files/patch-aa
@@ -1,8 +1,8 @@
-*** pico/makefile.bsf.orig Fri Jun 14 00:15:20 1996
---- pico/makefile.bsf Fri Jun 14 00:15:20 1996
+*** pico/makefile.bsf.orig Sun May 23 18:49:12 1999
+--- pico/makefile.bsf Sun May 23 18:54:45 1999
***************
*** 0 ****
---- 1,95 ----
+--- 1,105 ----
+ #
+ # Michael Seibel
+ # Networks and Distributed Computing
@@ -51,6 +51,11 @@
+ pico.o random.o region.o search.o spell.o tcap.o window.o word.o hangul.o
+
+ # Lets be elite and not retype in the above
++ .if $(PORTOBJFORMAT) == "elf"
++ SOLIB= libpico.so.1
++ .else
++ SOLIB= libpico.so.1.3
++ .endif
+ SOFILES= ${OFILES:.o=.so}
+
+ CFILES= attach.c ansi.c basic.c bind.c browse.c buffer.c \
@@ -79,13 +84,18 @@
+ $(LIBCMD) $(LIBARGS) libpico.a $(OFILES)
+ $(RANLIB) libpico.a
+
-+ libpico.so.1.3: osdep.c osdep.h $(SOFILES)
++ $(SOLIB): osdep.c osdep.h $(SOFILES)
++ .if $(PORTOBJFORMAT) == "elf"
++ ld -Bshareable -x -soname $(SOLIB) -o $(SOLIB) $(SOFILES)
++ ln -sf $(SOLIB) libpico.so
++ .else
+ ld -Bshareable -x -o libpico.so.1.3 $(SOFILES)
++ .endif
+
-+ pico: main.c libpico.so.1.3
++ pico: main.c $(SOLIB)
+ $(CC) $(CFLAGS) main.c -L. -lpico $(LIBS) -o pico
+
-+ pilot: pilot.c libpico.so.1.3
++ pilot: pilot.c $(SOLIB)
+ $(CC) $(CFLAGS) pilot.c -L. -lpico $(LIBS) -o pilot
+
+ .c.so: ; $(CC) -fpic -DPIC -c $(CFLAGS) ${@:.so=.c} -o $@
diff --git a/korean/pine/pkg-plist b/korean/pine/pkg-plist
index ef8c18fd874e..8b6dedb6b44e 100644
--- a/korean/pine/pkg-plist
+++ b/korean/pine/pkg-plist
@@ -1,14 +1,16 @@
+bin/pgpdecode
+bin/pgpencrypt
+bin/pgpsign
bin/pico
bin/pilot
bin/pine
-lib/libpico.so.1.3
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R
-bin/pgpencrypt
-bin/pgpdecode
-bin/pgpsign
-etc/dot.pinerc.pgp.sample
etc/dot.pinerc.ko.sample
-share/doc/pine/tech-notes.txt
+etc/dot.pinerc.pgp.sample
+lib/libpico.so
+lib/libpico.so.1.3
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
share/doc/pine/README.patch.ko
share/doc/pine/README.pine.ko
+share/doc/pine/tech-notes.txt
+@dirrm share/doc/pine