@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/09/07 21:27:30 dan Exp $
+# $NetBSD: Makefile,v 1.15 2010/01/27 19:24:27 joerg Exp $
 
 DISTNAME=	mgm-1.1
 PKGREVISION=	2
@@ -10,6 +10,8 @@
 HOMEPAGE=	http://linuxmafia.com/mgm/
 COMMENT=	Moaning Goat Meter
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	p5-Tk-[0-9]*:../../x11/p5-Tk
 
 WRKSRC=		${WRKDIR}/mgm
@@ -27,19 +29,19 @@
 	${SED} -e 's|@@MGM_PERL_DIR@@|${MGM_PERL_DIR}|' \
 		${FILESDIR}/mgm.sh > ${WRKDIR}/mgm.sh
 
+INSTALLATION_DIRS+=	${MGM_PERL_DIR}/modules ${MGM_DOC_DIR}
+
 do-install:
-	${INSTALL_DATA_DIR} ${MGM_PERL_DIR} ${MGM_PERL_DIR}/modules
-	${INSTALL_SCRIPT} ${WRKSRC}/mgm ${MGM_PERL_DIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/mgm ${DESTDIR}${MGM_PERL_DIR}
 	set -e; \
 	cd ${WRKSRC}; \
 	for DIR in lib modules/*; do \
-		${INSTALL_DATA_DIR} ${MGM_PERL_DIR}/"$$DIR"; \
+		${INSTALL_DATA_DIR} ${DESTDIR}${MGM_PERL_DIR}/"$$DIR"; \
 		for FILE in "$$DIR"/*; do \
-			${INSTALL_DATA} "$$FILE" ${MGM_PERL_DIR}/"$$DIR"; \
+			${INSTALL_DATA} "$$FILE" ${DESTDIR}${MGM_PERL_DIR}/"$$DIR"; \
 		done; \
 	done
-	${INSTALL_DATA_DIR} ${MGM_DOC_DIR}
-	cd ${WRKSRC}/doc && ${INSTALL_DATA} * ${MGM_DOC_DIR}
-	${INSTALL_SCRIPT} ${WRKDIR}/mgm.sh ${PREFIX}/bin/mgm
+	cd ${WRKSRC}/doc && ${INSTALL_DATA} * ${DESTDIR}${MGM_DOC_DIR}
+	${INSTALL_SCRIPT} ${WRKDIR}/mgm.sh ${DESTDIR}${PREFIX}/bin/mgm
 
 .include "../../mk/bsd.pkg.mk"

@@ -1,4 +1,4 @@
-/*	$NetBSD: uipc_syscalls.c,v 1.136 2009/04/04 10:12:51 ad Exp $	*/
+/*	$NetBSD: uipc_syscalls.c,v 1.137 2009/12/09 21:33:00 dsl Exp $	*/
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls.c,v 1.136 2009/04/04 10:12:51 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls.c,v 1.137 2009/12/09 21:33:00 dsl Exp $");
 
 #include "opt_pipe.h"
 
@@ -317,7 +317,7 @@
 	}
 	while ((so->so_state & SS_ISCONNECTING) != 0 && so->so_error == 0) {
 		error = sowait(so, true, 0);
-		if (__predict_false((so->so_state & SS_ISDRAINING) != 0)) {
+		if (__predict_false((so->so_state & SS_ISABORTING) != 0)) {
 			error = EPIPE;
 			interrupted = 1;
 			break;