diff options
| -rw-r--r-- | x11/libXaw/Makefile | 7 | ||||
| -rw-r--r-- | x11/libXaw/PLIST | 7 | ||||
| -rw-r--r-- | x11/libXaw/buildlink3.mk | 7 | ||||
| -rw-r--r-- | x11/libXaw/distinfo | 12 | ||||
| -rw-r--r-- | x11/libXaw/patches/patch-aa | 6 | ||||
| -rw-r--r-- | x11/libXaw/patches/patch-ab | 6 |
6 files changed, 18 insertions, 27 deletions
diff --git a/x11/libXaw/Makefile b/x11/libXaw/Makefile index 00a4705695a..4d640c0e522 100644 --- a/x11/libXaw/Makefile +++ b/x11/libXaw/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2008/05/24 21:45:15 tnn Exp $ +# $NetBSD: Makefile,v 1.6 2008/11/10 17:21:06 wiz Exp $ # -DISTNAME= libXaw-1.0.4 -PKGREVISION= 1 +DISTNAME= libXaw-1.0.5 CATEGORIES= graphics x11 MASTER_SITES= ${MASTER_SITE_XORG:=lib/} EXTRACT_SUFX= .tar.bz2 @@ -17,7 +16,6 @@ USE_LIBTOOL= yes USE_TOOLS+= pkg-config PKGCONFIG_OVERRIDE+= xaw6.pc.in PKGCONFIG_OVERRIDE+= xaw7.pc.in -PKGCONFIG_OVERRIDE+= xaw8.pc.in GNU_CONFIGURE= yes CONFIGURE_ENV+= LIB_MAN_SUFFIX=3 @@ -26,7 +24,6 @@ CONFIGURE_ENV+= LIB_MAN_SUFFIX=3 .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXmu/buildlink3.mk" -.include "../../x11/libXp/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" .include "../../x11/xextproto/buildlink3.mk" diff --git a/x11/libXaw/PLIST b/x11/libXaw/PLIST index fb7da2949a1..16573d6525c 100644 --- a/x11/libXaw/PLIST +++ b/x11/libXaw/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2006/11/03 21:12:55 joerg Exp $ +@comment $NetBSD: PLIST,v 1.2 2008/11/10 17:21:06 wiz Exp $ include/X11/Xaw/AllWidgets.h include/X11/Xaw/AsciiSink.h include/X11/Xaw/AsciiSinkP.h @@ -33,8 +33,6 @@ include/X11/Xaw/Panner.h include/X11/Xaw/PannerP.h include/X11/Xaw/Porthole.h include/X11/Xaw/PortholeP.h -include/X11/Xaw/Print.h -include/X11/Xaw/PrintSP.h include/X11/Xaw/Repeater.h include/X11/Xaw/RepeaterP.h include/X11/Xaw/Reports.h @@ -74,11 +72,8 @@ include/X11/Xaw/XawImP.h include/X11/Xaw/XawInit.h lib/libXaw6.la lib/libXaw7.la -lib/libXaw8.la lib/pkgconfig/xaw6.pc lib/pkgconfig/xaw7.pc -lib/pkgconfig/xaw8.pc -share/aclocal/xaw.m4 man/man3/Xaw.3 @dirrm include/X11/Xaw @comment @dirrm include/X11 diff --git a/x11/libXaw/buildlink3.mk b/x11/libXaw/buildlink3.mk index 6f2d3a769e5..294c80461b4 100644 --- a/x11/libXaw/buildlink3.mk +++ b/x11/libXaw/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2008/03/15 13:36:40 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2008/11/10 17:21:06 wiz Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -18,9 +18,9 @@ BUILDLINK_PACKAGES+= libXaw BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXaw .if ${LIBXAW_BUILDLINK3_MK} == "+" -BUILDLINK_API_DEPENDS.libXaw+= libXaw>=1.0.1 +BUILDLINK_API_DEPENDS.libXaw+= libXaw>=1.0.5 BUILDLINK_PKGSRCDIR.libXaw?= ../../x11/libXaw -BUILDLINK_TRANSFORM+= l:Xaw:Xaw8 +BUILDLINK_TRANSFORM+= l:Xaw:Xaw7 .endif # LIBXAW_BUILDLINK3_MK .include "../../x11/libICE/buildlink3.mk" @@ -28,7 +28,6 @@ BUILDLINK_TRANSFORM+= l:Xaw:Xaw8 .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXmu/buildlink3.mk" -.include "../../x11/libXp/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" .include "../../x11/xextproto/buildlink3.mk" diff --git a/x11/libXaw/distinfo b/x11/libXaw/distinfo index d968f495abe..c798d6f78b5 100644 --- a/x11/libXaw/distinfo +++ b/x11/libXaw/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.3 2008/01/15 23:16:49 wiz Exp $ +$NetBSD: distinfo,v 1.4 2008/11/10 17:21:06 wiz Exp $ -SHA1 (libXaw-1.0.4.tar.bz2) = 9bf93239e6329ec819b6bfd00455cc0efffac103 -RMD160 (libXaw-1.0.4.tar.bz2) = face40c68b49aee9aa9149b963566c39fb6425cb -Size (libXaw-1.0.4.tar.bz2) = 517275 bytes -SHA1 (patch-aa) = 8adf7cd5eac26b92097c7acad1343b36f17ce2cb -SHA1 (patch-ab) = 70550419ca4a683708923f068ae18b23b2f26c44 +SHA1 (libXaw-1.0.5.tar.bz2) = fb436a6ed72aa577b4b73397465f1e06844b954f +RMD160 (libXaw-1.0.5.tar.bz2) = 3374c0479fcb43dcae3decb7b91f3297d0c8277d +Size (libXaw-1.0.5.tar.bz2) = 513408 bytes +SHA1 (patch-aa) = 8171a09bd0c8aed733a184fa09a8bc29c370e752 +SHA1 (patch-ab) = 5cac3d9bffa5e5a035ab68e7c56ccc765e0e73db diff --git a/x11/libXaw/patches/patch-aa b/x11/libXaw/patches/patch-aa index 8ba508566b0..44061f9638e 100644 --- a/x11/libXaw/patches/patch-aa +++ b/x11/libXaw/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.2 2008/01/15 23:16:50 wiz Exp $ +$NetBSD: patch-aa,v 1.3 2008/11/10 17:21:06 wiz Exp $ ---- src/Makefile.in.orig 2007-08-21 20:21:54.000000000 +0000 +--- src/Makefile.in.orig 2008-11-07 18:17:02.000000000 +0000 +++ src/Makefile.in -@@ -1694,7 +1694,6 @@ install-dvi: install-dvi-am +@@ -1281,7 +1281,6 @@ install-dvi: install-dvi-am install-exec-am: install-libLTLIBRARIES @$(NORMAL_INSTALL) diff --git a/x11/libXaw/patches/patch-ab b/x11/libXaw/patches/patch-ab index 7bbcec6a9be..c846a5a6356 100644 --- a/x11/libXaw/patches/patch-ab +++ b/x11/libXaw/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.2 2007/01/22 15:12:13 joerg Exp $ +$NetBSD: patch-ab,v 1.3 2008/11/10 17:21:06 wiz Exp $ ---- Makefile.in.orig 2007-01-04 06:32:32.000000000 +0100 +--- Makefile.in.orig 2008-11-07 18:17:02.000000000 +0000 +++ Makefile.in -@@ -726,7 +726,6 @@ uninstall-info: uninstall-info-recursive +@@ -704,7 +704,6 @@ uninstall-am: uninstall-pkgconfigDATA @PLATFORM_WIN32_FALSE@install-exec-hook: |