- Welcome X.org 7.2 \o/.

- Set X11BASE to ${LOCALBASE} for recent ${OSVERSION}.
- Bump PORTREVISION for ports intalling files in ${X11BASE}.

3 files changed, 28 insertions, 27 deletions

diff --git a/x11-toolkits/libXaw/Makefile b/x11-toolkits/libXaw/Makefile
index 8cb332231963..0d0329a31ed5 100644
--- a/x11-toolkits/libXaw/Makefile
+++ b/x11-toolkits/libXaw/Makefile
@@ -6,32 +6,15 @@
 #
 
 PORTNAME=	libXaw
-PORTVERSION=	7.0.2
+PORTVERSION=	1.0.2
+PORTEPOCH=	1
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	http://freedesktop.org/~ajax/xlibs-release/
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X Athena Widgets library
 
-LIB_PC_DEPENDS=	${X11BASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/libX11 \
-		${X11BASE}/libdata/pkgconfig/xt.pc:${PORTSDIR}/x11-toolkits/libXt \
-		${X11BASE}/libdata/pkgconfig/xmu.pc:${PORTSDIR}/x11-toolkits/libXmu \
-		${X11BASE}/libdata/pkgconfig/xpm.pc:${PORTSDIR}/x11/libXpm
-BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto \
-		${X11BASE}/libdata/pkgconfig/xextensions.pc:${PORTSDIR}/x11/xextensions \
-		${LIB_PC_DEPENDS}
-RUN_DEPENDS=	${LIB_PC_DEPENDS}
-
-CONFLICTS=	XFree86-libraries-* xorg-libraries-*
-
-USE_BZIP2=	yes
-PREFIX?=	${X11BASE}
-GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_GMAKE=	yes
-CFLAGS+=	-DMALLOC_0_RETURNS_NULL
-INSTALLS_SHLIB=	yes
-USE_GNOME=	gnomehack pkgconfig
+XORG_CAT=	lib
+USE_XORG=	printproto x11 xau xext xextproto xmu xp xpm xproto xt
 
 MAN3=		Xaw.3
 
diff --git a/x11-toolkits/libXaw/distinfo b/x11-toolkits/libXaw/distinfo
index 5ed12bcafa3a..5cec56c855bc 100644
--- a/x11-toolkits/libXaw/distinfo
+++ b/x11-toolkits/libXaw/distinfo
@@ -1,3 +1,3 @@
-MD5 (libXaw-7.0.2.tar.bz2) = 30d569f9560c1daac184d5be8085ce37
-SHA256 (libXaw-7.0.2.tar.bz2) = 22fedd51c86f2487327601664c6e9234c015a7f14a2f637c084d77589ce3880f
-SIZE (libXaw-7.0.2.tar.bz2) = 423842
+MD5 (xorg/lib/libXaw-1.0.2.tar.bz2) = 27dc85f84ac78eb619f72a0805a323f4
+SHA256 (xorg/lib/libXaw-1.0.2.tar.bz2) = 579f332cb01c2bee5fc75bdfbf0e6b5c57ce3d1849936ae4c540564b2168556a
+SIZE (xorg/lib/libXaw-1.0.2.tar.bz2) = 524107
diff --git a/x11-toolkits/libXaw/pkg-plist b/x11-toolkits/libXaw/pkg-plist
index c3b287571af6..75a563df538b 100644
--- a/x11-toolkits/libXaw/pkg-plist
+++ b/x11-toolkits/libXaw/pkg-plist
@@ -32,6 +32,8 @@ 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
@@ -49,6 +51,7 @@ include/X11/Xaw/SmeLineP.h
 include/X11/Xaw/SmeP.h
 include/X11/Xaw/StripCharP.h
 include/X11/Xaw/StripChart.h
+include/X11/Xaw/Template.c
 include/X11/Xaw/Template.h
 include/X11/Xaw/TemplateP.h
 include/X11/Xaw/Text.h
@@ -68,9 +71,24 @@ include/X11/Xaw/Viewport.h
 include/X11/Xaw/ViewportP.h
 include/X11/Xaw/XawImP.h
 include/X11/Xaw/XawInit.h
-lib/libXaw.a
-lib/libXaw.la
 lib/libXaw.so
+lib/libXaw.so.6
 lib/libXaw.so.7
-libdata/pkgconfig/xaw.pc
+lib/libXaw.so.8
+lib/libXaw6.a
+lib/libXaw6.la
+lib/libXaw6.so
+lib/libXaw6.so.6
+lib/libXaw7.a
+lib/libXaw7.la
+lib/libXaw7.so
+lib/libXaw7.so.7
+lib/libXaw8.a
+lib/libXaw8.la
+lib/libXaw8.so
+lib/libXaw8.so.8
+libdata/pkgconfig/xaw6.pc
+libdata/pkgconfig/xaw7.pc
+libdata/pkgconfig/xaw8.pc
+share/aclocal/xaw.m4
 @dirrm include/X11/Xaw