Thu Nov 26 00:10:42 2009 UTC ()
Always use correct --mode argument for libtool.


(joerg)
diff -r1.76 -r1.77 pkgsrc/editors/pico/Makefile
diff -r1.24 -r1.25 pkgsrc/editors/pico/distinfo
diff -r1.16 -r1.17 pkgsrc/editors/pico/patches/patch-aa
diff -r1.9 -r1.10 pkgsrc/editors/pico/patches/patch-ae
diff -r1.7 -r1.8 pkgsrc/editors/pico/patches/patch-af
diff -r1.4 -r1.5 pkgsrc/editors/pico/patches/patch-ag
diff -r1.4 -r1.5 pkgsrc/editors/pico/patches/patch-ah
diff -r0 -r1.1 pkgsrc/editors/pico/patches/patch-aj
cvs diff -r1.76 -r1.77 pkgsrc/editors/pico/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/pico/Makefile 2009/05/19 08:59:12 1.76
+++ pkgsrc/editors/pico/Makefile 2009/11/26 00:10:42 1.77
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.76 2009/05/19 08:59:12 wiz Exp $ 1# $NetBSD: Makefile,v 1.77 2009/11/26 00:10:42 joerg Exp $
2# 2#
3# NOTE: 3# NOTE:
4# When updating, it is necessary to change the shlib version, located in 4# When updating, it is necessary to change the shlib version, located in
5# several files in patches/. If you do not KNOW that the new version is 5# several files in patches/. If you do not KNOW that the new version is
6# backwards ABI compatible (usually not), bump the major version, 6# backwards ABI compatible (usually not), bump the major version,
7# and then bump the BUILDLINK_API_DEPENDS in buildlink3.mk. 7# and then bump the BUILDLINK_API_DEPENDS in buildlink3.mk.
8 8
9DISTNAME= pine4.64 9DISTNAME= pine4.64
10PKGNAME= pico-4.10 10PKGNAME= pico-4.10
11PKGREVISION= 2 11PKGREVISION= 2
12CATEGORIES= editors 12CATEGORIES= editors
13MASTER_SITES= ftp://ftp.cac.washington.edu/pine/ \ 13MASTER_SITES= ftp://ftp.cac.washington.edu/pine/ \
14 ftp://ftp.fu-berlin.de/unix/mail/pine/ 14 ftp://ftp.fu-berlin.de/unix/mail/pine/
@@ -47,27 +47,28 @@ MAKE_ENV+= _STRIPFLAG_INSTALL= # debug.. @@ -47,27 +47,28 @@ MAKE_ENV+= _STRIPFLAG_INSTALL= # debug..
47 47
48INSTALLATION_DIRS= bin include/pico lib ${PKGMANDIR}/man1 48INSTALLATION_DIRS= bin include/pico lib ${PKGMANDIR}/man1
49 49
50# Create the OS-dependent files for Interix from the Solaris ones. 50# Create the OS-dependent files for Interix from the Solaris ones.
51post-extract: 51post-extract:
52 ${CP} -f ${WRKSRC}/pico/osdep/os-sol.h ${WRKSRC}/pico/osdep/os-sfu.h 52 ${CP} -f ${WRKSRC}/pico/osdep/os-sol.h ${WRKSRC}/pico/osdep/os-sfu.h
53 ${SED} -e 's,read.pol,read.sel,' \ 53 ${SED} -e 's,read.pol,read.sel,' \
54 ${WRKSRC}/pico/osdep/os-sv4.ic >${WRKSRC}/pico/osdep/os-sfu.ic 54 ${WRKSRC}/pico/osdep/os-sv4.ic >${WRKSRC}/pico/osdep/os-sfu.ic
55 ${SED} -e 's,sv4,sfu,g' \ 55 ${SED} -e 's,sv4,sfu,g' \
56 ${WRKSRC}/pico/makefile.sv4 >${WRKSRC}/pico/makefile.sfu 56 ${WRKSRC}/pico/makefile.sv4 >${WRKSRC}/pico/makefile.sfu
57 57
58do-build: 58do-build:
59 @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./build ${BUILDNAME} \ 59 @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./build ${BUILDNAME} \
60 CC="${LIBTOOL} ${CC}" \ 60 CC="${LIBTOOL} --mode=compile ${CC}" \
 61 LDCC="${LIBTOOL} --mode=link ${CC}" \
