Fix pkglint; fix whitespace in patches; add patch comments.

Improve patch-ag to never attempt to declare errno.

11 files changed, 54 insertions, 31 deletions

diff --git a/x11/xforms/Makefile b/x11/xforms/Makefile
index e56facf6b79..6a3a17ca698 100644
--- a/x11/xforms/Makefile
+++ b/x11/xforms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2012/02/16 20:28:21 hans Exp $
+# $NetBSD: Makefile,v 1.68 2012/07/30 02:53:57 dholland Exp $
 #
 
 DISTNAME=	xforms-1.0
@@ -15,9 +15,9 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 USE_IMAKE=	YES
 
 MAKE_JOBS_SAFE=	no
-MAKE_ENV=	DEPEND_DEFINES=${CPPFLAGS:M*:Q}
+MAKE_ENV+=	DEPEND_DEFINES=${CPPFLAGS:M*:Q}
 MAKE_FLAGS+=	MANPATH=${PREFIX}/${PKGMANDIR}
-SCRIPTS_ENV=	DEPEND_DEFINES="${CPPFLAGS}"
+SCRIPTS_ENV+=	DEPEND_DEFINES=${CPPFLAGS:Q}
 
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
diff --git a/x11/xforms/PLIST b/x11/xforms/PLIST
index 2558c7fe444..7dba3318261 100644
--- a/x11/xforms/PLIST
+++ b/x11/xforms/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2003/03/03 04:17:37 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.4 2012/07/30 02:53:57 dholland Exp $
 bin/fd2ps
 bin/fdesign
 include/X11/flimage.h
@@ -11,5 +11,5 @@ lib/libforms.a
 lib/libforms.so
 lib/libforms.so.1
 lib/libforms.so.${PKGVERSION}
-${IMAKE_MAN_DIR}/fd2ps.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/fdesign.${IMAKE_MANNEWSUFFIX}
+${IMAKE_MAN_DIR}/fd2ps.${IMAKE_MAN_SUFFIX}
+${IMAKE_MAN_DIR}/fdesign.${IMAKE_MAN_SUFFIX}
diff --git a/x11/xforms/distinfo b/x11/xforms/distinfo
index e8324ea42c7..8be281f4837 100644
--- a/x11/xforms/distinfo
+++ b/x11/xforms/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.19 2011/09/08 00:24:42 joerg Exp $
+$NetBSD: distinfo,v 1.20 2012/07/30 02:53:57 dholland Exp $
 
 SHA1 (xforms-1.0.tar.gz) = 865086d2885331ce30b05c7aa07cd8c3d02ce87b
 RMD160 (xforms-1.0.tar.gz) = 2972fb4534d3794b2027e81f4222f20a04cc81f8
 Size (xforms-1.0.tar.gz) = 1012878 bytes
-SHA1 (patch-aa) = e0ae2f68d13beb4cba5370350dd2dcfcafe2acdc
-SHA1 (patch-ab) = b0419c46f31f54ae1c9415c4c47335a70dceda08
-SHA1 (patch-ac) = 2fe4b26e4f4f0b4c020b68b01d95cbe38b6cbceb
-SHA1 (patch-ad) = 324100fb05e723fbaa92126e279074860c842f1b
-SHA1 (patch-ae) = ba8b68d7e886311cb2fbfe4e0a45e975e7790821
-SHA1 (patch-af) = f3fdbbb2a103505e6f18608f0c3882cc1d264b00
-SHA1 (patch-ag) = 447c24ad912a65af5f93b393579516a900a10c4e
-SHA1 (patch-ah) = 45129394ca29063443548d961c7954ea12cc435f
+SHA1 (patch-aa) = d33ccbf03d2896c0a0495b0a806a7e258ab010a3
+SHA1 (patch-ab) = fec198a109b9c7af16e3297a7f6048a501495723
+SHA1 (patch-ac) = 74484a9710f64f1ba7c30785a5b7007cc53538a4
+SHA1 (patch-ad) = 6a25db72dc39471b2b437c006f8d1186d4b4aaab
+SHA1 (patch-ae) = c77dce8a896ac89915c64fcc9700d4079ed81117
+SHA1 (patch-af) = ff655f2daf11da78f85faad4aad0fcfcc250569c
+SHA1 (patch-ag) = 7364316d275b0da50c9f2749cf462c21aa34b029
+SHA1 (patch-ah) = 636f09a48385762d5bee82c4addbe180a2e95a6b
diff --git a/x11/xforms/patches/patch-aa b/x11/xforms/patches/patch-aa
index 56893a476b6..040335df6c6 100644
--- a/x11/xforms/patches/patch-aa
+++ b/x11/xforms/patches/patch-aa
@@ -1,4 +1,8 @@
-$NetBSD: patch-aa,v 1.9 2011/09/08 00:24:43 joerg Exp $
+$NetBSD: patch-aa,v 1.10 2012/07/30 02:53:57 dholland Exp $
+
+- Use optimization level that actually exists (gcc) or works (clang).
+- Don't use opengl. (is this still correct?)
+- Configure paths for pkgsrc.
 
 --- Imakefile.orig	2002-12-03 17:25:43.000000000 +0000
 +++ Imakefile
diff --git a/x11/xforms/patches/patch-ab b/x11/xforms/patches/patch-ab
index 7a6e6253aa7..d59321789cb 100644
--- a/x11/xforms/patches/patch-ab
+++ b/x11/xforms/patches/patch-ab
@@ -1,4 +1,9 @@
-$NetBSD: patch-ab,v 1.7 2011/09/08 00:24:43 joerg Exp $
+$NetBSD: patch-ab,v 1.8 2012/07/30 02:53:57 dholland Exp $
+
+- Add image libraries to link. (is this needed?)
+- Honor LDFLAGS so rpaths work.
+- Configure paths for pkgsrc.
+- Use optimization level that actually exists (gcc) or works (clang).
 
 --- demos/Imakefile.orig	2002-11-19 20:50:52.000000000 +0000
 +++ demos/Imakefile
