- Simplify code to handle detection of what library files (shared, static,

  shared library revisions, etc.) were installed.
- Get includes into a sub directorty with OpenWindows.
- Fix package list for OpenWindows systems.

4 files changed, 106 insertions, 107 deletions

diff --git a/x11/Xaw3d/Makefile b/x11/Xaw3d/Makefile
index 8fddfe9b35e..625af26a2e9 100644
--- a/x11/Xaw3d/Makefile
+++ b/x11/Xaw3d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2001/06/07 16:23:10 tron Exp $
+# $NetBSD: Makefile,v 1.28 2001/06/13 15:47:28 tron Exp $
 #
 
 DISTNAME=	Xaw3d-1.5
@@ -10,35 +10,25 @@ COMMENT=	3-D widgets based on the Athena Widget set
 
 CONFLICTS=	Xaw-Xpm-*
 
-USE_IMAKE=	yes
+USE_IMAKE=	YES
 WRKSRC=		${WRKDIR}/xc/lib/Xaw3d
 PLIST_SRC=	${WRKDIR}/PLIST-src
-PLIST_SUBST=	XAWREV=${XAWREV} XAWMAJOR=${XAWMAJOR}
 
 .include "../../mk/bsd.prefs.mk"
 
+.if defined(HAVE_OPENWINDOWS)
+PLIST_SUBST+=	INCDIR=include/X11/X11
+.else
+PLIST_SUBST+=	INCDIR=include/X11
+.endif
+
 post-extract:
 	@(cd ${WRKSRC}; ${LN} -s .. X11)
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/Xaw3d
 	${INSTALL_DATA} ${WRKSRC}/README.XAW3D ${PREFIX}/share/doc/Xaw3d