61 PREFIX=${PREFIX} OPTIMIZE="${CFLAGS}" \ 62 PREFIX=${PREFIX} OPTIMIZE="${CFLAGS}" \
62 EXTRALDFLAGS="${LIBS}" 63 EXTRALDFLAGS="${LIBS}"
63 64
64do-install: 65do-install:
65 ${LIBTOOL} --mode=install ${INSTALL_LIB} \ 66 ${LIBTOOL} --mode=install ${INSTALL_LIB} \
66 ${WRKSRC}/pico/libpico.la ${DESTDIR}${PREFIX}/lib 67 ${WRKSRC}/pico/libpico.la ${DESTDIR}${PREFIX}/lib
67 ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} \ 68 ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} \
68 ${WRKSRC}/pico/pico ${WRKSRC}/pico/pilot ${DESTDIR}${PREFIX}/bin 69 ${WRKSRC}/pico/pico ${WRKSRC}/pico/pilot ${DESTDIR}${PREFIX}/bin
69 ${INSTALL_MAN} ${WRKSRC}/doc/pico.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 70 ${INSTALL_MAN} ${WRKSRC}/doc/pico.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
70 ${INSTALL_MAN} ${WRKSRC}/doc/pilot.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 71 ${INSTALL_MAN} ${WRKSRC}/doc/pilot.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
71 cd ${WRKSRC}/pico && ${INSTALL_DATA} *.h ${DESTDIR}${PREFIX}/include/pico 72 cd ${WRKSRC}/pico && ${INSTALL_DATA} *.h ${DESTDIR}${PREFIX}/include/pico
72 73
73.include "../../mk/termcap.buildlink3.mk" 74.include "../../mk/termcap.buildlink3.mk"
cvs diff -r1.24 -r1.25 pkgsrc/editors/pico/distinfo (expand / switch to unified diff)

--- pkgsrc/editors/pico/distinfo 2008/03/04 22:00:30 1.24
+++ pkgsrc/editors/pico/distinfo 2009/11/26 00:10:42 1.25
@@ -1,13 +1,14 @@ @@ -1,13 +1,14 @@
1$NetBSD: distinfo,v 1.24 2008/03/04 22:00:30 jlam Exp $ 1$NetBSD: distinfo,v 1.25 2009/11/26 00:10:42 joerg Exp $
2 2
3SHA1 (pine4.64.tar.bz2) = b88aeb64ec2fa30bbb38fda3a051d98dc0e19c5e 3SHA1 (pine4.64.tar.bz2) = b88aeb64ec2fa30bbb38fda3a051d98dc0e19c5e
4RMD160 (pine4.64.tar.bz2) = 8661cd3c0875e46c8cd5eafa7c7c964f79a3b3fd 4RMD160 (pine4.64.tar.bz2) = 8661cd3c0875e46c8cd5eafa7c7c964f79a3b3fd
5Size (pine4.64.tar.bz2) = 3110790 bytes 5Size (pine4.64.tar.bz2) = 3110790 bytes
6SHA1 (patch-aa) = cda803b835c5d0d7cb4e4c3f162a680db2b8a0b1 6SHA1 (patch-aa) = 4bc4703182de5bb8ddca77339ca163b9a61f94fb
7SHA1 (patch-ac) = a6de88e9ab5f1464d58476cbbeb0579938d51427 7SHA1 (patch-ac) = a6de88e9ab5f1464d58476cbbeb0579938d51427
8SHA1 (patch-ad) = a5145664372b0ad308a0ee2501211e927d343971 8SHA1 (patch-ad) = a5145664372b0ad308a0ee2501211e927d343971
9SHA1 (patch-ae) = 143fa40c6c597c23fc7ac187c683cbff7bf85688 9SHA1 (patch-ae) = c73be96a2b97f70be8e2f1ccb12767cab35ab2f7
10SHA1 (patch-af) = 82bc822744e6a74d0bd86bafb1654d0fac0a8b81 10SHA1 (patch-af) = 59cc95b758dbdd03848bd3d17b5105f6bc909e09
11SHA1 (patch-ag) = e92dbb0cacb7104570c356f093ad2fb1cd3b9d2d 11SHA1 (patch-ag) = 21c6474fed212cd3c45cf210d9b879c96ed4f0b8
12SHA1 (patch-ah) = 65f713181af150c64a28ec6547fc966eddae1961 12SHA1 (patch-ah) = bc26f6e3d7aed7e718ae924f0f348f448d495864
13SHA1 (patch-ai) = 7e2a70ee4322aa85de80089c2e4470ec12bfe110 13SHA1 (patch-ai) = 7e2a70ee4322aa85de80089c2e4470ec12bfe110
 14SHA1 (patch-aj) = fc44b6786797184c4323b40aa2a73960cc421f2d
