more warnings go away.

x11/xview/config/patches/p-lib_libxview_base_gen_impl_h

@@ -0,0 +1,9 @@
+$OpenBSD: p-lib_libxview_base_gen_impl_h,v 1.1 2003/12/30 02:00:39 espie Exp $
+--- lib/libxview/base/gen_impl.h.orig	2003-12-30 02:52:10.000000000 +0100
++++ lib/libxview/base/gen_impl.h	2003-12-30 02:52:25.000000000 +0100
+@@ -39,4 +39,4 @@ typedef	struct	{
+     char		*instance_name;
+ } Generic_info;
+ 
+-#endif _gen_impl_h_already_included
++#endif /* _gen_impl_h_already_included */

x11/xview/config/patches/p-lib_libxview_base_xv_list_h

@@ -0,0 +1,9 @@
+$OpenBSD: p-lib_libxview_base_xv_list_h,v 1.1 2003/12/30 02:00:39 espie Exp $
+--- lib/libxview/base/xv_list.h.orig	2003-12-30 02:53:03.000000000 +0100
++++ lib/libxview/base/xv_list.h	2003-12-30 02:53:18.000000000 +0100
+@@ -91,4 +91,4 @@ xv_sl_remove();
+ 	for (_this = (_type)_head, _next = XV_SL_SAFE_NEXT(_this);	\
+ 	     _this; _this = (_type)_next, _next = XV_SL_SAFE_NEXT(_this))
+ 
+-#endif _xv_list_h_already_included
++#endif /* _xv_list_h_already_included */

x11/xview/config/patches/p-lib_libxview_dnd_dndimpl_h

@@ -0,0 +1,9 @@
+$OpenBSD: p-lib_libxview_dnd_dndimpl_h,v 1.1 2003/12/30 02:00:39 espie Exp $
+--- lib/libxview/dnd/dndimpl.h.orig	2003-12-30 02:52:47.000000000 +0100
++++ lib/libxview/dnd/dndimpl.h	2003-12-30 02:52:54.000000000 +0100
+@@ -112,4 +112,4 @@ Pkg_private Xv_opaque	dnd_set_avlist();
+ Pkg_private Xv_opaque	dnd_get_attr();
+ Pkg_private int		dnd_destroy();
+ 
+-#endif ~xview_dndimpl_DEFINED
++#endif /* ~xview_dndimpl_DEFINED */

x11/xview/config/patches/p-lib_libxview_dnd_site_impl_h

@@ -0,0 +1,9 @@
+$OpenBSD: p-lib_libxview_dnd_site_impl_h,v 1.1 2003/12/30 02:00:39 espie Exp $
+--- lib/libxview/dnd/site_impl.h.orig	2003-12-30 02:54:00.000000000 +0100
++++ lib/libxview/dnd/site_impl.h	2003-12-30 02:54:06.000000000 +0100
+@@ -81,4 +81,4 @@ Pkg_private Xv_opaque	dnd_site_set_avlis
+ Pkg_private Xv_opaque	dnd_site_get_attr();
+ Pkg_private int		dnd_site_destroy();
+ 
+-#endif ~xview_site_impl_DEFINED
++#endif /* ~xview_site_impl_DEFINED */

x11/xview/config/patches/p-lib_pixrect_memvar_h

