- Update so openlook based packages have a chance of PKG_DESTDIR_SUPPORT

- Mark as LICENSE sun-openlook-license

9 files changed, 143 insertions, 42 deletions

diff --git a/x11/xview-config/Makefile b/x11/xview-config/Makefile
index 499783688d5..735d7701833 100644
--- a/x11/xview-config/Makefile
+++ b/x11/xview-config/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2009/01/07 04:28:53 dholland Exp $
+# $NetBSD: Makefile,v 1.29 2009/12/10 20:34:44 abs Exp $
 
 DISTNAME=		xview3.2p1-X11R6
 PKGNAME=		xview-config-3.2.1
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 
@@ -11,11 +11,12 @@ COMMENT=		OpenLook Toolkit config files
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+LICENSE=                sun-openlook-license
 NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
 
 EXTRACT_ELEMENTS=	${DISTNAME}/config
 
-WRKSRC=		${WRKDIR}/${EXTRACT_ELEMENTS}
+WRKSRC=			${WRKDIR}/${EXTRACT_ELEMENTS}
 USE_IMAKE=		yes
 
 post-extract:
diff --git a/x11/xview-config/distinfo b/x11/xview-config/distinfo
index 0a67a395b42..55029d8b3f3 100644
--- a/x11/xview-config/distinfo
+++ b/x11/xview-config/distinfo
@@ -1,10 +1,12 @@
-$NetBSD: distinfo,v 1.6 2009/01/07 04:28:53 dholland Exp $
+$NetBSD: distinfo,v 1.7 2009/12/10 20:34:44 abs Exp $
 
 SHA1 (xview3.2p1-X11R6.tar.gz) = 1cd04231b893c3e6c70b56791d527b498e21a27a
 RMD160 (xview3.2p1-X11R6.tar.gz) = 2f21b14cb088aec887683bbc6d4ed9a3bc3fe2bb
 Size (xview3.2p1-X11R6.tar.gz) = 3436814 bytes
 SHA1 (patch-aa) = 631894d42809d81f091666892b42e1afe09001d4
 SHA1 (patch-ab) = f69576916876bb87af8f17c2ba01a3e4ae43c594
-SHA1 (patch-ac) = cf0359a8ed9873f3065e7af877e20d65b30ee6c9
+SHA1 (patch-ac) = 869fb07d61c0213058d5e066113985c59971f643
 SHA1 (patch-ad) = 9d4d329a549b9b571fdae4bfdf76351be056ce8a
 SHA1 (patch-ae) = a8b36ae8898bd236ed81b2ecec8a33c3e0ce5fda
+SHA1 (patch-af) = 31e7030d655708531c6ea5b982909fe8b79d5a53
+SHA1 (patch-ag) = befc32a51b77ab710115188bd01fb7eaeab6ba44
diff --git a/x11/xview-config/patches/patch-aa b/x11/xview-config/patches/patch-aa
index cff7f7e7989..22d01feb481 100644
--- a/x11/xview-config/patches/patch-aa
+++ b/x11/xview-config/patches/patch-aa
@@ -1,8 +1,9 @@
-$NetBSD: patch-aa,v 1.6 2001/05/02 21:46:08 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.7 2009/12/10 20:34:44 abs Exp $
  
---- ./Imakefile.orig	Tue Jun 29 01:13:19 1993
-+++ ./Imakefile	Tue May  1 22:40:31 2001
-@@ -9,8 +9,8 @@
+--- Imakefile.orig	1993-06-29 05:13:19.000000000 +0000
++++ Imakefile
+@@ -8,10 +8,10 @@
+ /**/# config directory
  /**/# @(#)Imakefile	1.9 28 Jun 1993 SMI
  
 -XVFILES = XView.cf XView.lib XView.obj XView.rules XView.tmpl library.tmpl
@@ -13,3 +14,4 @@ $NetBSD: patch-aa,v 1.6 2001/05/02 21:46:08 dmcmahill Exp $
 +InstallMultipleDestFlags(install,$(CFFILES),$(PREFIX)/lib/X11/config,$(INSTDATFLAGS))
  
  depend::
+ 
diff --git a/x11/xview-config/patches/patch-ab b/x11/xview-config/patches/patch-ab
index 14889792bf0..6db249b1280 100644
--- a/x11/xview-config/patches/patch-ab
+++ b/x11/xview-config/patches/patch-ab
@@ -1,53 +1,58 @@
-$NetBSD: patch-ab,v 1.7 2001/05/02 21:46:08 dmcmahill Exp $
+$NetBSD: patch-ab,v 1.8 2009/12/10 20:34:44 abs Exp $
  