cvs diff -r1.16 -r1.17 pkgsrc/editors/pico/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/editors/pico/patches/patch-aa 2006/01/12 21:00:52 1.16
+++ pkgsrc/editors/pico/patches/patch-aa 2009/11/26 00:10:42 1.17
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-aa,v 1.16 2006/01/12 21:00:52 adam Exp $ 1$NetBSD: patch-aa,v 1.17 2009/11/26 00:10:42 joerg Exp $
2 2
3--- pico/makefile.neb.orig 2001-10-24 00:19:07.000000000 +0200 3--- pico/makefile.neb.orig 2001-10-24 00:19:07.000000000 +0200
4+++ pico/makefile.neb 2003-07-28 14:04:16.000000000 +0200 4+++ pico/makefile.neb 2003-07-28 14:04:16.000000000 +0200
5@@ -32,16 +32,12 @@ 5@@ -32,16 +32,12 @@
6 MAKE= make 6 MAKE= make
7 OPTIMIZE= # -O 7 OPTIMIZE= # -O
8 PROFILE= # -pg 8 PROFILE= # -pg
9-DEBUG= -g -DDEBUG 9-DEBUG= -g -DDEBUG
10+DEBUG= # -g -DDEBUG 10+DEBUG= # -g -DDEBUG
11  11
12 STDCFLAGS= -Dneb -DJOB_CONTROL -DPOSIX -DMOUSE 12 STDCFLAGS= -Dneb -DJOB_CONTROL -DPOSIX -DMOUSE
13 CFLAGS= $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(STDCFLAGS) 13 CFLAGS= $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(STDCFLAGS)
14  14
@@ -19,28 +19,28 @@ $NetBSD: patch-aa,v 1.16 2006/01/12 21:0 @@ -19,28 +19,28 @@ $NetBSD: patch-aa,v 1.16 2006/01/12 21:0
19- 19-
20 LIBS= $(EXTRALDFLAGS) -ltermcap 20 LIBS= $(EXTRALDFLAGS) -ltermcap
21  21
22 OFILES= attach.o basic.o bind.o browse.o buffer.o \ 22 OFILES= attach.o basic.o bind.o browse.o buffer.o \
23@@ -55,17 +51,17 @@ 23@@ -55,17 +51,17 @@
24 # dependencies for the Unix versions of pico and libpico.a 24 # dependencies for the Unix versions of pico and libpico.a
25 # 25 #
26 all: pico pilot 26 all: pico pilot
27-pico pilot: libpico.a 27-pico pilot: libpico.a
28+pico pilot: libpico.la 28+pico pilot: libpico.la
29  29
30 pico: main.o 30 pico: main.o
31- $(CC) $(CFLAGS) main.o libpico.a $(LIBS) -o pico 31- $(CC) $(CFLAGS) main.o libpico.a $(LIBS) -o pico
32+ $(CC) $(CFLAGS) main.o libpico.la $(LIBS) -o pico 32+ $(LDCC) $(CFLAGS) main.o libpico.la $(LIBS) -o pico
33  33
34 pilot: pilot.o 34 pilot: pilot.o
35- $(CC) $(CFLAGS) pilot.o libpico.a $(LIBS) -o pilot 35- $(CC) $(CFLAGS) pilot.o libpico.a $(LIBS) -o pilot
36+ $(CC) $(CFLAGS) pilot.o libpico.la $(LIBS) -o pilot 36+ $(LDCC) $(CFLAGS) pilot.o libpico.la $(LIBS) -o pilot
37  37
38-libpico.a: $(OFILES) 38-libpico.a: $(OFILES)
39- $(LIBCMD) $(LIBARGS) libpico.a $(OFILES) 39- $(LIBCMD) $(LIBARGS) libpico.a $(OFILES)
40- $(RANLIB) libpico.a 40- $(RANLIB) libpico.a
41+libpico.la: $(OFILES) 41+libpico.la: $(OFILES)
42+ $(CC) -o libpico.la $(OFILES:.o=.lo) -rpath $(PREFIX)/lib \ 42+ $(LDCC) -o libpico.la $(OFILES:.o=.lo) -rpath $(PREFIX)/lib \
43+ -version-info 6:0 43+ -version-info 6:0
44  44
45 clean: 45 clean:
46 rm -f *.a *.o *~ pico_os.c os.h pico pilot 46 rm -f *.a *.o *~ pico_os.c os.h pico pilot
cvs diff -r1.9 -r1.10 pkgsrc/editors/pico/patches/patch-ae (expand / switch to unified diff)

