Remove the _Use macro as it conflicts with the one supplied

by X11R6.  Also portlin clean and separate patches out so
there is one file per patch.

PR:		6411
Submitted by:	Dom Mitchell <dom@myrddin.demon.co.uk>

2 files changed, 5 insertions, 282 deletions

diff --git a/x11-toolkits/xview/Makefile b/x11-toolkits/xview/Makefile
index ca5ebc00330a..d5371fb1470a 100644
--- a/x11-toolkits/xview/Makefile
+++ b/x11-toolkits/xview/Makefile
@@ -3,13 +3,15 @@
 # Date created:         22 November 1994
 # Whom:                 ljo
 #
-# $Id: Makefile,v 1.7 1996/11/16 10:49:57 asami Exp $
+# $Id: Makefile,v 1.8 1997/10/28 12:28:08 tg Exp $
 #
 
-DISTNAME=	xview-config-3.2.1
+DISTNAME=	xview3.2p1-X11R6
+PKGNAME=	xview-config-3.2.1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_LOCAL}
-DISTFILES=	xview3.2p1-X11R6.tar.gz
+
+MAINTAINER=	ports@FreeBSD.ORG
 
 WRKSRC=      	${WRKDIR}/xview3.2p1-X11R6/config
 USE_IMAKE=	yes
diff --git a/x11-toolkits/xview/files/patch-aa b/x11-toolkits/xview/files/patch-aa
index 7eeb3aa34495..ce8a18a346c4 100644
--- a/x11-toolkits/xview/files/patch-aa
+++ b/x11-toolkits/xview/files/patch-aa
@@ -18,282 +18,3 @@ diff -rc ../old/xview3.2p1-X11R6/config/Imakefile Imakefile
   CFFILES = $(XVFILES) $(HEADERS)
   
   InstallMultipleDestFlags(install,$(CFFILES),$(CONFIGDIR),$(INSTDATFLAGS))