@@ -1,6 +1,15 @@
-$OpenBSD: p-lib_pixrect_memvar_h,v 1.1 2003/12/30 01:52:22 espie Exp $
---- lib/pixrect/memvar.h.orig	2003-12-30 02:36:18.000000000 +0100
-+++ lib/pixrect/memvar.h	2003-12-30 02:36:38.000000000 +0100
+$OpenBSD: p-lib_pixrect_memvar_h,v 1.2 2003/12/30 02:00:39 espie Exp $
+--- lib/pixrect/memvar.h.orig	1993-06-29 07:18:33.000000000 +0200
++++ lib/pixrect/memvar.h	2003-12-30 02:51:08.000000000 +0100
+@@ -48,7 +48,7 @@ struct mprp_data {
+ #ifdef i386
+ #define MP_I386		8	/* Pixrect is for 386 architecture */
+ #define MP_STATIC       16	/* Pixrect is a static pixrect */
+-#endif i386
++#endif /* i386 */
+ #define	MP_FONT		32	/* Pixrect is a part of a Pixfont */
+ 				/* (hint to pr_batchrop) */
+ 
 @@ -144,18 +144,18 @@ int	mem_get();
  int	mem_put();
  int	mem_vector();

x11/xview/config/patches/p-lib_pixrect_memvar_h.orig

@@ -0,0 +1,26 @@
+$OpenBSD: p-lib_pixrect_memvar_h.orig,v 1.1 2003/12/30 02:00:39 espie Exp $
+--- lib/pixrect/memvar.h.orig	2003-12-30 02:36:18.000000000 +0100
++++ lib/pixrect/memvar.h	2003-12-30 02:36:38.000000000 +0100
+@@ -144,18 +144,18 @@ int	mem_get();
+ int	mem_put();
+ int	mem_vector();
+ Pixrect *mem_region();
+-#endif KERNEL
++#endif /* KERNEL */
+ int	mem_putcolormap();
+ int	mem_putattributes();
+ #ifndef KERNEL
+ int	mem_getcolormap();
+ int	mem_getattributes();
+-#endif KERNEL
++#endif /* KERNEL */
+ 
+ #else /* NEWPIXMEM */
+ #define	MP_NOTMPR(pr)	(0)
+ extern struct pixrectops mem_ops;
+ int	mem_destroy();
+-#endif NEWPIXMEM
++#endif /* NEWPIXMEM */
+ 
+-#endif	!memvar_DEFINED
++#endif	/* !memvar_DEFINED */

x11/xview/config/patches/p-lib_pixrect_pr_planegroups_h

@@ -0,0 +1,9 @@
+$OpenBSD: p-lib_pixrect_pr_planegroups_h,v 1.1 2003/12/30 02:00:39 espie Exp $
+--- lib/pixrect/pr_planegroups.h.orig	2003-12-30 02:53:32.000000000 +0100
++++ lib/pixrect/pr_planegroups.h	2003-12-30 02:53:38.000000000 +0100
+@@ -47,4 +47,4 @@ extern int pr_get_plane_group();
+ extern void pr_set_plane_group();
+ extern void pr_set_planes();
+ 
+-#endif	pr_planegroups_DEFINED
++#endif	/* pr_planegroups_DEFINED */

x11/xview/config/patches/p-libxview-base-xv_debug_h

@@ -1,6 +1,6 @@
 --- lib/libxview/base/xv_debug.h.orig	1993-06-29 07:14:44.000000000 +0200
-+++ lib/libxview/base/xv_debug.h	2003-12-30 01:31:11.000000000 +0100
-@@ -9,11 +9,16 @@
++++ lib/libxview/base/xv_debug.h	2003-12-30 02:51:57.000000000 +0100
+@@ -9,12 +9,17 @@
  #ifndef _xv_debug_h_already_included
  #define _xv_debug_h_already_included
  
@@ -10,11 +10,32 @@
  #ifndef FILE
  #ifndef SVR4
 -#undef NULL
- #endif SVR4
+-#endif SVR4
++#endif /* SVR4 */
  #include <stdio.h>
+-#endif FILE
 +#ifndef NULL
 +#define NULL 0
 +#endif
- #endif FILE
++#endif /* FILE */
  #include <xview/pkg.h>		/* needed to get definition of Xv_private */
    /* 
+    * Not strictly necessary to include <stdio.h> here, but eliminates
+@@ -88,7 +93,7 @@ typedef enum {
+  * xv_got_debugger to TRUE from the debugger.
+  */
+ 
+-#else _XV_DEBUG
++#else /* _XV_DEBUG */
+ 
+ #define DEBUG_ONLY(x)
+ #define AN_ERROR(expr, flag)	(expr)
+@@ -97,6 +102,6 @@ typedef enum {
+ #define FATAL_ERROR(exit_code)	if (xv_abort_fatal_error) abort() \
+ 				else exit(exit_code)
+ 
+-#endif _XV_DEBUG
++#endif /* _XV_DEBUG */
+ 
+-#endif _xv_debug_h_already_included
++#endif /* _xv_debug_h_already_included */

x11/xview/config/patches/p-libxview-base-xv_debug_h.orig

@@ -0,0 +1,20 @@
+--- lib/libxview/base/xv_debug.h.orig	1993-06-29 07:14:44.000000000 +0200
++++ lib/libxview/base/xv_debug.h	2003-12-30 01:31:11.000000000 +0100
+@@ -9,11 +9,16 @@
+ #ifndef _xv_debug_h_already_included
+ #define _xv_debug_h_already_included
+ 
++#ifdef NULL
++#undef NULL
++#endif
+ #ifndef FILE
+ #ifndef SVR4
+-#undef NULL
+ #endif SVR4
+ #include <stdio.h>
++#ifndef NULL
++#define NULL 0
++#endif
+ #endif FILE
+ #include <xview/pkg.h>		/* needed to get definition of Xv_private */
+   /*