--- pkgsrc/editors/pico/patches/patch-ae 2006/01/12 21:00:52 1.9
+++ pkgsrc/editors/pico/patches/patch-ae 2009/11/26 00:10:42 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-ae,v 1.9 2006/01/12 21:00:52 adam Exp $ 1$NetBSD: patch-ae,v 1.10 2009/11/26 00:10:42 joerg Exp $
2 2
3--- pico/makefile.sol.orig Tue Oct 23 22:19:09 2001 3--- pico/makefile.sol.orig Tue Oct 23 22:19:09 2001
4+++ pico/makefile.sol Fri Dec 14 19:11:59 2001 4+++ pico/makefile.sol Fri Dec 14 19:11:59 2001
5@@ -32,25 +32,13 @@ 5@@ -32,25 +32,13 @@
6 RM= rm -f 6 RM= rm -f
7 LN= ln -s 7 LN= ln -s
8 MAKE= make 8 MAKE= make
9-OPTIMIZE= # -O 9-OPTIMIZE= # -O
10+OPTIMIZE= -O2 10+OPTIMIZE= -O2
11 PROFILE= # -pg 11 PROFILE= # -pg
12-DEBUG= -g -DDEBUG 12-DEBUG= -g -DDEBUG
13- 13-
14-# LDCC= /usr/bin/cc 14-# LDCC= /usr/bin/cc
@@ -29,28 +29,28 @@ $NetBSD: patch-ae,v 1.9 2006/01/12 21:00 @@ -29,28 +29,28 @@ $NetBSD: patch-ae,v 1.9 2006/01/12 21:00
29- 29-
30 LIBS= $(EXTRALDFLAGS) -ltermlib 30 LIBS= $(EXTRALDFLAGS) -ltermlib
31  31
32 OFILES= attach.o basic.o bind.o browse.o buffer.o \ 32 OFILES= attach.o basic.o bind.o browse.o buffer.o \
33@@ -64,17 +52,17 @@ 33@@ -64,17 +52,17 @@
34 # dependencies for the Unix versions of pico and libpico.a 34 # dependencies for the Unix versions of pico and libpico.a
35 # 35 #
36 all: pico pilot 36 all: pico pilot
37-pico pilot: libpico.a 37-pico pilot: libpico.a
38+pico pilot: libpico.la 38+pico pilot: libpico.la
39  39
40 pico: main.o 40 pico: main.o
41- $(LDCC) $(CFLAGS) main.o libpico.a $(LIBS) -o pico 41- $(LDCC) $(CFLAGS) main.o libpico.a $(LIBS) -o pico
42+ $(CC) $(CFLAGS) main.o libpico.la $(LIBS) -o pico 42+ $(LDCC) $(CFLAGS) main.o libpico.la $(LIBS) -o pico
43  43
44 pilot: pilot.o 44 pilot: pilot.o
45- $(LDCC) $(CFLAGS) pilot.o libpico.a $(LIBS) -o pilot 45- $(LDCC) $(CFLAGS) pilot.o libpico.a $(LIBS) -o pilot
46+ $(CC) $(CFLAGS) pilot.o libpico.la $(LIBS) -o pilot 46+ $(LDCC) $(CFLAGS) pilot.o libpico.la $(LIBS) -o pilot
47  47
48-libpico.a: $& $(OFILES) 48-libpico.a: $& $(OFILES)
49- $(LIBCMD) $(LIBARGS) libpico.a $(OFILES) 49- $(LIBCMD) $(LIBARGS) libpico.a $(OFILES)
50- $(RANLIB) libpico.a 50- $(RANLIB) libpico.a
51+libpico.la: $(OFILES) 51+libpico.la: $(OFILES)
52+ $(CC) -o libpico.la $(OFILES:.o=.lo) -rpath $(PREFIX)/lib \ 52+ $(LDCC) -o libpico.la $(OFILES:.o=.lo) -rpath $(PREFIX)/lib \
53+ -version-info 6:0 53+ -version-info 6:0
54  54
55 clean: 55 clean:
56 rm -f *.a *.o *~ pico_os.c os.h pico pilot 56 rm -f *.a *.o *~ pico_os.c os.h pico pilot
cvs diff -r1.7 -r1.8 pkgsrc/editors/pico/patches/patch-af (expand / switch to unified diff)