---- ./XView.cf.orig	Sun Jun 26 22:09:19 1994
-+++ ./XView.cf	Tue May  1 22:40:31 2001
-@@ -102,5 +102,5 @@
+--- XView.cf.orig	1994-06-27 02:09:19.000000000 +0000
++++ XView.cf
+@@ -101,7 +101,7 @@
+  *	the appropriate value.
   */
  #ifndef XVDestDir
 -#define XVDestDir /usr/X11/xview
 +#define XVDestDir ProjectRoot
  #endif
  /*
-@@ -140,5 +140,5 @@
+  *	Command to add object modules to the library.
+@@ -139,7 +139,7 @@
+  *	installed in $(DESTDIR)/lib/X11/config (aka $(CONFIGDIR)).
   */ 
  #ifndef OnlyNeedsNewXViewConfigInstalled 
 -#define OnlyNeedsNewXViewConfigInstalled NO 
 +#define OnlyNeedsNewXViewConfigInstalled YES 
  #endif 
  /*
-@@ -196,5 +196,5 @@
+  *	If you would like the XView man pages to be installed in 
+@@ -195,7 +195,7 @@
+ # if PreR4Server
  # define LibXViewDefines -DPRE_R4_ICCCM
  # else
 -# define LibXViewDefines -DFULL_R5 -I$(OPENWINHOME)/include -DSUNOS41 -DX11R6
 +# define LibXViewDefines -DNO_CAST_VATOAV -DFULL_R5 -I$(OPENWINHOME)/include -DSUNOS41 -DX11R6
  # endif
  #endif
-@@ -232,5 +232,5 @@
-  */
- #ifndef DebugLibXView
--#define DebugLibXView NO
-+#define DebugLibXView NO
- #endif
  /*
-@@ -260,5 +260,5 @@
+@@ -259,7 +259,7 @@
+  *	following variable to YES.  
   */
  #ifndef InstallAllImages
 -#define InstallAllImages NO
 +#define InstallAllImages YES
  #endif
  /*
-@@ -306,5 +306,5 @@
+  *	If you do not already have the textsw extras menu installed in
+@@ -305,7 +305,7 @@
+  *	malloc() and read() will be used instead.
   */
  #ifndef OsHasMmap
 -#define OsHasMmap YES
 +#define OsHasMmap NO
  #endif
  /*
-@@ -361,5 +361,5 @@
+  *	The implementation of internationalization support in XView depends
+@@ -360,7 +360,7 @@
+  *    	be defined as -PIC
   */
  #ifndef PositionIndependentCodeFlag
 -#define PositionIndependentCodeFlag -PIC
 +#define PositionIndependentCodeFlag -fPIC
  #endif
  
+ /*
diff --git a/x11/xview-config/patches/patch-ac b/x11/xview-config/patches/patch-ac
index d1763ba85a5..7d0b5e3aa41 100644
--- a/x11/xview-config/patches/patch-ac
+++ b/x11/xview-config/patches/patch-ac
@@ -1,29 +1,40 @@
-$NetBSD: patch-ac,v 1.5 2001/05/02 21:46:08 dmcmahill Exp $
+$NetBSD: patch-ac,v 1.6 2009/12/10 20:34:44 abs Exp $
  
---- ./XView.obj.orig	Tue Jun 29 01:13:20 1993
-+++ ./XView.obj	Tue May  1 22:40:31 2001
-@@ -16,5 +16,5 @@
+--- XView.obj.orig	1993-06-29 05:13:20.000000000 +0000
++++ XView.obj
+@@ -15,7 +15,7 @@
+             STD_DEFINES = StandardDefines LibXViewDefines 
  #endif
  HEADERS= ${HDRSPUBLIC} ${HDRSPRIVATE}
 -INCLUDES= -I$(BUILDINCDIR)$(INCDIR) 
 +INCLUDES= -I$(BUILDINCDIR)/$(INCDIR) 
  OBJS = $(TEXT_OBJS) $(DATA_OBJS) $(SPECIAL_OBJS)
  #if !NotLibXView
-@@ -86,5 +86,5 @@
+ ALLFILES = $(SRCS) $(HEADERS)
+@@ -85,17 +85,17 @@ NormalLintTarget($(SRCS))
+ 
  #if SubdirHasPublicHeaders
  # if NotLibXView
 -BuildIncludes($(HDRSPUBLIC),$(PUB_INCDIR),/**/)
 +BuildIncludes($(HDRSPUBLIC),$(PUB_INCDIR),.)
  
  install::
-@@ -93,5 +93,5 @@
+-	$(MKDIRHIER) $(PUB_HEADER_DEST)
++	$(MKDIRHIER) $(DESTDIR)$(PUB_HEADER_DEST)
+ 
  InstallMultiple($(HDRSPUBLIC),$(PUB_HEADER_DEST))
  # else
 -BuildIncludes($(HDRSPUBLIC),$(XVPUB_INCDIR),/**/)
 +BuildIncludes($(HDRSPUBLIC),$(XVPUB_INCDIR),.)
  
  install::
