Miscellaneous cleanups and fixes, some of the windowmaker stuff

gracefully provided by danfe.

19 files changed, 34 insertions, 47 deletions

diff --git a/dns/bind-tools/pkg-descr b/dns/bind-tools/pkg-descr
index d1f59026f164..c13f6d56bbea 100644
--- a/dns/bind-tools/pkg-descr
+++ b/dns/bind-tools/pkg-descr
@@ -4,4 +4,4 @@ The user space command line tools from the latest version of BIND:
 WWW: https://www.isc.org/software/bind
 
 - Doug Barton
-DougB@FreeBSD.org
+dougb@FreeBSD.org
diff --git a/dns/bind94-geoip/pkg-descr b/dns/bind94-geoip/pkg-descr
index 018d2b86d5ce..70373cb5a345 100644
--- a/dns/bind94-geoip/pkg-descr
+++ b/dns/bind94-geoip/pkg-descr
@@ -8,4 +8,4 @@ its usage. There are probably many others.
 WWW: http://www.caraytech.com/geodns/
 
 - Doug Barton
-DougB@FreeBSD.org
+dougb@FreeBSD.org
diff --git a/dns/bind94/pkg-descr b/dns/bind94/pkg-descr
index 034dd02c8e77..bcce27fcd9ad 100644
--- a/dns/bind94/pkg-descr
+++ b/dns/bind94/pkg-descr
@@ -21,4 +21,4 @@ Multiprocessor Support, including working threads in this version
 WWW: https://www.isc.org/software/bind
 
 - Doug Barton
-DougB@FreeBSD.org
+dougb@FreeBSD.org
diff --git a/dns/bind96/pkg-descr b/dns/bind96/pkg-descr
index 6eb6aa87fc79..6a9ac2dc9c23 100644
--- a/dns/bind96/pkg-descr
+++ b/dns/bind96/pkg-descr
@@ -21,4 +21,4 @@ See the CHANGES file for more information on features.
 WWW: https://www.isc.org/software/bind
 
 - Doug Barton
-DougB@FreeBSD.org
+dougb@FreeBSD.org
diff --git a/dns/bind97/pkg-descr b/dns/bind97/pkg-descr
index aef0b76638d8..2723c54279ab 100644
--- a/dns/bind97/pkg-descr
+++ b/dns/bind97/pkg-descr
@@ -16,4 +16,4 @@ Some of the new features of BIND 9.7.x are:
 WWW: https://www.isc.org/software/bind
 
 - Doug Barton
-DougB@FreeBSD.org
+dougb@FreeBSD.org
diff --git a/dns/libbind/Makefile b/dns/libbind/Makefile
index b152e589ef8b..5a4c5f705818 100644
--- a/dns/libbind/Makefile
+++ b/dns/libbind/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	libbind/${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.asc
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-MAINTAINER=	DougB@FreeBSD.org
+MAINTAINER=	dougb@FreeBSD.org
 COMMENT=	Standard C resolver library
 
 MAKE_JOBS_UNSAFE=	yes
diff --git a/dns/libbind/pkg-descr b/dns/libbind/pkg-descr
index cb0ea294d9fc..9d6eecb17b59 100644
--- a/dns/libbind/pkg-descr
+++ b/dns/libbind/pkg-descr
@@ -16,4 +16,4 @@ translations, and utilizing /etc/resolv.conf for resolver configuration.
 WWW: https://www.isc.org/software/libbind
 
 - Doug Barton
-DougB@FreeBSD.org
+dougb@FreeBSD.org
diff --git a/dns/p5-Net-DNS/Makefile b/dns/p5-Net-DNS/Makefile
index c1bf8f2daefa..8786ccf069f0 100644
--- a/dns/p5-Net-DNS/Makefile
+++ b/dns/p5-Net-DNS/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	dns net perl5 ipv6
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	DougB@FreeBSD.org
+MAINTAINER=	dougb@FreeBSD.org
 COMMENT=	Perl5 interface to the DNS resolver, and dynamic updates
 
 # Warnings during build are harmless, the port does not need these to build
diff --git a/dns/p5-Net-DNS/pkg-descr b/dns/p5-Net-DNS/pkg-descr
index a991535ca4f0..99bfb2491a91 100644
--- a/dns/p5-Net-DNS/pkg-descr
+++ b/dns/p5-Net-DNS/pkg-descr
@@ -9,4 +9,4 @@
 WWW: http://search.cpan.org/dist/Net-DNS/
 
 - Doug Barton
-DougB@FreeBSD.org
+dougb@FreeBSD.org
diff --git a/irc/sirc/Makefile b/irc/sirc/Makefile
index 206d541e9335..c28cc35c5c30 100644
--- a/irc/sirc/Makefile
+++ b/irc/sirc/Makefile
@@ -16,7 +16,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 DIST_SUBDIR=	sirc
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-MAINTAINER=	DougB@FreeBSD.org
+MAINTAINER=	dougb@FreeBSD.org
 COMMENT=	Small (150k), fast, perl-based IRC client
 
 LICENSE=	GPLv2
diff --git a/print/hpijs/Makefile b/print/hpijs/Makefile
index 1079f7aff3e8..cb5e2082cef1 100644
--- a/print/hpijs/Makefile
+++ b/print/hpijs/Makefile
@@ -11,7 +11,7 @@ PORTREVISION=	5
 CATEGORIES=	print
 MASTER_SITES=	SF/hpinkjet/${PORTNAME}/${PORTVERSION}
 
-MAINTAINER=	DougB@FreeBSD.org
+MAINTAINER=	dougb@FreeBSD.org
 COMMENT=	Drivers and support resources for HP Inkjet Printers
 
 LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg
diff --git a/print/hpijs/pkg-descr b/print/hpijs/pkg-descr
index e37eb57d5253..d518093817c6 100644
--- a/print/hpijs/pkg-descr
+++ b/print/hpijs/pkg-descr
@@ -6,4 +6,4 @@ Inkjet and some LaserJet.
 WWW: http://hpinkjet.sourceforge.net/
 
 - Doug Barton
-DougB@FreeBSD.org
+dougb@FreeBSD.org
diff --git a/textproc/htdig/Makefile b/textproc/htdig/Makefile
index cbce84c176a3..1348f633d868 100644
--- a/textproc/htdig/Makefile
+++ b/textproc/htdig/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTNAME}/3.2.0b6
 DISTNAME=	htdig-3.2.0b6
 