--- pkgsrc/editors/pico/patches/patch-af 2008/03/04 22:00:30 1.7
+++ pkgsrc/editors/pico/patches/patch-af 2009/11/26 00:10:42 1.8
@@ -1,39 +1,39 @@ @@ -1,39 +1,39 @@
1$NetBSD: patch-af,v 1.7 2008/03/04 22:00:30 jlam Exp $ 1$NetBSD: patch-af,v 1.8 2009/11/26 00:10:42 joerg Exp $
2 2
3--- pico/makefile.osx.orig 2002-09-20 14:23:11.000000000 -0400 3--- pico/makefile.osx.orig 2002-09-20 14:23:11.000000000 -0400
4+++ pico/makefile.osx 4+++ pico/makefile.osx
5@@ -38,10 +38,6 @@ STDCFLAGS= -Dbsd -DJOB_CONTROL 5@@ -38,10 +38,6 @@ STDCFLAGS= -Dbsd -DJOB_CONTROL
6 CFLAGS= $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(STDCFLAGS) 6 CFLAGS= $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(STDCFLAGS)
7  7
8 # switches for library building 8 # switches for library building
9-LIBCMD= ar 9-LIBCMD= ar
10-LIBARGS= ru 10-LIBARGS= ru
11-RANLIB= ranlib 11-RANLIB= ranlib
12- 12-
13 LIBS= $(EXTRALDFLAGS) -lncurses 13 LIBS= $(EXTRALDFLAGS) -lncurses
14  14
15 OFILES= attach.o basic.o bind.o browse.o buffer.o \ 15 OFILES= attach.o basic.o bind.o browse.o buffer.o \
16@@ -55,17 +51,17 @@ HFILES= headers.h estruct.h edef.h efun 16@@ -55,17 +51,17 @@ HFILES= headers.h estruct.h edef.h efun
17 # dependencies for the Unix versions of pico and libpico.a 17 # dependencies for the Unix versions of pico and libpico.a
18 # 18 #
19 all: pico pilot 19 all: pico pilot
20-pico pilot: libpico.a 20-pico pilot: libpico.a
21+pico pilot: libpico.la 21+pico pilot: libpico.la
22  22
23 pico: main.o 23 pico: main.o
24- $(CC) $(CFLAGS) main.o libpico.a $(LIBS) -o pico 24- $(CC) $(CFLAGS) main.o libpico.a $(LIBS) -o pico
25+ $(CC) $(CFLAGS) main.o libpico.la $(LIBS) -o pico 25+ $(LDCC) $(CFLAGS) main.o libpico.la $(LIBS) -o pico
26  26
27 pilot: pilot.o 27 pilot: pilot.o
28- $(CC) $(CFLAGS) pilot.o libpico.a $(LIBS) -o pilot 28- $(CC) $(CFLAGS) pilot.o libpico.a $(LIBS) -o pilot
29+ $(CC) $(CFLAGS) pilot.o libpico.la $(LIBS) -o pilot 29+ $(LDCC) $(CFLAGS) pilot.o libpico.la $(LIBS) -o pilot
30  30
31-libpico.a: $(OFILES) 31-libpico.a: $(OFILES)
32- $(LIBCMD) $(LIBARGS) libpico.a $(OFILES) 32- $(LIBCMD) $(LIBARGS) libpico.a $(OFILES)
33- $(RANLIB) libpico.a 33- $(RANLIB) libpico.a
34+libpico.la: $(OFILES) 34+libpico.la: $(OFILES)
35+ $(CC) -o libpico.la $(OFILES:.o=.lo) -rpath $(PREFIX)/lib \ 35+ $(LDCC) -o libpico.la $(OFILES:.o=.lo) -rpath $(PREFIX)/lib \
36+ -version-info 6:0 36+ -version-info 6:0
37  37
38 clean: 38 clean:
39 rm -f *.a *.o *~ pico_os.c os.h pico pilot 39 rm -f *.a *.o *~ pico_os.c os.h pico pilot
cvs diff -r1.4 -r1.5 pkgsrc/editors/pico/patches/patch-ag (expand / switch to unified diff)

