diff options
author | tv <tv> | 2005-01-31 19:09:16 +0000 |
---|---|---|
committer | tv <tv> | 2005-01-31 19:09:16 +0000 |
commit | 69118e12cb60695e91bb34a7740285631516141d (patch) | |
tree | d9838276dd663317578d938541081335ca1f9a0b | |
parent | f6897ee5a892329e4086e5f48c726c4fb7d35b47 (diff) | |
download | pkgsrc-69118e12cb60695e91bb34a7740285631516141d.tar.gz |
Fix botched update: The shlib major of libpico was supposed to be bumped.
Bump BUILDLINK_DEPENDS of pico, and the PKGREVISION of both pico and pine.
To help avoid this problem in the future, add a comment to pico/Makefile,
indicating where the shlib version is maintained and when it should be bumped.
-rw-r--r-- | editors/pico/Makefile | 10 | ||||
-rw-r--r-- | editors/pico/buildlink3.mk | 4 | ||||
-rw-r--r-- | editors/pico/distinfo | 4 | ||||
-rw-r--r-- | editors/pico/patches/patch-aa | 4 | ||||
-rw-r--r-- | mail/pine/Makefile | 9 |
5 files changed, 20 insertions, 11 deletions
diff --git a/editors/pico/Makefile b/editors/pico/Makefile index d9952e81888..adbe3ce87f9 100644 --- a/editors/pico/Makefile +++ b/editors/pico/Makefile @@ -1,7 +1,15 @@ -# $NetBSD: Makefile,v 1.59 2005/01/25 10:07:56 adam Exp $ +# $NetBSD: Makefile,v 1.60 2005/01/31 19:09:16 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, +# and then bump the BUILDLINK_DEPENDS in buildlink3.mk. +# DISTNAME= pine4.62 PKGNAME= pico-4.9 +PKGREVISION= 1 CATEGORIES= editors MASTER_SITES= ftp://ftp.cac.washington.edu/pine/ \ ftp://ftp.fu-berlin.de/unix/mail/pine/ diff --git a/editors/pico/buildlink3.mk b/editors/pico/buildlink3.mk index 8dc40f21e9f..34a3f6f7224 100644 --- a/editors/pico/buildlink3.mk +++ b/editors/pico/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2005/01/30 17:15:11 kim Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2005/01/31 19:09:16 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.9 +BUILDLINK_DEPENDS.pico+= pico>=4.9nb1 BUILDLINK_PKGSRCDIR.pico?= ../../editors/pico .endif # PICO_BUILDLINK3_MK diff --git a/editors/pico/distinfo b/editors/pico/distinfo index 85647144d4f..8e04ae41759 100644 --- a/editors/pico/distinfo +++ b/editors/pico/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.17 2005/01/25 10:07:56 adam Exp $ +$NetBSD: distinfo,v 1.18 2005/01/31 19:09:16 tv Exp $ SHA1 (pine4.62.tar.bz2) = 7011a1030fcf3f78d8fb7d5b7bf2cd46037668f7 Size (pine4.62.tar.bz2) = 3079348 bytes -SHA1 (patch-aa) = 13a6268321e3620c9438d19abec92072c7aecab4 +SHA1 (patch-aa) = fce5cd9394653f83efb39386141dabaf58a52079 SHA1 (patch-ac) = b5a6efc3056cb677aceb77ed00a8f71fc84083f3 SHA1 (patch-ad) = a5145664372b0ad308a0ee2501211e927d343971 SHA1 (patch-ae) = f228f3c7f61be31a36730b252dfa37d611e8be4b diff --git a/editors/pico/patches/patch-aa b/editors/pico/patches/patch-aa index 0a378a48577..9acdbb9e4a1 100644 --- a/editors/pico/patches/patch-aa +++ b/editors/pico/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.13 2003/07/28 14:35:34 adam Exp $ +$NetBSD: patch-aa,v 1.14 2005/01/31 19:09:16 tv Exp $ --- pico/makefile.neb.orig 2001-10-24 00:19:07.000000000 +0200 +++ pico/makefile.neb 2003-07-28 14:04:16.000000000 +0200 @@ -40,7 +40,7 @@ $NetBSD: patch-aa,v 1.13 2003/07/28 14:35:34 adam 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/mail/pine/Makefile b/mail/pine/Makefile index 01b8d43560e..a416a97cdd2 100644 --- a/mail/pine/Makefile +++ b/mail/pine/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.100 2005/01/25 10:08:59 adam Exp $ +# $NetBSD: Makefile,v 1.101 2005/01/31 19:09:16 tv Exp $ -DISTNAME= pine4.62 -PKGNAME= pine-4.62 -CATEGORIES= mail news +DISTNAME= pine4.62 +PKGNAME= pine-4.62 +PKGREVISION= 1 +CATEGORIES= mail news MASTER_SITES= ftp://ftp.cac.washington.edu/pine/ \ ftp://ftp.fu-berlin.de/unix/mail/pine/ EXTRACT_SUFX= .tar.bz2 |