-	@if [ -f ${WRKSRC}/libXaw3d.a ]; then			\
-		${CP} ${PKGDIR}/PLIST ${PLIST_SRC};		\
-	else							\
-		${SED} -e '/lib\/libXaw3d\.a/d'			\
-			< ${PKGDIR}/PLIST > ${PLIST_SRC};	\
-	fi
-.if (${OPSYS} == SunOS)
-	${RM} -f ${PREFIX}/lib/libXaw3d.so.${XAWMAJOR}
-	${LN} -s libXaw3d.so.${XAWREV} ${PREFIX}/lib/libXaw3d.so.${XAWMAJOR}
-.endif
+	${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
+	cd ${PREFIX} && ${LS} lib/libXaw3d* >>${PLIST_SRC}
 
 .include "../../mk/bsd.pkg.mk"
-
-.if (${OPSYS} == SunOS) && (${X11BASE} == /usr/openwin)
-XAWREV!=	awk '/define.*SharedXawRev/{print $$3}' ${X11BASE}/lib/config/sv4Lib.tmpl
-.else
-XAWREV!=	awk '/define.*SharedXawRev/{print $$3}' ${X11BASE}/lib/X11/config/X11.tmpl
-.endif
-XAWMAJOR=	${XAWREV:C/\..*//}
diff --git a/x11/Xaw3d/distinfo b/x11/Xaw3d/distinfo
index 93ce8c7021e..3dfa82ff33d 100644
--- a/x11/Xaw3d/distinfo
+++ b/x11/Xaw3d/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:07:35 skrll Exp $
+$NetBSD: distinfo,v 1.3 2001/06/13 15:47:28 tron Exp $
 
 SHA1 (Xaw3d-1.5.tar.gz) = ba10e9f9a376932eed9696006e34d4618a6f588d
 Size (Xaw3d-1.5.tar.gz) = 284420 bytes
-SHA1 (patch-aa) = e9a10b671d0b8595a43be0939fb776927661a455
+SHA1 (patch-aa) = 49e023e78fddf3f52a6243733f68734deb71f2b8
 SHA1 (patch-ab) = 0233ff209e06c8a699c23907be3af442ed099ff1
diff --git a/x11/Xaw3d/patches/patch-aa b/x11/Xaw3d/patches/patch-aa
index 54f5ace64d9..3b5c2df082e 100644
--- a/x11/Xaw3d/patches/patch-aa
+++ b/x11/Xaw3d/patches/patch-aa
@@ -1,8 +1,21 @@
-$NetBSD: patch-aa,v 1.6 1998/08/07 11:17:57 agc Exp $
+$NetBSD: patch-aa,v 1.7 2001/06/13 15:47:29 tron Exp $
 
---- Imakefile.orig	Tue Oct 15 10:41:19 1996
-+++ Imakefile	Sat Jul  4 01:43:07 1998
-@@ -39,9 +39,9 @@
+--- Imakefile.orig	Tue Oct 15 16:41:19 1996
++++ Imakefile	Wed Jun 13 17:20:45 2001
+@@ -7,8 +7,12 @@
+ #define HasSharedData YES
+ #define LibName Xaw3d
+ #define SoRev SOXAWREV
++#ifdef SunArchitecture
++#define IncSubdir X11/Xaw3d
++#else
+ #define IncSubdir X11
+ #define IncSubSubdir Xaw3d
++#endif
+ 
+ #ifdef LinuxArchitecture
+ JUMP_ROOT_Xaw3d = $(AWIDGETSRC)3d
+@@ -39,9 +43,9 @@
  
         LINTLIBS = $(LINTXLIB) $(LINTXTOOL)
  
diff --git a/x11/Xaw3d/pkg/PLIST b/x11/Xaw3d/pkg/PLIST
index 0b0514e8f57..e5e0b2fc7f8 100644
--- a/x11/Xaw3d/pkg/PLIST
+++ b/x11/Xaw3d/pkg/PLIST
@@ -1,83 +1,79 @@
-@comment $NetBSD: PLIST,v 1.10 2001/03/11 10:01:40 tron Exp $
-include/X11/Xaw3d/AllWidgets.h
-include/X11/Xaw3d/AsciiSink.h
-include/X11/Xaw3d/AsciiSinkP.h
-include/X11/Xaw3d/AsciiSrc.h
-include/X11/Xaw3d/AsciiSrcP.h
-include/X11/Xaw3d/AsciiText.h
-include/X11/Xaw3d/AsciiTextP.h
-include/X11/Xaw3d/Box.h
-include/X11/Xaw3d/BoxP.h
-include/X11/Xaw3d/Cardinals.h
-include/X11/Xaw3d/Command.h
-include/X11/Xaw3d/CommandP.h
-include/X11/Xaw3d/Dialog.h
-include/X11/Xaw3d/DialogP.h
-include/X11/Xaw3d/Form.h
-include/X11/Xaw3d/FormP.h
-include/X11/Xaw3d/Grip.h
-include/X11/Xaw3d/GripP.h
-include/X11/Xaw3d/Label.h
-include/X11/Xaw3d/LabelP.h
-include/X11/Xaw3d/Layout.h
-include/X11/Xaw3d/LayoutP.h
-include/X11/Xaw3d/List.h
-include/X11/Xaw3d/ListP.h
-include/X11/Xaw3d/MenuButton.h
-include/X11/Xaw3d/MenuButtoP.h
-include/X11/Xaw3d/MultiSrc.h
-include/X11/Xaw3d/MultiSrcP.h
-include/X11/Xaw3d/MultiSink.h
-include/X11/Xaw3d/MultiSinkP.h
-include/X11/Xaw3d/Paned.h
-include/X11/Xaw3d/PanedP.h
-include/X11/Xaw3d/Panner.h
-include/X11/Xaw3d/PannerP.h
-include/X11/Xaw3d/Porthole.h
-include/X11/Xaw3d/PortholeP.h
-include/X11/Xaw3d/Repeater.h
-include/X11/Xaw3d/RepeaterP.h
-include/X11/Xaw3d/Reports.h
-include/X11/Xaw3d/Scrollbar.h
-include/X11/Xaw3d/ScrollbarP.h
-include/X11/Xaw3d/Simple.h
-include/X11/Xaw3d/SimpleP.h
-include/X11/Xaw3d/SimpleMenu.h
-include/X11/Xaw3d/SimpleMenP.h
-include/X11/Xaw3d/Sme.h
-include/X11/Xaw3d/SmeP.h
-include/X11/Xaw3d/SmeBSB.h
-include/X11/Xaw3d/SmeBSBP.h
-include/X11/Xaw3d/SmeLine.h
-include/X11/Xaw3d/SmeLineP.h
-include/X11/Xaw3d/SmeThreeD.h
-include/X11/Xaw3d/SmeThreeDP.h
-include/X11/Xaw3d/StripChart.h
-include/X11/Xaw3d/StripCharP.h
-include/X11/Xaw3d/Template.c
-include/X11/Xaw3d/Template.h
-include/X11/Xaw3d/TemplateP.h
-include/X11/Xaw3d/Text.h
-include/X11/Xaw3d/TextP.h
-include/X11/Xaw3d/TextSink.h
-include/X11/Xaw3d/TextSinkP.h
-include/X11/Xaw3d/TextSrc.h
-include/X11/Xaw3d/TextSrcP.h
-include/X11/Xaw3d/ThreeD.h
-include/X11/Xaw3d/ThreeDP.h
-include/X11/Xaw3d/Toggle.h
-include/X11/Xaw3d/ToggleP.h
-include/X11/Xaw3d/Tree.h
-include/X11/Xaw3d/TreeP.h
-include/X11/Xaw3d/VendorEP.h
-include/X11/Xaw3d/Viewport.h
-include/X11/Xaw3d/ViewportP.h
-include/X11/Xaw3d/XawImP.h
-include/X11/Xaw3d/XawInit.h
-lib/libXaw3d.a
-lib/libXaw3d.so
-lib/libXaw3d.so.${XAWMAJOR}
-lib/libXaw3d.so.${XAWREV}
+@comment $NetBSD: PLIST,v 1.11 2001/06/13 15:47:29 tron Exp $
+${INCDIR}/Xaw3d/AllWidgets.h
+${INCDIR}/Xaw3d/AsciiSink.h
+${INCDIR}/Xaw3d/AsciiSinkP.h
+${INCDIR}/Xaw3d/AsciiSrc.h
+${INCDIR}/Xaw3d/AsciiSrcP.h
+${INCDIR}/Xaw3d/AsciiText.h
+${INCDIR}/Xaw3d/AsciiTextP.h
+${INCDIR}/Xaw3d/Box.h
+${INCDIR}/Xaw3d/BoxP.h
+${INCDIR}/Xaw3d/Cardinals.h
+${INCDIR}/Xaw3d/Command.h
+${INCDIR}/Xaw3d/CommandP.h
+${INCDIR}/Xaw3d/Dialog.h
+${INCDIR}/Xaw3d/DialogP.h
+${INCDIR}/Xaw3d/Form.h
+${INCDIR}/Xaw3d/FormP.h
+${INCDIR}/Xaw3d/Grip.h
+${INCDIR}/Xaw3d/GripP.h
+${INCDIR}/Xaw3d/Label.h
+${INCDIR}/Xaw3d/LabelP.h
+${INCDIR}/Xaw3d/Layout.h
+${INCDIR}/Xaw3d/LayoutP.h
+${INCDIR}/Xaw3d/List.h
+${INCDIR}/Xaw3d/ListP.h
+${INCDIR}/Xaw3d/MenuButton.h
+${INCDIR}/Xaw3d/MenuButtoP.h
+${INCDIR}/Xaw3d/MultiSrc.h
+${INCDIR}/Xaw3d/MultiSrcP.h
+${INCDIR}/Xaw3d/MultiSink.h
+${INCDIR}/Xaw3d/MultiSinkP.h
+${INCDIR}/Xaw3d/Paned.h
+${INCDIR}/Xaw3d/PanedP.h
+${INCDIR}/Xaw3d/Panner.h
+${INCDIR}/Xaw3d/PannerP.h
+${INCDIR}/Xaw3d/Porthole.h
+${INCDIR}/Xaw3d/PortholeP.h
+${INCDIR}/Xaw3d/Repeater.h
+${INCDIR}/Xaw3d/RepeaterP.h
+${INCDIR}/Xaw3d/Reports.h
+${INCDIR}/Xaw3d/Scrollbar.h
+${INCDIR}/Xaw3d/ScrollbarP.h
+${INCDIR}/Xaw3d/Simple.h
+${INCDIR}/Xaw3d/SimpleP.h
+${INCDIR}/Xaw3d/SimpleMenu.h
+${INCDIR}/Xaw3d/SimpleMenP.h
+${INCDIR}/Xaw3d/Sme.h
+${INCDIR}/Xaw3d/SmeP.h
+${INCDIR}/Xaw3d/SmeBSB.h
+${INCDIR}/Xaw3d/SmeBSBP.h
+${INCDIR}/Xaw3d/SmeLine.h
+${INCDIR}/Xaw3d/SmeLineP.h
+${INCDIR}/Xaw3d/SmeThreeD.h
+${INCDIR}/Xaw3d/SmeThreeDP.h
+${INCDIR}/Xaw3d/StripChart.h
+${INCDIR}/Xaw3d/StripCharP.h
+${INCDIR}/Xaw3d/Template.c
+${INCDIR}/Xaw3d/Template.h
+${INCDIR}/Xaw3d/TemplateP.h
+${INCDIR}/Xaw3d/Text.h
+${INCDIR}/Xaw3d/TextP.h
+${INCDIR}/Xaw3d/TextSink.h
+${INCDIR}/Xaw3d/TextSinkP.h
+${INCDIR}/Xaw3d/TextSrc.h
+${INCDIR}/Xaw3d/TextSrcP.h
+${INCDIR}/Xaw3d/ThreeD.h
+${INCDIR}/Xaw3d/ThreeDP.h
+${INCDIR}/Xaw3d/Toggle.h
+${INCDIR}/Xaw3d/ToggleP.h
+${INCDIR}/Xaw3d/Tree.h
+${INCDIR}/Xaw3d/TreeP.h
+${INCDIR}/Xaw3d/VendorEP.h
+${INCDIR}/Xaw3d/Viewport.h
+${INCDIR}/Xaw3d/ViewportP.h
+${INCDIR}/Xaw3d/XawImP.h
+${INCDIR}/Xaw3d/XawInit.h
 share/doc/Xaw3d/README.XAW3D
 @dirrm share/doc/Xaw3d
-@dirrm include/X11/Xaw3d
+@dirrm ${INCDIR}/Xaw3d