--- pkgsrc/editors/pico/patches/patch-ag 2006/01/12 21:00:52 1.4
+++ pkgsrc/editors/pico/patches/patch-ag 2009/11/26 00:10:42 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-ag,v 1.4 2006/01/12 21:00:52 adam Exp $ 1$NetBSD: patch-ag,v 1.5 2009/11/26 00:10:42 joerg Exp $
2 2
3--- pico/makefile.lnx.orig Tue Oct 23 15:19:06 2001 3--- pico/makefile.lnx.orig Tue Oct 23 15:19:06 2001
4+++ pico/makefile.lnx 4+++ pico/makefile.lnx
5@@ -36,18 +36,14 @@ 5@@ -36,18 +36,14 @@
6 RM= rm -f 6 RM= rm -f
7 LN= ln -s 7 LN= ln -s
8 MAKE= make 8 MAKE= make
9-OPTIMIZE= # -O 9-OPTIMIZE= # -O
10+OPTIMIZE= -O2 10+OPTIMIZE= -O2
11 PROFILE= # -pg 11 PROFILE= # -pg
12-DEBUG= -g -DDEBUG 12-DEBUG= -g -DDEBUG
13+DEBUG= -g 13+DEBUG= -g
14  14
@@ -22,28 +22,28 @@ $NetBSD: patch-ag,v 1.4 2006/01/12 21:00 @@ -22,28 +22,28 @@ $NetBSD: patch-ag,v 1.4 2006/01/12 21:00
22- 22-
23 LIBS= $(EXTRALDFLAGS) -lncurses 23 LIBS= $(EXTRALDFLAGS) -lncurses
24  24
25 OFILES= attach.o basic.o bind.o browse.o buffer.o \ 25 OFILES= attach.o basic.o bind.o browse.o buffer.o \
26@@ -61,17 +57,17 @@ HFILES= headers.h estruct.h edef.h efun 26@@ -61,17 +57,17 @@ HFILES= headers.h estruct.h edef.h efun
27 # dependencies for the Unix versions of pico and libpico.a 27 # dependencies for the Unix versions of pico and libpico.a
28 # 28 #
29 all: pico pilot 29 all: pico pilot
30-pico pilot: libpico.a 30-pico pilot: libpico.a
31+pico pilot: libpico.la 31+pico pilot: libpico.la
32  32
33 pico: main.o 33 pico: main.o
34- $(CC) $(CFLAGS) main.o libpico.a $(LIBS) -o pico 34- $(CC) $(CFLAGS) main.o libpico.a $(LIBS) -o pico
35+ $(CC) $(CFLAGS) main.o libpico.la $(LIBS) -o pico 35+ $(LDCC) $(CFLAGS) main.o libpico.la $(LIBS) -o pico
36  36
37 pilot: pilot.o 37 pilot: pilot.o
38- $(CC) $(CFLAGS) pilot.o libpico.a $(LIBS) -o pilot 38- $(CC) $(CFLAGS) pilot.o libpico.a $(LIBS) -o pilot
39+ $(CC) $(CFLAGS) pilot.o libpico.la $(LIBS) -o pilot 39+ $(LDCC) $(CFLAGS) pilot.o libpico.la $(LIBS) -o pilot
40  40
41-libpico.a: $(OFILES) 41-libpico.a: $(OFILES)
42- $(LIBCMD) $(LIBARGS) libpico.a $(OFILES) 42- $(LIBCMD) $(LIBARGS) libpico.a $(OFILES)
43- $(RANLIB) libpico.a 43- $(RANLIB) libpico.a
44+libpico.la: $(OFILES) 44+libpico.la: $(OFILES)
45+ $(CC) -o libpico.la $(OFILES:.o=.lo) -rpath $(PREFIX)/lib \ 45+ $(LDCC) -o libpico.la $(OFILES:.o=.lo) -rpath $(PREFIX)/lib \
46+ -version-info 6:0 46+ -version-info 6:0
47  47
48 clean: 48 clean:
49 rm -f *.a *.o *~ pico_os.c os.h pico pilot 49 rm -f *.a *.o *~ pico_os.c os.h pico pilot
cvs diff -r1.4 -r1.5 pkgsrc/editors/pico/patches/patch-ah (expand / switch to unified diff)

