diff options
| author | bouyer <bouyer> | 1999-12-02 17:01:05 +0000 |
|---|---|---|
| committer | bouyer <bouyer> | 1999-12-02 17:01:05 +0000 |
| commit | 0fe657d38e9a16f2129c9e0325b6c41621e5e87a (patch) | |
| tree | f7ee6c407a3eec18bfc09619bd116dccfb35f78d /editors | |
| parent | e60717f51437bee7fd42715f53c12d28f615e0f5 (diff) | |
| download | pkgsrc-0fe657d38e9a16f2129c9e0325b6c41621e5e87a.tar.gz | |
Make it compile on solaris
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/pico/Makefile | 10 | ||||
| -rw-r--r-- | editors/pico/files/patch-sum | 3 | ||||
| -rw-r--r-- | editors/pico/patches/patch-ae | 56 |
3 files changed, 66 insertions, 3 deletions
diff --git a/editors/pico/Makefile b/editors/pico/Makefile index 6b0271906d4..e3cca0b90d2 100644 --- a/editors/pico/Makefile +++ b/editors/pico/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 1999/11/22 00:59:42 jwise Exp $ +# $NetBSD: Makefile,v 1.18 1999/12/02 17:01:05 bouyer Exp $ # DISTNAME= pine4.21 @@ -12,7 +12,8 @@ HOMEPAGE= http://www.washington.edu/pine/ USE_LIBTOOL= yes do-build: - cd ${WRKSRC} && ./build neb CC="${LIBTOOL} ${CC}" PREFIX=${PREFIX} + cd ${WRKSRC} && ./build ${BUILDNAME} CC="${LIBTOOL} ${CC}" \ + PREFIX=${PREFIX} do-install: ${LIBTOOL} --mode=install ${INSTALL_DATA} \ @@ -28,3 +29,8 @@ do-install: ${PREFIX}/include/pico/ .include "../../mk/bsd.pkg.mk" +.if ${OPSYS} == "SunOS" +BUILDNAME= so5 +.else +BUILDNAME= neb +.endif diff --git a/editors/pico/files/patch-sum b/editors/pico/files/patch-sum index 97b4376bed6..1452a697420 100644 --- a/editors/pico/files/patch-sum +++ b/editors/pico/files/patch-sum @@ -1,6 +1,7 @@ -$NetBSD: patch-sum,v 1.2 1999/11/11 17:40:17 tv Exp $ +$NetBSD: patch-sum,v 1.3 1999/12/02 17:01:05 bouyer Exp $ MD5 (patch-aa) = cc2914e60f45e6c431f5225d75ad45df MD5 (patch-ab) = c3011e2ac8f241ae76ecbed1a7c88293 MD5 (patch-ac) = be4c35a3c79a469da96ff1f1c1a9f17d MD5 (patch-ad) = cb38f893ce88b8a3a78b29af793e4c40 +MD5 (patch-ae) = 345453e3cd7ab8772cdf0c61db16220c diff --git a/editors/pico/patches/patch-ae b/editors/pico/patches/patch-ae new file mode 100644 index 00000000000..dc02ff843ba --- /dev/null +++ b/editors/pico/patches/patch-ae @@ -0,0 +1,56 @@ +$NetBSD: patch-ae,v 1.3 1999/12/02 17:01:05 bouyer Exp $ + +--- pico/makefile.sol.orig Tue Jun 30 00:23:56 1998 ++++ pico/makefile.sol Thu Dec 2 17:54:23 1999 +@@ -32,25 +32,13 @@ + RM= rm -f + LN= ln -s + MAKE= make +-OPTIMIZE= # -O ++OPTIMIZE= -O2 + PROFILE= # -pg +-DEBUG= -g -DDEBUG +- +-# LDCC= /usr/bin/cc +-# If you don't have /usr/bin/cc (our Solaris 2.2 doesn't seem to have it, +-# it only has /usr/ucb/cc) then change LDCC to the following line and +-# give that a try. This is still using the Solaris compiler but +-# leaving out the UCB compatibility includes and libraries. +-LDCC= ./cc5.sol ++DEBUG= # -g -DDEBUG + + STDCFLAGS= -Dconst= -Dsv4 -DPOSIX -DJOB_CONTROL -DMOUSE + CFLAGS= $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(STDCFLAGS) + +-# switches for library building +-LIBCMD= ar +-LIBARGS= ru +-RANLIB= true +- + LIBS= $(EXTRALIBES) -ltermlib + + OFILES= attach.o basic.o bind.o browse.o buffer.o \ +@@ -64,17 +52,17 @@ + # dependencies for the Unix versions of pico and libpico.a + # + all: pico pilot +-pico pilot: libpico.a ++pico pilot: libpico.la + + pico: main.o +- $(LDCC) $(CFLAGS) main.o libpico.a $(LIBS) -o pico ++ $(CC) $(CFLAGS) main.o libpico.la $(LIBS) -o pico + + pilot: pilot.o +- $(LDCC) $(CFLAGS) pilot.o libpico.a $(LIBS) -o pilot ++ $(CC) $(CFLAGS) pilot.o libpico.la $(LIBS) -o pilot + +-libpico.a: $& $(OFILES) +- $(LIBCMD) $(LIBARGS) libpico.a $(OFILES) +- $(RANLIB) libpico.a ++libpico.la: $(OFILES) ++ $(CC) -o libpico.la $(OFILES:.o=.lo) -rpath $(PREFIX)/lib \ ++ -version-info 3:0 + + clean: + rm -f *.a *.o *~ pico_os.c os.h pico pilot |