-MAINTAINER=	DougB@FreeBSD.org
+MAINTAINER=	dougb@FreeBSD.org
 COMMENT=	A www indexing and searching system
 
 MAKE_JOBS_SAFE=	yes
diff --git a/textproc/htdig/pkg-descr b/textproc/htdig/pkg-descr
index 92d74dd5ea47..5642bda2c339 100644
--- a/textproc/htdig/pkg-descr
+++ b/textproc/htdig/pkg-descr
@@ -11,4 +11,4 @@ the HTTP 1.0 protocol.
 WWW: http://www.htdig.org/
 
 - Doug Barton
-DougB@FreeBSD.org
+dougb@FreeBSD.org
diff --git a/x11-wm/libwraster/Makefile b/x11-wm/libwraster/Makefile
index f53f2c07cebd..cb9e088ec88e 100644
--- a/x11-wm/libwraster/Makefile
+++ b/x11-wm/libwraster/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	libwraster
 # Date created:				August 17, 2009
-# Whom:					dougb@FreeBSD.org
+# Whom:					Doug Barton <dougb@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -19,15 +19,14 @@ COMMENT=	libwraster from Window Maker
 
 LIB_DEPENDS=	ungif.5:${PORTSDIR}/graphics/libungif \
 		png.6:${PORTSDIR}/graphics/png \
-		tiff.4:${PORTSDIR}/graphics/tiff \
-		Xft.2:${PORTSDIR}/x11-fonts/libXft
+		tiff.4:${PORTSDIR}/graphics/tiff
 
 MAKE_JOBS_SAFE=	yes
 
 USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
 USE_GNOME=	pkgconfig
-USE_XORG=	xpm
+USE_XORG=	xpm xft
 USE_PERL5=	yes
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11-wm/libwraster/pkg-descr b/x11-wm/libwraster/pkg-descr
index e02f0a401ad2..dc425c7c6b42 100644
--- a/x11-wm/libwraster/pkg-descr
+++ b/x11-wm/libwraster/pkg-descr
@@ -6,4 +6,4 @@ depending on the full Window Maker port, or just the library.
 WWW: http://www.windowmaker.info/
 
 - Doug Barton
-DougB@FreeBSD.org
+dougb@FreeBSD.org
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index 1e46ae0b7308..e32f272f6acd 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -1,6 +1,6 @@
-# New ports collection makefile for:	WindowMaker
-# Date created:		August 13, 1997
-# Whom:			handy@physics.montana.edu
+# New ports collection makefile for:	Window Maker
+# Date created:				August 13, 1997
+# Whom:					Brian Handy <handy@physics.montana.edu>
 #
 # $FreeBSD$
 #
