diff options
| -rw-r--r-- | x11/lesstif/Makefile | 7 | ||||
| -rw-r--r-- | x11/lesstif/PLIST | 6 | ||||
| -rw-r--r-- | x11/lesstif/buildlink3.mk | 4 | ||||
| -rw-r--r-- | x11/lesstif/distinfo | 8 | ||||
| -rw-r--r-- | x11/lesstif/patches/patch-ab | 17 | ||||
| -rw-r--r-- | x11/lesstif/patches/patch-ac | 25 |
6 files changed, 56 insertions, 11 deletions
diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile index eaf9a028a7c..1966db87efb 100644 --- a/x11/lesstif/Makefile +++ b/x11/lesstif/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.76 2004/11/22 14:30:18 adam Exp $ +# $NetBSD: Makefile,v 1.76.2.1 2005/03/11 06:55:42 snj Exp $ -DISTNAME= lesstif-0.93.97 +DISTNAME= lesstif-0.94.0 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lesstif/} EXTRACT_SUFX= .tar.bz2 @@ -15,7 +16,7 @@ USE_BUILDLINK3= YES USE_X11BASE= YES USE_GNU_TOOLS+= make USE_LIBTOOL= YES -GNU_CONFIGURE= # defined +GNU_CONFIGURE= YES CONFIGURE_ARGS+= --enable-production --disable-debug --disable-verbose CONFIGURE_ARGS+= --enable-editres --enable-xdnd diff --git a/x11/lesstif/PLIST b/x11/lesstif/PLIST index 6a9ca4f10ac..32f4f88c622 100644 --- a/x11/lesstif/PLIST +++ b/x11/lesstif/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2004/09/22 08:10:05 jlam Exp $ +@comment $NetBSD: PLIST,v 1.8.2.1 2005/03/11 06:55:42 snj Exp $ bin/mwm bin/mxmkmf bin/uil @@ -174,10 +174,10 @@ include/uil/UilDef.h include/uil/UilSymDef.h include/uil/UilSymGl.h include/uil/XmAppl.uil +lib/X11/app-defaults/Mwm +lib/X11/config/LessTif.def lib/X11/config/LessTif.rules lib/X11/config/LessTif.tmpl -lib/X11/config/LessTif.def -lib/X11/app-defaults/Mwm lib/X11/mwm/README lib/X11/mwm/alt.map lib/X11/mwm/system.mwmrc diff --git a/x11/lesstif/buildlink3.mk b/x11/lesstif/buildlink3.mk index 6454a834b82..3ffd341f4b8 100644 --- a/x11/lesstif/buildlink3.mk +++ b/x11/lesstif/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:18:36 tv Exp $ +# $NetBSD: buildlink3.mk,v 1.3.2.1 2005/03/11 06:55:42 snj Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LESSTIF_BUILDLINK3_MK:= ${LESSTIF_BUILDLINK3_MK}+ @@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= lesstif .if !empty(LESSTIF_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.lesstif+= lesstif>=0.91.4 -BUILDLINK_RECOMMENDED.lesstif+= lesstif>=0.93.96nb1 +BUILDLINK_RECOMMENDED.lesstif+= lesstif>=0.94.0nb1 BUILDLINK_PKGSRCDIR.lesstif?= ../../x11/lesstif .endif # LESSTIF_BUILDLINK3_MK diff --git a/x11/lesstif/distinfo b/x11/lesstif/distinfo index 796a310e854..bce74ec5c08 100644 --- a/x11/lesstif/distinfo +++ b/x11/lesstif/distinfo @@ -1,8 +1,10 @@ -$NetBSD: distinfo,v 1.10 2004/11/22 14:30:18 adam Exp $ +$NetBSD: distinfo,v 1.10.2.1 2005/03/11 06:55:42 snj Exp $ -SHA1 (lesstif-0.93.97.tar.bz2) = dff0075ffffd3912a222b1196bf6e0e14b0b995f -Size (lesstif-0.93.97.tar.bz2) = 2415508 bytes +SHA1 (lesstif-0.94.0.tar.bz2) = 50456f6f2fe48354a7b1d1cbe4b58b5244aa2fa5 +Size (lesstif-0.94.0.tar.bz2) = 2425210 bytes SHA1 (patch-aa) = c464f492e7c53bba85b0ad2dcc93caedf1f1be03 +SHA1 (patch-ab) = 8839488b15ae6a01bb4d6af46e386e894eb2cddf +SHA1 (patch-ac) = 0e7bd9c469d98ea6a4257e734f69e321f8fee442 SHA1 (patch-am) = aa596b7cfe30c5764bf7ce908e5f400649b91d23 SHA1 (patch-an) = 01b8538e39797bf3ec54a8df61ab277ab6f961b9 SHA1 (patch-ao) = f122671c96e510f4b235e943b1502cd0b77a01b7 diff --git a/x11/lesstif/patches/patch-ab b/x11/lesstif/patches/patch-ab new file mode 100644 index 00000000000..49ed8812f88 --- /dev/null +++ b/x11/lesstif/patches/patch-ab @@ -0,0 +1,17 @@ +$NetBSD: patch-ab,v 1.15.10.1 2005/03/11 06:55:42 snj Exp $ + +--- lib/Xm-2.1/Xpmcreate.c.orig 2004-11-18 22:00:58.000000000 +0100 ++++ lib/Xm-2.1/Xpmcreate.c +@@ -1265,10 +1265,10 @@ PutImagePixels(image, width, height, pix + register char *src; + register char *dst; + register unsigned int *iptr; +- register unsigned int x, y, i; ++ register unsigned int x, y; + register char *data; + Pixel pixel, px; +- int nbytes, depth, ibu, ibpp; ++ int nbytes, depth, ibu, ibpp, i; + + data = image->data; + iptr = pixelindex; diff --git a/x11/lesstif/patches/patch-ac b/x11/lesstif/patches/patch-ac new file mode 100644 index 00000000000..189bbd77946 --- /dev/null +++ b/x11/lesstif/patches/patch-ac @@ -0,0 +1,25 @@ +$NetBSD: patch-ac,v 1.16.2.1 2005/03/11 06:55:42 snj Exp $ + +--- lib/Xm-2.1/Xpmscan.c.orig 2004-11-18 22:00:59.000000000 +0100 ++++ lib/Xm-2.1/Xpmscan.c +@@ -672,8 +672,8 @@ GetImagePixels(image, width, height, pma + char *dst; + unsigned int *iptr; + char *data; +- unsigned int x, y, i; +- int bits, depth, ibu, ibpp, offset; ++ unsigned int x, y; ++ int bits, depth, ibu, ibpp, offset, i; + unsigned long lbt; + Pixel pixel, px; + +@@ -684,6 +684,9 @@ GetImagePixels(image, width, height, pma + ibpp = image->bits_per_pixel; + offset = image->xoffset; + ++ if (image->bitmap_unit < 0) ++ return (XpmNoMemory); ++ + if ((image->bits_per_pixel | image->depth) == 1) { + ibu = image->bitmap_unit; + for (y = 0; y < height; y++) |