Attempt to fix a build failure of heirloom-libcommon

4 files changed, 30 insertions, 9 deletions

diff --git a/devel/heirloom-libcommon/Makefile b/devel/heirloom-libcommon/Makefile
index 0478aadeea9..3a79bdf6993 100644
--- a/devel/heirloom-libcommon/Makefile
+++ b/devel/heirloom-libcommon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:14 cheusov Exp $
+# $NetBSD: Makefile,v 1.3 2011/11/24 21:02:42 cheusov Exp $
 
 PKGNAME=	heirloom-libcommon-${HEIRLOOM_VER}
 CATEGORIES=	devel
@@ -11,14 +11,13 @@ INSTALLATION_DIRS+=	include/heirloom lib
 
 HEADERS_DIR=	${PREFIX}/include/heirloom
 
-HEADERS=	_alloca.h _malloc.h _utmpx.h alloca.h asciitype.h atoll.h \
+HEADERS=	_alloca.h _malloc.h alloca.h asciitype.h atoll.h \
 		blank.h getdir.h iblok.h malloc.h mbtowi.h memalign.h \
 		msgselect.h oblok.h pathconf.h pfmt.h regexp.h regexpr.h \
-		sfile.h sigset.h utmpx.h
+		sfile.h sigset.h
 
 PLIST_SUBST+=	NO_ALLOCA_H=
 PLIST_SUBST+=	NOMALLOC_H=
-PLIST_SUBST+=	NOUTMPX_H=
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
@@ -27,7 +26,6 @@ DESCR_SRC+=	${.CURDIR}/DESCR
 .if ${OPSYS} == "Linux" || ${OPSYS} == "SunOS"
 PLIST_SUBST+=	"NO_ALLOCA_H=@comment "
 PLIST_SUBST+=	"NOMALLOC_H=@comment "
-PLIST_SUBST+=	"NOUTMPX_H=@comment "
 .endif
 
 do-install:
diff --git a/devel/heirloom-libcommon/PLIST b/devel/heirloom-libcommon/PLIST
index f8fc8a8d2a3..ad109083052 100644
--- a/devel/heirloom-libcommon/PLIST
+++ b/devel/heirloom-libcommon/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2011/05/28 08:45:14 cheusov Exp $
+@comment $NetBSD: PLIST,v 1.2 2011/11/24 21:02:42 cheusov Exp $
 include/heirloom/_alloca.h
 include/heirloom/_malloc.h
-include/heirloom/_utmpx.h
 ${NO_ALLOCA_H}include/heirloom/alloca.h
 include/heirloom/asciitype.h
 include/heirloom/atoll.h
@@ -19,5 +18,4 @@ include/heirloom/regexp.h
 include/heirloom/regexpr.h
 include/heirloom/sfile.h
 include/heirloom/sigset.h
-${NOUTMPX_H}include/heirloom/utmpx.h
 lib/libheirloomcommon.a
diff --git a/sysutils/heirloom-doc/distinfo b/sysutils/heirloom-doc/distinfo
index 8d3fd465c0d..084bec86af4 100644
--- a/sysutils/heirloom-doc/distinfo
+++ b/sysutils/heirloom-doc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2011/11/23 22:50:25 cheusov Exp $
+$NetBSD: distinfo,v 1.4 2011/11/24 21:02:42 cheusov Exp $
 
 SHA1 (heirloom-070715.tar.bz2) = cc1aa6977b445ba622159b443283ccb0571be9a5
 RMD160 (heirloom-070715.tar.bz2) = 546b68b1e6c603301084d47973ca9ec47ae8ea8c
@@ -14,5 +14,6 @@ SHA1 (patch-au) = 63da5409f7537e0fc3bc9d2473b87439ef38d328
 SHA1 (patch-av) = 897e8a4a8115e5d556c4dc4892fc0b17f73cee6e
 SHA1 (patch-aw) = 39e762f6c4b3def3e317217b6bae4d599b7173d8
 SHA1 (patch-ax) = 74949080460cb2f7c16dd22f24fb650f0ad94817
+SHA1 (patch-libcommon_Makefile.mk) = bf110b403a09f740cfed7e89561bc58c3102bfbb
 SHA1 (patch-nawk_Makefile.mk) = e212f57f24de74e93a3e7def0d996db3277aac26
 SHA1 (patch-oawk_Makefile.mk) = 97e2d121103c65c41dc8cee2d9c05bb412fd0af5
diff --git a/sysutils/heirloom-doc/patches/patch-libcommon_Makefile.mk b/sysutils/heirloom-doc/patches/patch-libcommon_Makefile.mk
new file mode 100644
index 00000000000..faeb0513d5a
--- /dev/null
+++ b/sysutils/heirloom-doc/patches/patch-libcommon_Makefile.mk
@@ -0,0 +1,24 @@
+$NetBSD: patch-libcommon_Makefile.mk,v 1.1 2011/11/24 21:02:42 cheusov Exp $
+
+# Fix for build failure
+--- libcommon/Makefile.mk.orig	2006-01-22 18:33:32.000000000 +0000
++++ libcommon/Makefile.mk
+@@ -2,7 +2,7 @@ all: libcommon.a
+ 
+ OBJ = asciitype.o ib_alloc.o ib_close.o ib_free.o ib_getlin.o ib_getw.o \
+ 	ib_open.o ib_popen.o ib_read.o ib_seek.o oblok.o sfile.o strtol.o \
+-	getdir.o regexpr.o gmatch.o utmpx.o memalign.o pathconf.o \
++	getdir.o regexpr.o gmatch.o memalign.o pathconf.o \
+ 	sigset.o signal.o sigrelse.o sighold.o sigignore.o sigpause.o \
+ 	getopt.o pfmt.o vpfmt.o setlabel.o setuxlabel.o pfmt_label.o sysv3.o
+ libcommon.a: headers $(OBJ)
+@@ -21,8 +21,7 @@ headers: CHECK
+ 		fi; \
+ 	}; \
+ 	one alloca; \
+-	one malloc; \
+-	one utmpx
++	one malloc
+ 
+ install:
+