-diff -rc ../old/xview3.2p1-X11R6/config/XView.cf XView.cf
-*** ../old/xview3.2p1-X11R6/config/XView.cf	Sun Jun 26 22:09:19 1994
---- XView.cf	Sun Nov 20 13:38:58 1994
-***************
-*** 101,107 ****
-   *	the appropriate value.
-   */
-  #ifndef XVDestDir
-! #define XVDestDir /usr/X11/xview
-  #endif
-  /*
-   *	Command to add object modules to the library.
---- 101,107 ----
-   *	the appropriate value.
-   */
-  #ifndef XVDestDir
-! #define XVDestDir /usr/X11R6
-  #endif
-  /*
-   *	Command to add object modules to the library.
-***************
-*** 139,145 ****
-   *	installed in $(DESTDIR)/lib/X11/config (aka $(CONFIGDIR)).
-   */ 
-  #ifndef OnlyNeedsNewXViewConfigInstalled 
-! #define OnlyNeedsNewXViewConfigInstalled NO 
-  #endif 
-  /*
-   *	If you would like the XView man pages to be installed in 
---- 139,145 ----
-   *	installed in $(DESTDIR)/lib/X11/config (aka $(CONFIGDIR)).
-   */ 
-  #ifndef OnlyNeedsNewXViewConfigInstalled 
-! #define OnlyNeedsNewXViewConfigInstalled YES 
-  #endif 
-  /*
-   *	If you would like the XView man pages to be installed in 
-***************
-*** 305,311 ****
-   *	malloc() and read() will be used instead.
-   */
-  #ifndef OsHasMmap
-! #define OsHasMmap YES
-  #endif
-  /*
-   *	The implementation of internationalization support in XView depends
---- 305,311 ----
-   *	malloc() and read() will be used instead.
-   */
-  #ifndef OsHasMmap
-! #define OsHasMmap NO
-  #endif
-  /*
-   *	The implementation of internationalization support in XView depends
-***************
-*** 315,321 ****
-   *	features disabled.
-   */
-  #ifndef OsHasLocale
-! #define OsHasLocale YES
-  #endif
-  /*
-   *	There are number of memory allocation macros in lib/libxview/base.h 
---- 315,321 ----
-   *	features disabled.
-   */
-  #ifndef OsHasLocale
-! #define OsHasLocale NO
-  #endif
-  /*
-   *	There are number of memory allocation macros in lib/libxview/base.h 
-***************
-*** 360,366 ****
-   *    	be defined as -PIC
-   */
-  #ifndef PositionIndependentCodeFlag
-! #define PositionIndependentCodeFlag -PIC
-  #endif
-  
-  /*
---- 360,366 ----
-   *    	be defined as -PIC
-   */
-  #ifndef PositionIndependentCodeFlag
-! #define PositionIndependentCodeFlag -fpic
-  #endif
-  
-  /*
-diff -rc ../old/xview3.2p1-X11R6/config/XView.obj XView.obj
-*** ../old/xview3.2p1-X11R6/config/XView.obj	Tue Jun 29 01:13:20 1993
---- XView.obj	Sun Nov 20 13:38:59 1994
-***************
-*** 15,21 ****
-              STD_DEFINES = StandardDefines LibXViewDefines 
-  #endif
-  HEADERS= ${HDRSPUBLIC} ${HDRSPRIVATE}
-! INCLUDES= -I$(BUILDINCDIR)$(INCDIR) 
-  OBJS = $(TEXT_OBJS) $(DATA_OBJS) $(SPECIAL_OBJS)
-  #if !NotLibXView
-  ALLFILES = $(SRCS) $(HEADERS)
---- 15,21 ----
-              STD_DEFINES = StandardDefines LibXViewDefines 
-  #endif
-  HEADERS= ${HDRSPUBLIC} ${HDRSPRIVATE}
-! INCLUDES= -I$(BUILDINCDIR)/$(INCDIR) 
-  OBJS = $(TEXT_OBJS) $(DATA_OBJS) $(SPECIAL_OBJS)
-  #if !NotLibXView
-  ALLFILES = $(SRCS) $(HEADERS)
-***************
-*** 85,98 ****
-  
-  #if SubdirHasPublicHeaders
-  # if NotLibXView
-! BuildIncludes($(HDRSPUBLIC),$(PUB_INCDIR),/**/)
-  
-  install::
-  	$(MKDIRHIER) $(PUB_HEADER_DEST)
-  
-  InstallMultiple($(HDRSPUBLIC),$(PUB_HEADER_DEST))
-  # else
-! BuildIncludes($(HDRSPUBLIC),$(XVPUB_INCDIR),/**/)
-  
-  install::
-  	$(MKDIRHIER) $(XVPUB_HEADER_DEST)
---- 85,98 ----
-  
-  #if SubdirHasPublicHeaders
-  # if NotLibXView
-! BuildIncludes($(HDRSPUBLIC),$(PUB_INCDIR),.)
-  
-  install::
-  	$(MKDIRHIER) $(PUB_HEADER_DEST)
-  
-  InstallMultiple($(HDRSPUBLIC),$(PUB_HEADER_DEST))
-  # else
-! BuildIncludes($(HDRSPUBLIC),$(XVPUB_INCDIR),.)
-  
-  install::
-  	$(MKDIRHIER) $(XVPUB_HEADER_DEST)
-***************
-*** 103,111 ****
-  
-  #if SubdirHasPrivateHeaders
-  # if NotLibXView
-! BuildIncludes($(HDRSPRIVATE),$(PRI_INCDIR),/**/)
-  # else
-! BuildIncludes($(HDRSPRIVATE),$(XVPRI_INCDIR),/**/)
-  # endif
-  # if InstallPrivateHeaders
-  #  if NotLibXView
---- 103,111 ----
-  
-  #if SubdirHasPrivateHeaders
-  # if NotLibXView
-! BuildIncludes($(HDRSPRIVATE),$(PRI_INCDIR),.)
-  # else
-! BuildIncludes($(HDRSPRIVATE),$(XVPRI_INCDIR),.)
-  # endif
-  # if InstallPrivateHeaders
-  #  if NotLibXView
-diff -rc ../old/xview3.2p1-X11R6/config/XView.rules XView.rules
-*** ../old/xview3.2p1-X11R6/config/XView.rules	Tue Jun 29 01:13:20 1993
---- XView.rules	Sun Nov 20 13:38:59 1994
-***************
-*** 366,374 ****
-  #ifndef InstallSharedLibraryNoBuild
-  #define	InstallSharedLibraryNoBuild(libname,rev,dest)				@@\
-  install::  								@@\
-!         $(RM) /dest/lib/**/libname.so                                   @@\
-  	$(INSTALL) -c $(INSTSHAREDLIBFLAGS) lib/**/libname.so.rev dest	@@\
-!         (cd dest; $(LN) lib/**/libname.so.rev lib/**/libname.so)
-  
-  #endif /* InstallSharedLibraryNoBuild */
-  
---- 366,374 ----
-  #ifndef InstallSharedLibraryNoBuild
-  #define	InstallSharedLibraryNoBuild(libname,rev,dest)				@@\
-  install::  								@@\
-! 	$(RM) /dest/lib/**/libname.so                                   @@\
-  	$(INSTALL) -c $(INSTSHAREDLIBFLAGS) lib/**/libname.so.rev dest	@@\
-! 	(cd dest; $(LN) lib/**/libname.so.rev lib/**/libname.so)
-  
-  #endif /* InstallSharedLibraryNoBuild */
-  
-diff -rc ../old/xview3.2p1-X11R6/config/XView.tmpl XView.tmpl
-*** ../old/xview3.2p1-X11R6/config/XView.tmpl	Sun Jun 26 22:10:00 1994
---- XView.tmpl	Sun Nov 20 13:38:59 1994
-***************
-*** 96,102 ****
-   *      Work around small conflict with Project.tmpl file
-   */
-  #if UseInstalled
-!               MKDIRHIER = BourneShell BinDir/mkdirhier
-  #endif
-  
-  #if OsHasLocale
---- 96,102 ----
-   *      Work around small conflict with Project.tmpl file
-   */
-  #if UseInstalled
-!               MKDIRHIER = mkdirhier
-  #endif
-  
-  #if OsHasLocale
-***************
-*** 224,230 ****
-   *	afterwards.
-   */
-  #ifndef XVIncludeDirName
-! #define XVIncludeDirName /include
-  #endif
-                   INCDIR = XVIncludeDirName
-  /*
---- 224,230 ----
-   *	afterwards.
-   */
-  #ifndef XVIncludeDirName
-! #define XVIncludeDirName include
-  #endif
-                   INCDIR = XVIncludeDirName
-  /*
-***************
-*** 356,365 ****
-  
-  #if SystemV4
-               SYSV_CLIENT_LIB = -lintl -ldl
-! 	     XVCLIENTSYSDEFINES = -DSVR4 -DSYSV
-  #else
-               SYSV_CLIENT_LIB =
-! 	     XVCLIENTSYSDEFINES = -DSUNOS41
-  #endif
-  
-  /*
---- 356,365 ----
-  
-  #if SystemV4
-               SYSV_CLIENT_LIB = -lintl -ldl
-!              XVCLIENTSYSDEFINES = -DSVR4 -DSYSV
-  #else
-               SYSV_CLIENT_LIB =
-!              XVCLIENTSYSDEFINES = -DSUNOS41
-  #endif
-  
-  /*
-***************
-*** 371,386 ****
-   */
-  
-  #if XvI18nLevel == 4
-! 	XVCLIENTI18NDEFINES = -DOW_I18N_L4 -DOW_I18N_L3 -DOW_I18N -DFULL_R5
-! 	XVCLIENTMISCLIB = -lw
-! 	XVCLIENTINCLUDES = -I$(OPENWINHOME)/include
-  #else
-! 	XVCLIENTI18NDEFINES = -DOW_I18N_L3
-! 	XVCLIENTMISCLIB = 
-! 	XVCLIENTINCLUDES = 
-  #endif
-  
-! 	XVCLIENTDEFINES = $(XVCLIENTSYSDEFINES) $(XVCLIENTI18NDEFINES)
-  
-  /*
-   *	Define libraries for XView clients
---- 371,386 ----
-   */
-  
-  #if XvI18nLevel == 4
-!         XVCLIENTI18NDEFINES = -DOW_I18N_L4 -DOW_I18N_L3 -DOW_I18N -DFULL_R5
-!         XVCLIENTMISCLIB = -lw
-!         XVCLIENTINCLUDES = -I$(OPENWINHOME)/include
-  #else
-!         XVCLIENTI18NDEFINES = -DOW_I18N_L3
-!         XVCLIENTMISCLIB = 
-!         XVCLIENTINCLUDES = 
-  #endif
-  
-!         XVCLIENTDEFINES = $(XVCLIENTSYSDEFINES) $(XVCLIENTI18NDEFINES)
-  
-  /*
-   *	Define libraries for XView clients