Fix pkglint. Use BUILD_DIRS instead of a hand-rolled do-build target.

Add patch comments.

4 files changed, 15 insertions, 16 deletions

diff --git a/x11/xpmroot/Makefile b/x11/xpmroot/Makefile
index 433d376bac4..f8b15285673 100644
--- a/x11/xpmroot/Makefile
+++ b/x11/xpmroot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2010/09/28 13:21:33 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2012/07/30 03:59:06 dholland Exp $
 #
 
 DISTNAME=	fvwm-${PKG_VERSION}
@@ -17,22 +17,17 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 PKG_VERSION=	2.4.20
 USE_X11BASE=	YES
 GNU_CONFIGURE=	YES
+BUILD_DIRS=	libs utils
 
 MAKE_ENV+=	VERSION=${PKG_VERSION:Q}
 CONFIGURE_ARGS+=	--without-extras --disable-dmalloc --without-gnome
 
-INSTALLATION_DIRS=	bin ${PKGMANDIR:Q}/man1
-
-do-build:
-	(cd ${WRKSRC:Q}/libs && \
-		env ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} all)
-	(cd ${WRKSRC:Q}/utils && \
-		env ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} xpmroot)
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC:Q}/utils/xpmroot ${DESTDIR}${PREFIX:Q}/bin
-	${INSTALL_MAN} ${WRKSRC:Q}/utils/xpmroot.1 \
-		${DESTDIR}${PREFIX:Q}/${PKGMANDIR:Q}/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/utils/xpmroot ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/utils/xpmroot.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
diff --git a/x11/xpmroot/distinfo b/x11/xpmroot/distinfo
index 9c165693768..478f0807949 100644
--- a/x11/xpmroot/distinfo
+++ b/x11/xpmroot/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.27 2012/02/23 18:39:53 marino Exp $
+$NetBSD: distinfo,v 1.28 2012/07/30 03:59:06 dholland Exp $
 
 SHA1 (fvwm-2.4.20.tar.gz) = 2130a16590462cbbf15f255a46abe8b8a6cb4401
 RMD160 (fvwm-2.4.20.tar.gz) = c71f8cce0b7d7258aeef94d889c1a0346c2ae21b
 Size (fvwm-2.4.20.tar.gz) = 1844688 bytes
-SHA1 (patch-aa) = 06800ec36cd683a393a085c6533ab4fd6f61528f
-SHA1 (patch-configure) = 9477007d02211a7218a2db965cca119868b77a8c
+SHA1 (patch-aa) = 30986a786532594f04ed8a0f8ab1d2dc2e619f20
+SHA1 (patch-configure) = a8888cf16b97f8a7fb9f2892ef582ada93e51c3d
diff --git a/x11/xpmroot/patches/patch-aa b/x11/xpmroot/patches/patch-aa
index 575fe45bdf2..224b43f3553 100644
--- a/x11/xpmroot/patches/patch-aa
+++ b/x11/xpmroot/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.8 2006/12/12 06:48:56 martti Exp $
+$NetBSD: patch-aa,v 1.9 2012/07/30 03:59:06 dholland Exp $
+
+- Use stdlib.h for alloca.
 
 --- config.h.in.orig	2006-12-09 11:54:06.000000000 +0000
 +++ config.h.in	2006-12-12 08:44:04.000000000 +0000
diff --git a/x11/xpmroot/patches/patch-configure b/x11/xpmroot/patches/patch-configure
index 3ba9cda80ec..e6b3fbe0397 100644
--- a/x11/xpmroot/patches/patch-configure
+++ b/x11/xpmroot/patches/patch-configure
@@ -1,4 +1,6 @@
-$NetBSD: patch-configure,v 1.1 2012/02/23 18:39:53 marino Exp $
+$NetBSD: patch-configure,v 1.2 2012/07/30 03:59:06 dholland Exp $
+
+- configure script needs libX11, not just libXt.
 
 --- configure.orig	2012-02-19 15:57:14.638423000 +0000
 +++ configure