diff options
author | adam <adam@pkgsrc.org> | 2004-09-28 12:52:13 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2004-09-28 12:52:13 +0000 |
commit | 59dad1457ef835ef19fcc38fb67ca33b27db8233 (patch) | |
tree | 89e3b9f38939017c4e784c9a19248e08db98a6de /x11/lesstif | |
parent | 5e5544ddbe32efcfec10c292b59935c9c5c35ece (diff) | |
download | pkgsrc-59dad1457ef835ef19fcc38fb67ca33b27db8233.tar.gz |
Changes 0.93.96:
* Scroll wheel suuport
* Xpm security fixes
* XmList fixes
* XmFrame fixes
* fix for uninitialised memory problems
Diffstat (limited to 'x11/lesstif')
-rw-r--r-- | x11/lesstif/Makefile | 11 | ||||
-rw-r--r-- | x11/lesstif/buildlink3.mk | 5 | ||||
-rw-r--r-- | x11/lesstif/distinfo | 25 | ||||
-rw-r--r-- | x11/lesstif/patches/patch-aa | 7 | ||||
-rw-r--r-- | x11/lesstif/patches/patch-ac | 13 | ||||
-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 | 12 | ||||
-rw-r--r-- | x11/lesstif/patches/patch-aq | 6 | ||||
-rw-r--r-- | x11/lesstif/patches/patch-ar | 6 | ||||
-rw-r--r-- | x11/lesstif/patches/patch-bm | 16 | ||||
-rw-r--r-- | x11/lesstif/patches/patch-bn | 19 |
13 files changed, 65 insertions, 83 deletions
diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile index acefbc04ae1..1cfd7716a67 100644 --- a/x11/lesstif/Makefile +++ b/x11/lesstif/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.73 2004/04/24 22:46:13 jlam Exp $ +# $NetBSD: Makefile,v 1.74 2004/09/28 12:52:13 adam Exp $ -DISTNAME= lesstif-0.93.94 +DISTNAME= lesstif-0.93.96 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lesstif/} EXTRACT_SUFX= .tar.bz2 @@ -16,15 +16,11 @@ USE_X11BASE= YES USE_GNU_TOOLS+= make USE_LIBTOOL= YES GNU_CONFIGURE= # defined -CONFIGURE_ARGS+= --disable-build-12 -CONFIGURE_ARGS+= --disable-build-20 -CONFIGURE_ARGS+= --enable-build-21 CONFIGURE_ARGS+= --enable-production --disable-debug --disable-verbose CONFIGURE_ARGS+= --enable-editres --enable-xdnd # The following forces the build process to use sed as the HTML-to-text # converter. -# CONFIGURE_ENV+= LYNX_CMD=${WRKDIR}/nonexecutable CONFIGURE_ENV+= LINKS_CMD=${WRKDIR}/nonexecutable @@ -76,5 +72,6 @@ pre-install: post-install: PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL -.include "../../textproc/expat/buildlink3.mk" +.include "../../fonts/fontconfig/buildlink3.mk" +.include "../../x11/Xrender/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/lesstif/buildlink3.mk b/x11/lesstif/buildlink3.mk index 83929eecee2..ae1a64bc40e 100644 --- a/x11/lesstif/buildlink3.mk +++ b/x11/lesstif/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/04/11 18:26:34 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/09/28 12:52:14 adam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LESSTIF_BUILDLINK3_MK:= ${LESSTIF_BUILDLINK3_MK}+ @@ -15,4 +15,7 @@ BUILDLINK_DEPENDS.lesstif+= lesstif>=0.91.4 BUILDLINK_PKGSRCDIR.lesstif?= ../../x11/lesstif .endif # LESSTIF_BUILDLINK3_MK +.include "../../fonts/fontconfig/buildlink3.mk" +.include "../../x11/Xrender/buildlink3.mk" + BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/lesstif/distinfo b/x11/lesstif/distinfo index 4d6bc75f56e..4f4791c7776 100644 --- a/x11/lesstif/distinfo +++ b/x11/lesstif/distinfo @@ -1,14 +1,13 @@ -$NetBSD: distinfo,v 1.8 2003/12/12 10:11:39 adam Exp $ +$NetBSD: distinfo,v 1.9 2004/09/28 12:52:14 adam Exp $ -SHA1 (lesstif-0.93.94.tar.bz2) = 7f366e0a97d3f21480d55f8dca9b7b97e28a5e1c -Size (lesstif-0.93.94.tar.bz2) = 3461827 bytes -SHA1 (patch-aa) = 8aecea9444476b44bf2abdcc185ee2ee4b62227e -SHA1 (patch-ac) = c0fa9429cfc40d7c4071b71e7d71e6175c0c6048 -SHA1 (patch-am) = 7c28e5a71ed01f22609b6433295b4e3535d9b2c5 -SHA1 (patch-an) = 15cc17b95726ac42e69460a1f156c589842db4aa -SHA1 (patch-ao) = b243b99c4e24dee3bf37609c5f808e1a87bf79f8 -SHA1 (patch-ap) = f6448aad2bda33ff61c77e9e29da0b8b511bd114 -SHA1 (patch-aq) = d05b80ea376e7dde29233066778f8baa376693c0 -SHA1 (patch-ar) = 3d59488aeb1764cf1594f7cab82e8ad5c510d52c -SHA1 (patch-bm) = e97f6acd4c80d28d0939c21826d30b1477a7d789 -SHA1 (patch-bn) = 582c1f9946b62e7b8621ae7c754986b525e0142a +SHA1 (lesstif-0.93.96.tar.bz2) = 5a9c1a34a9937c9fb99707845c47d9a404fc7396 +Size (lesstif-0.93.96.tar.bz2) = 2415100 bytes +SHA1 (patch-aa) = 99137138f1a9a5ed4107a97b20b3255e31420599 +SHA1 (patch-am) = aa596b7cfe30c5764bf7ce908e5f400649b91d23 +SHA1 (patch-an) = 01b8538e39797bf3ec54a8df61ab277ab6f961b9 +SHA1 (patch-ao) = f122671c96e510f4b235e943b1502cd0b77a01b7 +SHA1 (patch-ap) = e79e54362dab026efb0606b3a4dd9dcbc802a5ad +SHA1 (patch-aq) = b5abefab2422e03e5bf9ace54ea89d23ddeb41c9 +SHA1 (patch-ar) = 200d4b0565599157969ebeff3f80abd0c0ce69e1 +SHA1 (patch-bm) = f58cd23cb8d93027bbf105ff1bf186ff82313d9e +SHA1 (patch-bn) = 5d16046510d23eb696575c9f9100ef15ea909831 diff --git a/x11/lesstif/patches/patch-aa b/x11/lesstif/patches/patch-aa index 5084ce7db0b..70c761fa764 100644 --- a/x11/lesstif/patches/patch-aa +++ b/x11/lesstif/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.22 2003/12/12 10:11:39 adam Exp $ +$NetBSD: patch-aa,v 1.23 2004/09/28 12:52:14 adam Exp $ ---- Makefile.in.orig 2003-11-27 19:29:46.000000000 +0000 +--- Makefile.in.orig 2004-09-26 14:15:08.000000000 +0000 +++ Makefile.in -@@ -237,12 +237,12 @@ DIST_SUBDIRS = scripts include lib clien +@@ -283,11 +283,11 @@ DIST_SUBDIRS = scripts include lib clien # Lets put the informational stuff in a sub directory to avoid # poluting /usr/local for default installs. # @@ -11,7 +11,6 @@ $NetBSD: patch-aa,v 1.22 2003/12/12 10:11:39 adam Exp $ dist_root_DATA = AUTHORS BUG-REPORTING COPYING COPYING.LIB CREDITS \ FAQ INSTALL.txt README ReleaseNotes.html ReleaseNotes.txt - -htmldir = $(prefix)/LessTif/doc +htmldir = $(prefix)/share/doc/html/lesstif html_DATA = ReleaseNotes.html diff --git a/x11/lesstif/patches/patch-ac b/x11/lesstif/patches/patch-ac deleted file mode 100644 index e32d6528550..00000000000 --- a/x11/lesstif/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.15 2002/12/05 19:10:43 drochner Exp $ - ---- clients/Motif-1.2/mwm/system.mwmrc.orig Wed Jun 13 22:39:25 2001 -+++ clients/Motif-1.2/mwm/system.mwmrc Thu Dec 5 19:03:32 2002 -@@ -5,7 +5,7 @@ - Menu DefaultRootMenu - { - "Root Menu" f.title -- "New Window" f.exec "xterm -e /bin/bash &" -+ "New Window" f.exec "xterm &" - "Shuffle Up" f.circle_up - "Shuffle Down" f.circle_down - "Refresh" f.refresh diff --git a/x11/lesstif/patches/patch-am b/x11/lesstif/patches/patch-am index 5d253f06987..28c6b431744 100644 --- a/x11/lesstif/patches/patch-am +++ b/x11/lesstif/patches/patch-am @@ -1,11 +1,11 @@ -$NetBSD: patch-am,v 1.13 2003/12/12 10:11:39 adam Exp $ +$NetBSD: patch-am,v 1.14 2004/09/28 12:52:14 adam Exp $ ---- doc/Makefile.in.orig 2003-11-27 19:29:48.000000000 +0000 +--- doc/Makefile.in.orig 2004-09-26 14:15:01.000000000 +0000 +++ doc/Makefile.in -@@ -227,7 +227,7 @@ EXTRA_DIST = $(DATA) +@@ -259,7 +259,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/doc +rootdir = $(prefix)/share/doc/html/lesstif root_DATA = All.html Clipboard.txt DragAndDrop.txt Form.txt \ diff --git a/x11/lesstif/patches/patch-an b/x11/lesstif/patches/patch-an index b24ba7a5468..6c9c035b232 100644 --- a/x11/lesstif/patches/patch-an +++ b/x11/lesstif/patches/patch-an @@ -1,13 +1,13 @@ -$NetBSD: patch-an,v 1.16 2003/12/12 10:11:39 adam Exp $ +$NetBSD: patch-an,v 1.17 2004/09/28 12:52:14 adam Exp $ ---- doc/lessdox/clients/Makefile.in.orig 2003-11-27 19:29:48.000000000 +0000 +--- doc/lessdox/clients/Makefile.in.orig 2004-09-26 14:15:02.000000000 +0000 +++ doc/lessdox/clients/Makefile.in -@@ -233,7 +233,7 @@ manone_DATA = mwm.1 xmbind.1 lesstif.1 u +@@ -257,7 +257,7 @@ manfivedir = @mandir@/man5 + manone_DATA = mwm.1 xmbind.1 lesstif.1 uil.1 ltversion.1 manthree_DATA = manfive_DATA = mwmrc.5 VirtualBindings.5 - -htmldir = $(prefix)/LessTif/doc/html +htmldir = $(prefix)/share/doc/html/lesstif - 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 543f1005d53..2bab25cad61 100644 --- a/x11/lesstif/patches/patch-ao +++ b/x11/lesstif/patches/patch-ao @@ -1,13 +1,13 @@ -$NetBSD: patch-ao,v 1.13 2003/12/12 10:11:39 adam Exp $ +$NetBSD: patch-ao,v 1.14 2004/09/28 12:52:14 adam Exp $ ---- doc/lessdox/functions/Makefile.in.orig 2003-11-27 19:29:48.000000000 +0000 +--- doc/lessdox/functions/Makefile.in.orig 2004-09-26 14:15:02.000000000 +0000 +++ doc/lessdox/functions/Makefile.in -@@ -233,7 +233,7 @@ manone_DATA = +@@ -257,7 +257,7 @@ manfivedir = @mandir@/man5 + manone_DATA = manthree_DATA = manfive_DATA = - -htmldir = $(prefix)/LessTif/doc/html +htmldir = $(prefix)/share/doc/html/lesstif - 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 a0c34d03ae0..da6c6640191 100644 --- a/x11/lesstif/patches/patch-ap +++ b/x11/lesstif/patches/patch-ap @@ -1,17 +1,17 @@ -$NetBSD: patch-ap,v 1.12 2003/12/12 10:11:39 adam Exp $ +$NetBSD: patch-ap,v 1.13 2004/09/28 12:52:14 adam Exp $ ---- doc/lessdox/widgets/Makefile.in.orig 2003-11-27 19:29:49.000000000 +0000 +--- doc/lessdox/widgets/Makefile.in.orig 2004-09-26 14:15:03.000000000 +0000 +++ doc/lessdox/widgets/Makefile.in -@@ -259,7 +259,7 @@ manthree_DATA = \ +@@ -282,7 +282,7 @@ manthree_DATA = \ + Rect.3 UnNamedObj.3 Constraint.3 VendorShell.3 manfive_DATA = - -htmldir = $(prefix)/LessTif/doc/html +htmldir = $(prefix)/share/doc/html/lesstif - html_DATA = ${manone_DATA:.1=.html} ${manthree_DATA:.3=.html} \ ${manfive_DATA:.5=.html} -@@ -519,7 +519,7 @@ $(html_DATA): $(MAN2HTML) + +@@ -549,7 +549,7 @@ $(html_DATA): $(MAN2HTML) # in both the http://www.lesstif.org and the locally installed case. # install-data-hook: diff --git a/x11/lesstif/patches/patch-aq b/x11/lesstif/patches/patch-aq index d0ee6ee03f7..a9808be936e 100644 --- a/x11/lesstif/patches/patch-aq +++ b/x11/lesstif/patches/patch-aq @@ -1,8 +1,8 @@ -$NetBSD: patch-aq,v 1.15 2003/12/12 10:11:39 adam Exp $ +$NetBSD: patch-aq,v 1.16 2004/09/28 12:52:14 adam Exp $ ---- doc/www.lesstif.org/Makefile.in.orig 2003-11-27 19:29:49.000000000 +0000 +--- doc/www.lesstif.org/Makefile.in.orig 2004-09-26 14:15:03.000000000 +0000 +++ doc/www.lesstif.org/Makefile.in -@@ -232,7 +232,7 @@ SUBDIRS = images +@@ -263,7 +263,7 @@ SUBDIRS = images # Lets put the informational stuff in a sub directory to avoid # polluting /usr/local for default installs. # diff --git a/x11/lesstif/patches/patch-ar b/x11/lesstif/patches/patch-ar index ead944cdc7d..5dea65d593e 100644 --- a/x11/lesstif/patches/patch-ar +++ b/x11/lesstif/patches/patch-ar @@ -1,8 +1,8 @@ -$NetBSD: patch-ar,v 1.11 2003/12/12 10:11:39 adam Exp $ +$NetBSD: patch-ar,v 1.12 2004/09/28 12:52:14 adam Exp $ ---- doc/www.lesstif.org/images/Makefile.in.orig 2003-11-27 19:29:49.000000000 +0000 +--- doc/www.lesstif.org/images/Makefile.in.orig 2004-09-26 14:15:03.000000000 +0000 +++ doc/www.lesstif.org/images/Makefile.in -@@ -229,7 +229,7 @@ EXTRA_DIST = $(DATA) +@@ -253,7 +253,7 @@ EXTRA_DIST = $(DATA) # Lets put the informational stuff in a sub directory to avoid # poluting /usr/local for default installs. # diff --git a/x11/lesstif/patches/patch-bm b/x11/lesstif/patches/patch-bm index 733179db066..e9877b0b31c 100644 --- a/x11/lesstif/patches/patch-bm +++ b/x11/lesstif/patches/patch-bm @@ -1,20 +1,18 @@ -$NetBSD: patch-bm,v 1.6 2003/12/12 10:11:39 adam Exp $ +$NetBSD: patch-bm,v 1.7 2004/09/28 12:52:14 adam Exp $ ---- lib/config/Makefile.in.orig 2003-11-27 19:29:53.000000000 +0000 +--- lib/config/Makefile.in.orig 2004-09-26 14:15:06.000000000 +0000 +++ lib/config/Makefile.in -@@ -223,13 +223,13 @@ xmVer = @xmVer@ +@@ -251,11 +251,11 @@ xmVer = @xmVer@ + # MAINTAINERCLEANFILES = Makefile.in bin_SCRIPTS = mxmkmf - -configdir = $(libdir)/LessTif/config +configdir = $(libdir)/X11/config - EXTRA_DIST = LessTif.rules LessTif.tmpl host.def Imake.tmpl # so being R5 @XIsR6_FALSE@config_DATA = Imake.tmpl LessTif.rules LessTif.tmpl - -@XIsR6_TRUE@config_DATA = LessTif.rules LessTif.tmpl host.def +@XIsR6_TRUE@config_DATA = LessTif.rules LessTif.tmpl LessTif.def - subdir = lib/config - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + all: all-am + + .SUFFIXES: diff --git a/x11/lesstif/patches/patch-bn b/x11/lesstif/patches/patch-bn index b8d0c604bfb..6e64e7d866f 100644 --- a/x11/lesstif/patches/patch-bn +++ b/x11/lesstif/patches/patch-bn @@ -1,16 +1,15 @@ -$NetBSD: patch-bn,v 1.5 2003/12/12 10:11:39 adam Exp $ +$NetBSD: patch-bn,v 1.6 2004/09/28 12:52:14 adam Exp $ ---- scripts/autoconf/Makefile.in.orig 2003-11-27 19:29:53.000000000 +0000 +--- scripts/autoconf/Makefile.in.orig 2004-09-26 14:15:08.000000000 +0000 +++ scripts/autoconf/Makefile.in -@@ -224,9 +224,9 @@ MAINTAINERCLEANFILES = Makefile.in - +@@ -246,8 +246,8 @@ xmVer = @xmVer@ + # + MAINTAINERCLEANFILES = Makefile.in EXTRA_DIST = ac_find_motif.m4 - -aclocaldir = @ACLOCALDIR@ -+aclocaldir = ${prefix}/share/aclocal - -@Aclocal_TRUE@aclocal_DATA = ac_find_motif.m4 ++aclocaldir = ${prefix}/share/aclocal +aclocal_DATA = ac_find_motif.m4 - subdir = scripts/autoconf - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + all: all-am + + .SUFFIXES: |