diff options
author | adam <adam> | 2010-01-16 09:15:25 +0000 |
---|---|---|
committer | adam <adam> | 2010-01-16 09:15:25 +0000 |
commit | 61468c65b8b1cd5ce3f4bbb625bc57536824dcfd (patch) | |
tree | ac7417d58d02e2d8f4fbab068514f93cd087a478 /x11/lesstif | |
parent | 8cea6f696bed8bfc766ea2d5e5018db0893f81c0 (diff) | |
download | pkgsrc-61468c65b8b1cd5ce3f4bbb625bc57536824dcfd.tar.gz |
Changes 0.95.2:
* Bug fix release.
Diffstat (limited to 'x11/lesstif')
-rw-r--r-- | x11/lesstif/Makefile | 13 | ||||
-rw-r--r-- | x11/lesstif/buildlink3.mk | 3 | ||||
-rw-r--r-- | x11/lesstif/distinfo | 29 | ||||
-rw-r--r-- | x11/lesstif/patches/patch-aa | 6 | ||||
-rw-r--r-- | x11/lesstif/patches/patch-ab | 17 | ||||
-rw-r--r-- | x11/lesstif/patches/patch-ac | 25 | ||||
-rw-r--r-- | x11/lesstif/patches/patch-am | 8 | ||||
-rw-r--r-- | x11/lesstif/patches/patch-an | 10 | ||||
-rw-r--r-- | x11/lesstif/patches/patch-ao | 10 | ||||
-rw-r--r-- | x11/lesstif/patches/patch-ap | 10 | ||||
-rw-r--r-- | x11/lesstif/patches/patch-aq | 8 | ||||
-rw-r--r-- | x11/lesstif/patches/patch-ar | 8 | ||||
-rw-r--r-- | x11/lesstif/patches/patch-bm | 6 | ||||
-rw-r--r-- | x11/lesstif/patches/patch-bn | 6 | ||||
-rw-r--r-- | x11/lesstif/patches/patch-bo | 19 |
15 files changed, 57 insertions, 121 deletions
diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile index 479b8386f7d..d62cc105d75 100644 --- a/x11/lesstif/Makefile +++ b/x11/lesstif/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.94 2008/07/14 12:56:18 joerg Exp $ +# $NetBSD: Makefile,v 1.95 2010/01/16 09:15:25 adam Exp $ -DISTNAME= lesstif-0.95.0 -PKGREVISION= 1 +DISTNAME= lesstif-0.95.2 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lesstif/} EXTRACT_SUFX= .tar.bz2 @@ -18,8 +17,11 @@ USE_LIBTOOL= yes USE_TOOLS+= gmake USE_X11BASE= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --enable-production --disable-debug --disable-verbose -CONFIGURE_ARGS+= --enable-editres --enable-xdnd +CONFIGURE_ARGS+= --disable-debug +CONFIGURE_ARGS+= --disable-verbose +CONFIGURE_ARGS+= --enable-editres +CONFIGURE_ARGS+= --enable-production +CONFIGURE_ARGS+= --enable-xdnd # The following forces the build process to use sed as the HTML-to-text # converter. @@ -48,7 +50,6 @@ post-extract: # Change references to {Core,Object,Shell}.3 to X{Core,Object,Shell}.3 to # avoid manpage conflicts with other packages. -# post-patch: cd ${WRKSRC}/doc/lessdox/widgets; \ for name in Core Object Shell; do \ diff --git a/x11/lesstif/buildlink3.mk b/x11/lesstif/buildlink3.mk index d3423eaf01e..16f1fa60bd6 100644 --- a/x11/lesstif/buildlink3.mk +++ b/x11/lesstif/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.18 2009/03/20 19:25:43 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2010/01/16 09:15:25 adam Exp $ BUILDLINK_TREE+= lesstif @@ -12,7 +12,6 @@ BUILDLINK_PKGSRCDIR.lesstif?= ../../x11/lesstif .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXrender/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" -.include "../../x11/printproto/buildlink3.mk" .endif # LESSTIF_BUILDLINK3_MK BUILDLINK_TREE+= -lesstif diff --git a/x11/lesstif/distinfo b/x11/lesstif/distinfo index 3c8bf4d9d87..f2f724667d6 100644 --- a/x11/lesstif/distinfo +++ b/x11/lesstif/distinfo @@ -1,17 +1,14 @@ -$NetBSD: distinfo,v 1.16 2007/06/26 10:39:44 tnn Exp $ +$NetBSD: distinfo,v 1.17 2010/01/16 09:15:25 adam Exp $ -SHA1 (lesstif-0.95.0.tar.bz2) = 2a6f20d3bd525e6066ba2be22d8a47bf4bcd0425 -RMD160 (lesstif-0.95.0.tar.bz2) = 0384f87cd1a71e6aea04b1963d03b4664cb66b50 -Size (lesstif-0.95.0.tar.bz2) = 2459799 bytes -SHA1 (patch-aa) = a9748026f9645f346e2e0486cf975337a3bcabe4 -SHA1 (patch-ab) = 8839488b15ae6a01bb4d6af46e386e894eb2cddf -SHA1 (patch-ac) = 0e7bd9c469d98ea6a4257e734f69e321f8fee442 -SHA1 (patch-am) = 67d89893e806032c23301e6bcbd48bc99d0dd216 -SHA1 (patch-an) = db515a483519f321bbeaec384a1ccd7ed0eb503c -SHA1 (patch-ao) = 43ce04cc679d5181b03ca974edcb6a273370cf46 -SHA1 (patch-ap) = 809d82f12de219eaa7ce174f6b14d4110228f888 -SHA1 (patch-aq) = ccd7a53fed86e07f205d9937f408bd266c70ef3d -SHA1 (patch-ar) = 2b0a55cece6927fd4fcf4347db18ae4625383601 -SHA1 (patch-bm) = f58cd23cb8d93027bbf105ff1bf186ff82313d9e -SHA1 (patch-bn) = 5d16046510d23eb696575c9f9100ef15ea909831 -SHA1 (patch-bo) = 39ca358d90b288b44dd223211feb3d8d477efe82 +SHA1 (lesstif-0.95.2.tar.bz2) = b894e544d529a235a6a665d48ca94a465f44a4e5 +RMD160 (lesstif-0.95.2.tar.bz2) = 643fd81b70b6e8617803ddc4350272ca89b4a71f +Size (lesstif-0.95.2.tar.bz2) = 2481073 bytes +SHA1 (patch-aa) = da781d4ef3c552275848241e538ea452a6c16232 +SHA1 (patch-am) = 52c2a8a84436b0e7c5449b90813deb498a98cc50 +SHA1 (patch-an) = 6eef204e655613bb658aa32b6c2f2954e6f39250 +SHA1 (patch-ao) = ee1f3742804f41b592c7f3921f2353bb3c412393 +SHA1 (patch-ap) = c5b525a8661c4b7541a1f7a1c6ff12c6456103c0 +SHA1 (patch-aq) = a238d0be4d69d16e964651a112c4fcf421b06f2a +SHA1 (patch-ar) = e4aefbc8c31bece408185d6bd9266f11d6852f7c +SHA1 (patch-bm) = b32febe539b375a0ea8adfddeec01588927f9046 +SHA1 (patch-bn) = f96d95358a76db1a371bfc3ea7a3ba6b9d1d536f diff --git a/x11/lesstif/patches/patch-aa b/x11/lesstif/patches/patch-aa index 56ebb60d0a7..a8645794b6e 100644 --- a/x11/lesstif/patches/patch-aa +++ b/x11/lesstif/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.25 2005/06/30 15:28:45 adam Exp $ +$NetBSD: patch-aa,v 1.26 2010/01/16 09:15:25 adam Exp $ ---- Makefile.in.orig 2005-03-31 19:45:07.000000000 +0000 +--- Makefile.in.orig 2009-05-27 14:08:14.000000000 +0000 +++ Makefile.in -@@ -282,7 +282,7 @@ DIST_SUBDIRS = scripts include lib clien +@@ -290,7 +290,7 @@ DIST_SUBDIRS = scripts include lib clien # Lets put the informational stuff in a sub directory to avoid # polluting /usr/local for default installs. # diff --git a/x11/lesstif/patches/patch-ab b/x11/lesstif/patches/patch-ab deleted file mode 100644 index a3c90c925a5..00000000000 --- a/x11/lesstif/patches/patch-ab +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ab,v 1.16 2005/03/10 16:07:27 wiz 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 deleted file mode 100644 index 4bc70fd42cc..00000000000 --- a/x11/lesstif/patches/patch-ac +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-ac,v 1.17 2005/03/10 16:07:27 wiz 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++) diff --git a/x11/lesstif/patches/patch-am b/x11/lesstif/patches/patch-am index 2fc4c0ad95a..9ef3f414982 100644 --- a/x11/lesstif/patches/patch-am +++ b/x11/lesstif/patches/patch-am @@ -1,13 +1,13 @@ -$NetBSD: patch-am,v 1.15 2005/06/30 15:28:45 adam Exp $ +$NetBSD: patch-am,v 1.16 2010/01/16 09:15:25 adam Exp $ ---- doc/Makefile.in.orig 2005-03-31 19:44:56.000000000 +0000 +--- doc/Makefile.in.orig 2009-05-27 14:08:04.000000000 +0000 +++ doc/Makefile.in -@@ -259,7 +259,7 @@ EXTRA_DIST = $(DATA) +@@ -267,7 +267,7 @@ EXTRA_DIST = $(DATA) # InsideLessTif/ shouldn't be touched: # it has a stand-alone Makefile w/o auto* stuff SUBDIRS = www.lesstif.org lessdox -rootdir = $(prefix)/LessTif +rootdir = $(prefix)/share/lesstif - docdir = $(rootdir)/doc doc_DATA = All.html Clipboard.txt DragAndDrop.txt Form.txt \ GeoUtils.txt Geometry.html SyntheticResources.txt \ + UIL.txt XmStrings.txt thread.html diff --git a/x11/lesstif/patches/patch-an b/x11/lesstif/patches/patch-an index 79db9a1378d..2bda458450e 100644 --- a/x11/lesstif/patches/patch-an +++ b/x11/lesstif/patches/patch-an @@ -1,13 +1,13 @@ -$NetBSD: patch-an,v 1.18 2005/06/30 15:28:45 adam Exp $ +$NetBSD: patch-an,v 1.19 2010/01/16 09:15:25 adam Exp $ ---- doc/lessdox/clients/Makefile.in.orig 2005-03-31 19:44:57.000000000 +0000 +--- doc/lessdox/clients/Makefile.in.orig 2009-05-27 14:08:04.000000000 +0000 +++ doc/lessdox/clients/Makefile.in -@@ -257,7 +257,7 @@ manfivedir = @mandir@/man5 +@@ -265,7 +265,7 @@ manfivedir = @mandir@/man5 manone_DATA = mwm.1 xmbind.1 lesstif.1 uil.1 ltversion.1 manthree_DATA = manfive_DATA = mwmrc.5 VirtualBindings.5 -rootdir = $(prefix)/LessTif +rootdir = $(prefix)/share/lesstif - docdir = $(rootdir)/doc - htmldir = $(docdir)/html html_DATA = mwm.html mwmrc.html xmbind.html lesstif.html uil.html \ + VirtualBindings.html + diff --git a/x11/lesstif/patches/patch-ao b/x11/lesstif/patches/patch-ao index 28d80f3f5a9..70fb57afd00 100644 --- a/x11/lesstif/patches/patch-ao +++ b/x11/lesstif/patches/patch-ao @@ -1,13 +1,13 @@ -$NetBSD: patch-ao,v 1.15 2005/06/30 15:28:45 adam Exp $ +$NetBSD: patch-ao,v 1.16 2010/01/16 09:15:25 adam Exp $ ---- doc/lessdox/functions/Makefile.in.orig 2005-03-31 19:44:58.000000000 +0000 +--- doc/lessdox/functions/Makefile.in.orig 2009-05-27 14:08:05.000000000 +0000 +++ doc/lessdox/functions/Makefile.in -@@ -257,7 +257,7 @@ manfivedir = @mandir@/man5 +@@ -265,7 +265,7 @@ manfivedir = @mandir@/man5 manone_DATA = manthree_DATA = manfive_DATA = -rootdir = $(prefix)/LessTif +rootdir = $(prefix)/share/lesstif - docdir = $(rootdir)/doc - htmldir = $(docdir)/html html_DATA = ${manone_DATA:.1=.html} ${manthree_DATA:.3=.html} \ + ${manfive_DATA:.5=.html} + diff --git a/x11/lesstif/patches/patch-ap b/x11/lesstif/patches/patch-ap index 9220c5b7371..7c76e8d8a69 100644 --- a/x11/lesstif/patches/patch-ap +++ b/x11/lesstif/patches/patch-ap @@ -1,13 +1,13 @@ -$NetBSD: patch-ap,v 1.14 2005/06/30 15:28:45 adam Exp $ +$NetBSD: patch-ap,v 1.15 2010/01/16 09:15:25 adam Exp $ ---- doc/lessdox/widgets/Makefile.in.orig 2005-03-31 19:44:59.000000000 +0000 +--- doc/lessdox/widgets/Makefile.in.orig 2009-05-27 14:08:05.000000000 +0000 +++ doc/lessdox/widgets/Makefile.in -@@ -282,7 +282,7 @@ manthree_DATA = \ +@@ -290,7 +290,7 @@ manthree_DATA = \ Rect.3 UnNamedObj.3 Constraint.3 VendorShell.3 manfive_DATA = -rootdir = $(prefix)/LessTif +rootdir = $(prefix)/share/lesstif - docdir = $(rootdir)/doc - htmldir = $(docdir)/html html_DATA = ${manone_DATA:.1=.html} ${manthree_DATA:.3=.html} \ + ${manfive_DATA:.5=.html} + diff --git a/x11/lesstif/patches/patch-aq b/x11/lesstif/patches/patch-aq index e5bf868b57f..46a16d7308c 100644 --- a/x11/lesstif/patches/patch-aq +++ b/x11/lesstif/patches/patch-aq @@ -1,13 +1,13 @@ -$NetBSD: patch-aq,v 1.17 2005/06/30 15:28:45 adam Exp $ +$NetBSD: patch-aq,v 1.18 2010/01/16 09:15:25 adam Exp $ ---- doc/www.lesstif.org/Makefile.in.orig 2005-03-31 19:44:59.000000000 +0000 +--- doc/www.lesstif.org/Makefile.in.orig 2009-05-27 14:08:05.000000000 +0000 +++ doc/www.lesstif.org/Makefile.in -@@ -263,7 +263,7 @@ SUBDIRS = images +@@ -271,7 +271,7 @@ SUBDIRS = images # Lets put the informational stuff in a sub directory to avoid # polluting /usr/local for default installs. # -rootdir = $(prefix)/LessTif +rootdir = $(prefix)/share/lesstif - docdir = $(rootdir)/doc doc_DATA = \ Advocacy.html contents.html misc_frame.html \ + BUG-HUNTING.html core.html news.html \ diff --git a/x11/lesstif/patches/patch-ar b/x11/lesstif/patches/patch-ar index c97891ed4cd..026eda4d44d 100644 --- a/x11/lesstif/patches/patch-ar +++ b/x11/lesstif/patches/patch-ar @@ -1,13 +1,13 @@ -$NetBSD: patch-ar,v 1.13 2005/06/30 15:28:45 adam Exp $ +$NetBSD: patch-ar,v 1.14 2010/01/16 09:15:25 adam Exp $ ---- doc/www.lesstif.org/images/Makefile.in.orig 2005-03-31 19:44:59.000000000 +0000 +--- doc/www.lesstif.org/images/Makefile.in.orig 2009-05-27 14:08:06.000000000 +0000 +++ doc/www.lesstif.org/images/Makefile.in -@@ -253,7 +253,7 @@ EXTRA_DIST = $(DATA) +@@ -261,7 +261,7 @@ EXTRA_DIST = $(DATA) # Lets put the informational stuff in a sub directory to avoid # polluting /usr/local for default installs. # -rootdir = $(prefix)/LessTif +rootdir = $(prefix)/share/lesstif - docdir = $(rootdir)/doc imagesdir = $(docdir)/images images_DATA = hungry.png \ + lesstif-realsmall.png lesstif-small.png lesstif.png \ diff --git a/x11/lesstif/patches/patch-bm b/x11/lesstif/patches/patch-bm index e9877b0b31c..680c0386684 100644 --- a/x11/lesstif/patches/patch-bm +++ b/x11/lesstif/patches/patch-bm @@ -1,8 +1,8 @@ -$NetBSD: patch-bm,v 1.7 2004/09/28 12:52:14 adam Exp $ +$NetBSD: patch-bm,v 1.8 2010/01/16 09:15:25 adam Exp $ ---- lib/config/Makefile.in.orig 2004-09-26 14:15:06.000000000 +0000 +--- lib/config/Makefile.in.orig 2009-05-27 14:08:11.000000000 +0000 +++ lib/config/Makefile.in -@@ -251,11 +251,11 @@ xmVer = @xmVer@ +@@ -259,11 +259,11 @@ xmVer = @xmVer@ # MAINTAINERCLEANFILES = Makefile.in bin_SCRIPTS = mxmkmf diff --git a/x11/lesstif/patches/patch-bn b/x11/lesstif/patches/patch-bn index 6e64e7d866f..965168cb5b3 100644 --- a/x11/lesstif/patches/patch-bn +++ b/x11/lesstif/patches/patch-bn @@ -1,8 +1,8 @@ -$NetBSD: patch-bn,v 1.6 2004/09/28 12:52:14 adam Exp $ +$NetBSD: patch-bn,v 1.7 2010/01/16 09:15:25 adam Exp $ ---- scripts/autoconf/Makefile.in.orig 2004-09-26 14:15:08.000000000 +0000 +--- scripts/autoconf/Makefile.in.orig 2009-05-27 14:08:13.000000000 +0000 +++ scripts/autoconf/Makefile.in -@@ -246,8 +246,8 @@ xmVer = @xmVer@ +@@ -254,8 +254,8 @@ xmVer = @xmVer@ # MAINTAINERCLEANFILES = Makefile.in EXTRA_DIST = ac_find_motif.m4 diff --git a/x11/lesstif/patches/patch-bo b/x11/lesstif/patches/patch-bo deleted file mode 100644 index 8858d3ed4e9..00000000000 --- a/x11/lesstif/patches/patch-bo +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-bo,v 1.1 2007/06/26 10:39:44 tnn Exp $ - ---- include/Motif-2.1/Xm/VendorSP.h.orig 2004-08-28 21:23:27.000000000 +0200 -+++ include/Motif-2.1/Xm/VendorSP.h -@@ -28,12 +28,13 @@ - - #include <Xm/XmP.h> - #include <Xm/VendorS.h> --#include <X11/ShellP.h> - - #ifdef __cplusplus - extern "C" { - #endif - -+#include <X11/ShellP.h> -+ - XMLIBEXPORT extern Cardinal _XmFilterResources(XtResource *resources, - Cardinal numResources, - WidgetClass filterClass, |