@@ -14,13 +14,12 @@ MASTER_SITES=	${MASTER_SITE_WINDOWMAKER} \
 MASTER_SITE_SUBDIR=	source/release
 DISTNAME=	WindowMaker-${PORTVERSION}
 
-MAINTAINER=	DougB@FreeBSD.org
+MAINTAINER=	dougb@FreeBSD.org
 COMMENT=	GNUstep-compliant NeXTstep window manager clone
 
 LIB_DEPENDS=	ungif.5:${PORTSDIR}/graphics/libungif \
 		png.6:${PORTSDIR}/graphics/png \
-		tiff.4:${PORTSDIR}/graphics/tiff \
-		Xft.2:${PORTSDIR}/x11-fonts/libXft
+		tiff.4:${PORTSDIR}/graphics/tiff
 RUN_DEPENDS=	${LOCALBASE}/share/WindowMaker/Themes/LeetWM.themed/style:${PORTSDIR}/graphics/wmicons
 
 MAKE_JOBS_SAFE=	yes
@@ -28,7 +27,7 @@ MAKE_JOBS_SAFE=	yes
 USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
-USE_XORG=	xpm
+USE_XORG=	xpm xft
 USE_PERL5=	yes
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
@@ -48,13 +47,16 @@ MANLANG=	"" sk
 MAN1=		geticonset.1x getstyle.1x seticons.1x setstyle.1x wdwrite.1x \
 		wmaker.1x wmsetbg.1x wxcopy.1x wxpaste.1x
 
-OPTIONS=	XINERAMA "Enable xinerama support" off \
+PORTDOCS=	AUTHORS BUGFORM BUGS ChangeLog FAQ INSTALL NEWS README \
+		README.definable-cursor TODO
+
+OPTIONS=	WM_SINGLE_CLICK "Add single-click option to WPrefs menu" on \
+		XINERAMA "Enable xinerama support" off \
 		XKB_STATUS "XKB keyboard language status support" off \
-		WM_SINGLE_CLICK "Add single-click option to WPrefs menu" on \
 		WM_LINGUAS "Enable support for additional locales" off \
 		DOCKHOTKEYS "Enable support for hotkeys on docks" off
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${ARCH} == amd64
 CONFIGURE_ENV+=	ac_cv_c_inline_asm=no
@@ -97,15 +99,12 @@ post-patch:
 post-install:
 	@${MKDIR} ${PREFIX}/share/WindowMaker/Sounds
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${CP} ${WRKSRC}/AUTHORS ${WRKSRC}/BUGFORM ${WRKSRC}/BUGS \
-	${WRKSRC}/ChangeLog ${WRKSRC}/FAQ ${WRKSRC}/INSTALL \
-	${WRKSRC}/NEWS ${WRKSRC}/README \
-	${WRKSRC}/README.definable-cursor ${WRKSRC}/TODO ${DOCSDIR}/
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 .endif
 
 update-LINGUAS: extract
 	cd ${WRKSRC}/po && \
 		${ECHO_CMD} *.po | ${SED} 's|\.po||g' > ${FILESDIR}/LINGUAS
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-wm/windowmaker/pkg-plist b/x11-wm/windowmaker/pkg-plist
index 2ff6ea09ccb0..c45549b7d5ea 100644
--- a/x11-wm/windowmaker/pkg-plist
+++ b/x11-wm/windowmaker/pkg-plist
@@ -328,17 +328,6 @@ share/WindowMaker/xtree.dat
 %%WM_LINGUAS%%share/locale/zh_CN/LC_MESSAGES/WindowMaker.mo
 %%WM_LINGUAS%%share/locale/zh_TW/LC_MESSAGES/WPrefs.mo
 %%WM_LINGUAS%%share/locale/zh_TW/LC_MESSAGES/WindowMaker.mo
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/BUGFORM
-%%PORTDOCS%%%%DOCSDIR%%/BUGS
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/FAQ
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.definable-cursor
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @exec mkdir -p %D/GNUstep/Applications/WPrefs.app/xpm
 @exec mkdir -p %D/share/WindowMaker/Sounds
 @dirrm GNUstep/Applications/WPrefs.app/tiff
diff --git a/x11/xscreensaver/pkg-descr b/x11/xscreensaver/pkg-descr
index cc73aed26f05..d0b21c61ea19 100644
--- a/x11/xscreensaver/pkg-descr
+++ b/x11/xscreensaver/pkg-descr
@@ -13,4 +13,4 @@ can fill the root window as additional screensavers.
 WWW: http://www.jwz.org/xscreensaver/
 
 - Doug Barton
-DougB@FreeBSD.org
+dougb@FreeBSD.org