From b8c39103be6f324fb66c03aa57c74b37ca47f625 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 15 Feb 2005 18:13:41 +0000 Subject: * Apply libtoolize hack of libpico to Interix too. * Only the major of NetBSD's patch was bumped before. Bump the major in the rest of the patches (ick, this should be reworked), and PKGREVISION. --- editors/pico/Makefile | 10 +++++----- editors/pico/buildlink3.mk | 4 ++-- editors/pico/distinfo | 11 ++++++----- editors/pico/patches/patch-ab | 45 +++++++++++++++++++++++++++++++++++++++++++ editors/pico/patches/patch-ae | 4 ++-- editors/pico/patches/patch-af | 4 ++-- editors/pico/patches/patch-ag | 4 ++-- editors/pico/patches/patch-ah | 4 ++-- 8 files changed, 66 insertions(+), 20 deletions(-) create mode 100644 editors/pico/patches/patch-ab (limited to 'editors') diff --git a/editors/pico/Makefile b/editors/pico/Makefile index b00c1e6784b..6bca7637bd1 100644 --- a/editors/pico/Makefile +++ b/editors/pico/Makefile @@ -1,15 +1,15 @@ -# $NetBSD: Makefile,v 1.61 2005/02/15 18:04:02 tv Exp $ +# $NetBSD: Makefile,v 1.62 2005/02/15 18:13:41 tv Exp $ # # NOTE: # When updating, it is necessary to change the shlib version, located in -# patch-aa. If you do not KNOW that the new version is backwards ABI -# compatible (usually not, in the case of libpico), bump the major version, +# several files in patches/. If you do not KNOW that the new version is +# backwards ABI compatible (usually not), bump the major version, # and then bump the BUILDLINK_DEPENDS in buildlink3.mk. # DISTNAME= pine4.62 PKGNAME= pico-4.9 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= editors MASTER_SITES= ftp://ftp.cac.washington.edu/pine/ \ ftp://ftp.fu-berlin.de/unix/mail/pine/ @@ -53,9 +53,9 @@ pre-patch: ${WRKSRC}/pico/osdep/os-sol.h ${WRKSRC}/pico/osdep/os-sfu.h ${SED} -e 's,read.pol,read.sel,' \ ${WRKSRC}/pico/osdep/os-sv4.ic >${WRKSRC}/pico/osdep/os-sfu.ic +.endif ${SED} -e 's,-ltermlib,-lcurses,g;s,sv4,sfu,g' \ ${WRKSRC}/pico/makefile.sv4 >${WRKSRC}/pico/makefile.sfu -.endif do-build: @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./build ${BUILDNAME} \ diff --git a/editors/pico/buildlink3.mk b/editors/pico/buildlink3.mk index 34a3f6f7224..8cdd391652a 100644 --- a/editors/pico/buildlink3.mk +++ b/editors/pico/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2005/01/31 19:09:16 tv Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2005/02/15 18:13:41 tv Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PICO_BUILDLINK3_MK:= ${PICO_BUILDLINK3_MK}+ @@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npico} BUILDLINK_PACKAGES+= pico .if !empty(PICO_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.pico+= pico>=4.9nb1 +BUILDLINK_DEPENDS.pico+= pico>=4.9nb2 BUILDLINK_PKGSRCDIR.pico?= ../../editors/pico .endif # PICO_BUILDLINK3_MK diff --git a/editors/pico/distinfo b/editors/pico/distinfo index 8e04ae41759..53367630e84 100644 --- a/editors/pico/distinfo +++ b/editors/pico/distinfo @@ -1,11 +1,12 @@ -$NetBSD: distinfo,v 1.18 2005/01/31 19:09:16 tv Exp $ +$NetBSD: distinfo,v 1.19 2005/02/15 18:13:41 tv Exp $ SHA1 (pine4.62.tar.bz2) = 7011a1030fcf3f78d8fb7d5b7bf2cd46037668f7 Size (pine4.62.tar.bz2) = 3079348 bytes SHA1 (patch-aa) = fce5cd9394653f83efb39386141dabaf58a52079 +SHA1 (patch-ab) = 5bf382ae3eebaa47602e0ecd0e28161b5ee1e965 SHA1 (patch-ac) = b5a6efc3056cb677aceb77ed00a8f71fc84083f3 SHA1 (patch-ad) = a5145664372b0ad308a0ee2501211e927d343971 -SHA1 (patch-ae) = f228f3c7f61be31a36730b252dfa37d611e8be4b -SHA1 (patch-af) = ebc41187ea97f57f1553a6919c81c773013a1428 -SHA1 (patch-ag) = 7166128e46a10b879c44caea1207b84d13d1b0f4 -SHA1 (patch-ah) = 5e24024a5cc71f91e3c303c92fcbbfb4a1c3aec8 +SHA1 (patch-ae) = 0e2c88dad0b4ad059b8abfab709e9114c3bf6a82 +SHA1 (patch-af) = 9685e8897bac1ef37dc611b5f511488815322696 +SHA1 (patch-ag) = d1140fdb1702a830192530e59388ca2929a16a0d +SHA1 (patch-ah) = ce9216f2bc2531513d02c30bab0ab22ac780f6c5 diff --git a/editors/pico/patches/patch-ab b/editors/pico/patches/patch-ab new file mode 100644 index 00000000000..24955e3a148 --- /dev/null +++ b/editors/pico/patches/patch-ab @@ -0,0 +1,45 @@ +$NetBSD: patch-ab,v 1.12 2005/02/15 18:13:41 tv Exp $ + +--- pico/makefile.sfu.orig 2005-02-15 13:08:55.000000000 -0500 ++++ pico/makefile.sfu +@@ -34,15 +34,12 @@ LN= ln -s + MAKE= make + OPTIMIZE= # -O + PROFILE= # -pg +-DEBUG= -g -DDEBUG ++DEBUG= # -g -DDEBUG + + STDCFLAGS= -Dsfu -DJOB_CONTROL -DPOSIX -DMOUSE + CFLAGS= $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(STDCFLAGS) + + # switches for library building +-LIBCMD= ar +-LIBARGS= ru +-RANLIB= true + + LIBS= $(EXTRALDFLAGS) -lcurses + +@@ -57,17 +54,17 @@ HFILES= headers.h estruct.h edef.h efun + # dependencies for the Unix versions of pico and libpico.a + # + all: pico pilot +-pico pilot: libpico.a ++pico pilot: libpico.la + + pico: main.o +- $(CC) $(CFLAGS) main.o libpico.a $(LIBS) -o pico ++ $(CC) $(CFLAGS) main.o libpico.la $(LIBS) -o pico + + pilot: pilot.o +- $(CC) $(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 5:0 + + clean: + rm -f *.a *.o *~ pico_os.c os.h pico pilot diff --git a/editors/pico/patches/patch-ae b/editors/pico/patches/patch-ae index 99ce3114b88..536451c7994 100644 --- a/editors/pico/patches/patch-ae +++ b/editors/pico/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.6 2002/12/14 10:28:42 tron Exp $ +$NetBSD: patch-ae,v 1.7 2005/02/15 18:13:41 tv Exp $ --- pico/makefile.sol.orig Tue Oct 23 22:19:09 2001 +++ pico/makefile.sol Fri Dec 14 19:11:59 2001 @@ -50,7 +50,7 @@ $NetBSD: patch-ae,v 1.6 2002/12/14 10:28:42 tron Exp $ - $(RANLIB) libpico.a +libpico.la: $(OFILES) + $(CC) -o libpico.la $(OFILES:.o=.lo) -rpath $(PREFIX)/lib \ -+ -version-info 4:0 ++ -version-info 5:0 clean: rm -f *.a *.o *~ pico_os.c os.h pico pilot diff --git a/editors/pico/patches/patch-af b/editors/pico/patches/patch-af index 762d404c13e..c97cc7639cf 100644 --- a/editors/pico/patches/patch-af +++ b/editors/pico/patches/patch-af @@ -1,4 +1,4 @@ -$NetBSD: patch-af,v 1.3 2002/12/14 12:31:57 schmonz Exp $ +$NetBSD: patch-af,v 1.4 2005/02/15 18:13:41 tv Exp $ --- pico/makefile.osx.orig Fri Sep 20 14:23:15 2002 +++ pico/makefile.osx @@ -35,7 +35,7 @@ $NetBSD: patch-af,v 1.3 2002/12/14 12:31:57 schmonz Exp $ - $(RANLIB) libpico.a +libpico.la: $(OFILES) + $(CC) -o libpico.la $(OFILES:.o=.lo) -rpath $(PREFIX)/lib \ -+ -version-info 4:0 ++ -version-info 5:0 clean: rm -f *.a *.o *~ pico_os.c os.h pico pilot diff --git a/editors/pico/patches/patch-ag b/editors/pico/patches/patch-ag index 64d32bce5aa..84359ae3588 100644 --- a/editors/pico/patches/patch-ag +++ b/editors/pico/patches/patch-ag @@ -1,4 +1,4 @@ -$NetBSD: patch-ag,v 1.1 2003/06/18 00:58:12 jschauma Exp $ +$NetBSD: patch-ag,v 1.2 2005/02/15 18:13:41 tv Exp $ --- pico/makefile.lnx.orig Tue Oct 23 15:19:06 2001 +++ pico/makefile.lnx @@ -43,7 +43,7 @@ $NetBSD: patch-ag,v 1.1 2003/06/18 00:58:12 jschauma Exp $ - $(RANLIB) libpico.a +libpico.la: $(OFILES) + $(CC) -o libpico.la $(OFILES:.o=.lo) -rpath $(PREFIX)/lib \ -+ -version-info 4:0 ++ -version-info 5:0 clean: rm -f *.a *.o *~ pico_os.c os.h pico pilot diff --git a/editors/pico/patches/patch-ah b/editors/pico/patches/patch-ah index 9513fcb3641..cc060cbd7bd 100644 --- a/editors/pico/patches/patch-ah +++ b/editors/pico/patches/patch-ah @@ -1,4 +1,4 @@ -$NetBSD: patch-ah,v 1.1 2005/01/18 03:15:07 jschauma Exp $ +$NetBSD: patch-ah,v 1.2 2005/02/15 18:13:41 tv Exp $ --- pico/makefile.sgi.orig Mon Jan 17 22:03:01 2005 +++ pico/makefile.sgi Mon Jan 17 22:04:34 2005 @@ -39,7 +39,7 @@ $NetBSD: patch-ah,v 1.1 2005/01/18 03:15:07 jschauma Exp $ - $(RANLIB) libpico.a +libpico.la: $(OFILES) + $(CC) -o libpico.la $(OFILES:.o=.lo) -rpath $(PREFIX)/lib \ -+ -version-info 4:0 ++ -version-info 5:0 clean: rm -f *.a *.o *~ pico_os.c os.h pico pilot -- cgit v1.2.3