-@@ -104,7 +104,7 @@
+-	$(MKDIRHIER) $(XVPUB_HEADER_DEST)
++	$(MKDIRHIER) $(DESTDIR)$(XVPUB_HEADER_DEST)
+ 
+ InstallMultiple($(HDRSPUBLIC),$(XVPUB_HEADER_DEST))
+ # endif
+@@ -103,19 +103,19 @@ InstallMultiple($(HDRSPUBLIC),$(XVPUB_HE
+ 
  #if SubdirHasPrivateHeaders
  # if NotLibXView
 -BuildIncludes($(HDRSPRIVATE),$(PRI_INCDIR),/**/)
@@ -33,3 +44,16 @@ $NetBSD: patch-ac,v 1.5 2001/05/02 21:46:08 dmcmahill Exp $
 +BuildIncludes($(HDRSPRIVATE),$(XVPRI_INCDIR),.)
  # endif
  # if InstallPrivateHeaders
+ #  if NotLibXView
+ install::
+-	$(MKDIRHIER) $(PRI_HEADER_DEST)
++	$(MKDIRHIER) $(DESTDIR)$(PRI_HEADER_DEST)
+ 
+ InstallMultiple($(HDRSPRIVATE),$(PRI_HEADER_DEST))
+ #  else
+ install::
+-	$(MKDIRHIER) $(XVPRI_HEADER_DEST)
++	$(MKDIRHIER) $(DESTDIR)$(XVPRI_HEADER_DEST)
+ 
+ InstallMultiple($(HDRSPRIVATE),$(XVPRI_HEADER_DEST))
+ #  endif
diff --git a/x11/xview-config/patches/patch-ad b/x11/xview-config/patches/patch-ad
index 674dafe7da6..d10fe5509b8 100644
--- a/x11/xview-config/patches/patch-ad
+++ b/x11/xview-config/patches/patch-ad
@@ -1,11 +1,11 @@
-$NetBSD: patch-ad,v 1.8 2009/01/07 04:28:53 dholland Exp $
+$NetBSD: patch-ad,v 1.9 2009/12/10 20:34:44 abs Exp $
 
 Patch the make rules to exit on error instead of charging ahead.
 Upstream: not sent upstream as upstream is long dead.
 
 
---- ./XView.rules.orig	1993-06-29 01:13:20.000000000 -0400
-+++ ./XView.rules	2008-08-30 12:12:24.000000000 -0400
+--- XView.rules.orig	1993-06-29 05:13:20.000000000 +0000
++++ XView.rules
 @@ -69,7 +69,7 @@ name::									@@\
  	for i in dirs ;\						@@\
  	do \								@@\
diff --git a/x11/xview-config/patches/patch-ae b/x11/xview-config/patches/patch-ae
index 5e8a3f5bb58..f9e21c5564c 100644
--- a/x11/xview-config/patches/patch-ae
+++ b/x11/xview-config/patches/patch-ae
@@ -1,15 +1,18 @@
-$NetBSD: patch-ae,v 1.6 2001/05/02 21:46:08 dmcmahill Exp $
+$NetBSD: patch-ae,v 1.7 2009/12/10 20:34:44 abs Exp $
  
---- ./XView.tmpl.orig	Sun Jun 26 22:10:00 1994
-+++ ./XView.tmpl	Tue May  1 22:40:31 2001
-@@ -97,5 +97,5 @@
+--- XView.tmpl.orig	1994-06-27 02:10:00.000000000 +0000
++++ XView.tmpl
+@@ -96,7 +96,7 @@
+  *      Work around small conflict with Project.tmpl file
   */
  #if UseInstalled
 -              MKDIRHIER = BourneShell BinDir/mkdirhier
 +              MKDIRHIER = mkdirhier
  #endif
  
-@@ -193,12 +193,4 @@
+ #if OsHasLocale
+@@ -192,14 +192,6 @@
+                      AS = as
   */
  /*
 - *	use the same trick X11R5 does for defining rules for installed libs
@@ -22,14 +25,18 @@ $NetBSD: patch-ae,v 1.6 2001/05/02 21:46:08 dmcmahill Exp $
 -/*
   *	Temporary directory used during build process before the include
   *	files are installed.  This is just a place where symbolic links are
-@@ -225,5 +217,5 @@
+  *	placed to point back to the actual files in the build hierarchy to
+@@ -224,7 +216,7 @@
+  *	afterwards.
   */
  #ifndef XVIncludeDirName
 -#define XVIncludeDirName /include
 +#define XVIncludeDirName include
  #endif
                   INCDIR = XVIncludeDirName
-@@ -357,8 +349,8 @@
+ /*
+@@ -356,10 +348,10 @@
+ 
  #if SystemV4
               SYSV_CLIENT_LIB = -lintl -ldl
 -	     XVCLIENTSYSDEFINES = -DSVR4 -DSYSV
@@ -40,7 +47,9 @@ $NetBSD: patch-ae,v 1.6 2001/05/02 21:46:08 dmcmahill Exp $
 +             XVCLIENTSYSDEFINES = -DSUNOS41
  #endif
  
-@@ -372,14 +364,14 @@
+ /*
+@@ -371,16 +363,16 @@
+  */
  
  #if XvI18nLevel == 4
 -	XVCLIENTI18NDEFINES = -DOW_I18N_L4 -DOW_I18N_L3 -DOW_I18N -DFULL_R5
@@ -62,3 +71,4 @@ $NetBSD: patch-ae,v 1.6 2001/05/02 21:46:08 dmcmahill Exp $
 +        XVCLIENTDEFINES = $(XVCLIENTSYSDEFINES) $(XVCLIENTI18NDEFINES)
  
  /*
+  *	Define libraries for XView clients
diff --git a/x11/xview-config/patches/patch-af b/x11/xview-config/patches/patch-af
new file mode 100644
index 00000000000..92f9162a623
--- /dev/null
+++ b/x11/xview-config/patches/patch-af
@@ -0,0 +1,41 @@
+$NetBSD: patch-af,v 1.1 2009/12/10 20:34:44 abs Exp $
+
+--- XView.lib.orig	1993-06-29 05:13:20.000000000 +0000
++++ XView.lib
+@@ -6,14 +6,14 @@
+ #include BandAidCompiler
+ #endif
+ install::
+-	$(MKDIRHIER) $(LIBRARY_DEST)
++	$(MKDIRHIER) $(DESTDIR)$(LIBRARY_DEST)
+ 
+ #if DebugLibXView
+-InstallLibraryNoBuild(${LIBTARGET}_d,$(LIBRARY_DEST))
++InstallLibraryNoBuild(${LIBTARGET}_d,$(DESTDIR)$(LIBRARY_DEST))
+ #endif
+ 
+ #if ProfileLibXView
+-InstallLibraryNoBuild(${LIBTARGET}_p,$(LIBRARY_DEST))
++InstallLibraryNoBuild(${LIBTARGET}_p,$(DESTDIR)$(LIBRARY_DEST))
+ #endif
+ 
+ #if SharedLibXView
+@@ -24,14 +24,14 @@ SubdirBuildNormalSharedLibraryTarget(${L
+ # endif
+ # if !NoDataObjs
+ SubdirBuildNormalSharedLibraryDataTarget(${LIBTARGET},${SOREV},$(UNSHARED_DIR))
+-InstallSharedLibraryDataNoBuild(${LIBTARGET},${SOREV},$(LIBRARY_DEST))
++InstallSharedLibraryDataNoBuild(${LIBTARGET},${SOREV},$(DESTDIR)$(LIBRARY_DEST))
+ # endif
+-InstallSharedLibraryNoBuild(${LIBTARGET},${SOREV},$(LIBRARY_DEST))
++InstallSharedLibraryNoBuild(${LIBTARGET},${SOREV},$(DESTDIR)$(LIBRARY_DEST))
+ #endif
+ 
+-InstallLibraryNoBuild(${LIBTARGET}, $(LIBRARY_DEST))
++InstallLibraryNoBuild(${LIBTARGET}, $(DESTDIR)$(LIBRARY_DEST))
+ SubdirLintLibraryBuild(${LIBTARGET},lint)
+-InstallLintLibrary(${LIBTARGET},$(LINT_LIBRARY_DEST))
++InstallLintLibrary(${LIBTARGET},$(DESTDIR)$(LINT_LIBRARY_DEST))
+ 
+ #ifndef IncludePopulateSCCS
+ #define IncludePopulateSCCS YES
diff --git a/x11/xview-config/patches/patch-ag b/x11/xview-config/patches/patch-ag
new file mode 100644
index 00000000000..bd73aca778b
--- /dev/null
+++ b/x11/xview-config/patches/patch-ag
@@ -0,0 +1,16 @@
+$NetBSD: patch-ag,v 1.1 2009/12/10 20:34:44 abs Exp $
+
+--- XView.prog.orig	1993-06-29 05:13:20.000000000 +0000
++++ XView.prog
+@@ -4,9 +4,9 @@ PopulateSCCSTree(h,$(ALLFILES))
+ 
+ #if HasInfoFiles
+ install::
+-	$(MKDIRHIER) $(HELP_DEST)
++	$(MKDIRHIER) $(DESTDIR)$(HELP_DEST)
+ 
+-InstallNonExecList($(INFOFILES),$(HELP_DEST))
++InstallNonExecList($(INFOFILES),$(DESTDIR)$(HELP_DEST))
+ #endif
+ 
+ #if InstallSrcs