--- pkgsrc/editors/pico/patches/patch-ah 2006/01/12 21:00:52 1.4
+++ pkgsrc/editors/pico/patches/patch-ah 2009/11/26 00:10:42 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-ah,v 1.4 2006/01/12 21:00:52 adam Exp $ 1$NetBSD: patch-ah,v 1.5 2009/11/26 00:10:42 joerg Exp $
2 2
3--- pico/makefile.sgi.orig Mon Jan 17 22:03:01 2005 3--- pico/makefile.sgi.orig Mon Jan 17 22:03:01 2005
4+++ pico/makefile.sgi Mon Jan 17 22:04:34 2005 4+++ pico/makefile.sgi Mon Jan 17 22:04:34 2005
5@@ -32,15 +32,12 @@ 5@@ -32,15 +32,12 @@
6 MAKE= make 6 MAKE= make
7 OPTIMIZE= # -O 7 OPTIMIZE= # -O
8 PROFILE= # -pg 8 PROFILE= # -pg
9-DEBUG= -g -DDEBUG 9-DEBUG= -g -DDEBUG
10+DEBUG= # -g -DDEBUG 10+DEBUG= # -g -DDEBUG
11  11
12 STDCFLAGS= -Dsgi -DJOB_CONTROL -DMOUSE 12 STDCFLAGS= -Dsgi -DJOB_CONTROL -DMOUSE
13 CFLAGS= $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(STDCFLAGS) 13 CFLAGS= $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(STDCFLAGS)
14  14
@@ -18,28 +18,28 @@ $NetBSD: patch-ah,v 1.4 2006/01/12 21:00 @@ -18,28 +18,28 @@ $NetBSD: patch-ah,v 1.4 2006/01/12 21:00
18-RANLIB= /bin/true 18-RANLIB= /bin/true
19  19
20 LIBS= $(EXTRALDFLAGS) -ltermcap -lc 20 LIBS= $(EXTRALDFLAGS) -ltermcap -lc
21  21
22@@ -55,17 +52,17 @@ 22@@ -55,17 +52,17 @@
23 # dependencies for the Unix versions of pico and libpico.a 23 # dependencies for the Unix versions of pico and libpico.a
24 # 24 #
25 all: pico pilot 25 all: pico pilot
26-pico pilot: libpico.a 26-pico pilot: libpico.a
27+pico pilot: libpico.la 27+pico pilot: libpico.la
28  28
29 pico: main.o 29 pico: main.o
30- $(CC) $(CFLAGS) main.o libpico.a $(LIBS) -o pico 30- $(CC) $(CFLAGS) main.o libpico.a $(LIBS) -o pico
31+ $(CC) $(CFLAGS) main.o libpico.la $(LIBS) -o pico 31+ $(LDCC) $(CFLAGS) main.o libpico.la $(LIBS) -o pico
32  32
33 pilot: pilot.o 33 pilot: pilot.o
34- $(CC) $(CFLAGS) pilot.o libpico.a $(LIBS) -o pilot 34- $(CC) $(CFLAGS) pilot.o libpico.a $(LIBS) -o pilot
35+ $(CC) $(CFLAGS) pilot.o libpico.la $(LIBS) -o pilot 35+ $(LDCC) $(CFLAGS) pilot.o libpico.la $(LIBS) -o pilot
36  36
37-libpico.a: $(OFILES) 37-libpico.a: $(OFILES)
38- $(LIBCMD) $(LIBARGS) libpico.a $(OFILES) 38- $(LIBCMD) $(LIBARGS) libpico.a $(OFILES)
39- $(RANLIB) libpico.a 39- $(RANLIB) libpico.a
40+libpico.la: $(OFILES) 40+libpico.la: $(OFILES)
41+ $(CC) -o libpico.la $(OFILES:.o=.lo) -rpath $(PREFIX)/lib \ 41+ $(LDCC) -o libpico.la $(OFILES:.o=.lo) -rpath $(PREFIX)/lib \
42+ -version-info 6:0 42+ -version-info 6:0
43  43
44 clean: 44 clean:
45 rm -f *.a *.o *~ pico_os.c os.h pico pilot 45 rm -f *.a *.o *~ pico_os.c os.h pico pilot
File Added: pkgsrc/editors/pico/patches/patch-aj
$NetBSD: patch-aj,v 1.1 2009/11/26 00:10:42 joerg Exp $

--- pico/osdep/makefile.orig	2009-11-26 01:05:39.000000000 +0100
+++ pico/osdep/makefile
@@ -21,7 +21,7 @@ ALL=	os-a32.c os-a41.c os-aix.c \
 all:		includer $(ALL)
 
 includer:	includer.c
-		$(CC) -o includer includer.c
+		$(LDCC) -o includer includer.c
 
 clean:
 		$(RM) $(ALL) includer