diff --git a/x11/xforms/patches/patch-ac b/x11/xforms/patches/patch-ac
index b922a0cecbd..1d8a89c8888 100644
--- a/x11/xforms/patches/patch-ac
+++ b/x11/xforms/patches/patch-ac
@@ -1,4 +1,9 @@
-$NetBSD: patch-ac,v 1.5 2011/09/08 00:24:43 joerg Exp $
+$NetBSD: patch-ac,v 1.6 2012/07/30 02:53:57 dholland Exp $
+
+- Add image libraries to link. (is this needed?)
+- Honor LDFLAGS so rpaths work.
+- Configure paths for pkgsrc.
+- Use optimization level that actually exists (gcc) or works (clang).
 
 --- fd2ps/Imakefile.orig	2002-10-01 16:40:02.000000000 +0000
 +++ fd2ps/Imakefile
diff --git a/x11/xforms/patches/patch-ad b/x11/xforms/patches/patch-ad
index 9c35026d888..fe186dafef6 100644
--- a/x11/xforms/patches/patch-ad
+++ b/x11/xforms/patches/patch-ad
@@ -1,9 +1,13 @@
-$NetBSD: patch-ad,v 1.4 2002/12/28 19:49:09 jschauma Exp $
+$NetBSD: patch-ad,v 1.5 2012/07/30 02:53:57 dholland Exp $
+
+- Add image libraries to link. (is this needed?)
+- Honor LDFLAGS so rpaths work.
+- Configure paths for pkgsrc.
 
 --- fdesign/Imakefile.orig	2002-11-16 13:29:20.000000000 -0800
 +++ fdesign/Imakefile	2002-12-25 10:40:31.000000000 -0800
 @@ -71,7 +71,7 @@
-
+ 
  FORMSLIBDIR     = $(TOP)/lib
  FORMSINCDIR     = $(FORMSLIBDIR)       
 -FORMSLIB        = -L$(FORMSLIBDIR) -lforms
diff --git a/x11/xforms/patches/patch-ae b/x11/xforms/patches/patch-ae
index 8f1dbcc4665..841dbc7d4b4 100644
--- a/x11/xforms/patches/patch-ae
+++ b/x11/xforms/patches/patch-ae
@@ -1,10 +1,12 @@
-$NetBSD: patch-ae,v 1.3 2002/12/28 19:49:09 jschauma Exp $
+$NetBSD: patch-ae,v 1.4 2012/07/30 02:53:57 dholland Exp $
+
+Configure paths for pkgsrc.
 
 --- lib/Imakefile.orig	2002-12-25 10:05:09.000000000 -0800
 +++ lib/Imakefile	2002-12-25 10:05:37.000000000 -0800
 @@ -128,7 +128,7 @@
  		  -Ifd
-
+ 
  DEPEND_DEFINES	= \
 -		  -I/usr/local/include
 +		  -I${LOCALBASE}/include
diff --git a/x11/xforms/patches/patch-af b/x11/xforms/patches/patch-af
index f62f0812630..bada7649c39 100644
--- a/x11/xforms/patches/patch-af
+++ b/x11/xforms/patches/patch-af
@@ -1,4 +1,6 @@
-$NetBSD: patch-af,v 1.1 2003/01/12 18:30:56 jschauma Exp $
+$NetBSD: patch-af,v 1.2 2012/07/30 02:53:57 dholland Exp $
+
+Honor pkgsrc LDFLAGS.
 
 --- image/Imakefile.orig	Sun Jan 12 18:16:51 2003
 +++ image/Imakefile	Sun Jan 12 18:17:20 2003
diff --git a/x11/xforms/patches/patch-ag b/x11/xforms/patches/patch-ag
index 6fa2d1f5d81..fe582c20d71 100644
--- a/x11/xforms/patches/patch-ag
+++ b/x11/xforms/patches/patch-ag
@@ -1,15 +1,14 @@
-$NetBSD: patch-ag,v 1.2 2005/12/05 20:51:20 rillig Exp $
+$NetBSD: patch-ag,v 1.3 2012/07/30 02:53:57 dholland Exp $
 
---- lib/errmsg.c.orig	2005-07-22 18:01:01.000000000 +0000
+Don't try to declare own errno.
+
+--- lib/errmsg.c.orig	2002-05-30 17:23:26.000000000 +0000
 +++ lib/errmsg.c
-@@ -51,7 +51,10 @@
+@@ -51,7 +51,6 @@ char *id_errm = "$Id: errmsg.c,v 0.80 19
  
  #include "forms.h"
  #include "ulib.h"
-+
-+#ifndef errno
- extern int errno;		/* system error no            */
-+#endif
+-extern int errno;		/* system error no            */
  
  #ifdef DONT_HAVE_STRERROR
  extern char *sys_errlist[];
diff --git a/x11/xforms/patches/patch-ah b/x11/xforms/patches/patch-ah
index 0e8cedbd247..5d82c5b3a17 100644
--- a/x11/xforms/patches/patch-ah
+++ b/x11/xforms/patches/patch-ah
@@ -1,4 +1,6 @@
-$NetBSD: patch-ah,v 1.1 2005/11/07 14:41:20 joerg Exp $
+$NetBSD: patch-ah,v 1.2 2012/07/30 02:53:57 dholland Exp $
+
+Dragonfly-specific dirent handling. (From 2005; is this still needed?)
 
 --- lib/listdir.c.orig	2005-11-07 14:16:31.000000000 +0000
 +++ lib/listdir.c