[ Maintainer timeout ]
In looking over the weekly makewhatis output, I noticed the following:
Rebuilding whatis databases:
Unknown manpage type /usr/local/man/cat5/dhcp-eval.5
Unknown manpage type /usr/local/man/cat5/dhcp-options.5
Unknown manpage type /usr/local/man/cat5/dhcpd.conf.5
Unknown manpage type /usr/local/man/cat5/dhcpd.leases.5
Unknown manpage type /usr/local/man/cat8/dhcpd.8
Unknown manpage type /usr/local/man/cat8/dhcrelay.8
That complaint arises because the above nroff'd files don't have the expected .0
suffix.
While working on the port, I also noticed that install -s was being used to
(fake) install the headers for the omapi package resulting in warnings like:
for file in alloc.h buffer.h omapip.h; do install -c -m 555 -s
/usr/obj/i386/ports/isc-dhcp-3.1.3/dhcp-3.1.3/includes/omapip/$file
/usr/obj/i386/ports/isc-dhcp-3.1.3/fake-i386/usr/local/include/omapip; chmod
644 /usr/obj/i386/ports/isc-dhcp-3.1.3/fake-i386/usr/local/include/omapip/$file;
done
strip:
/usr/obj/i386/ports/isc-dhcp-3.1.3/fake-i386/usr/local/include/omapip/alloc.h:
File format not recognized
I've attached a patch that fixes the above two issues.
Regards, Bob
Index: Makefile
===================================================================
RCS file: /pub/cvsroot/OpenBSD/ports/net/isc-dhcp/Makefile,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 Makefile
--- Makefile 22 Oct 2009 21:13:29 -0000 1.19
+++ Makefile 20 Feb 2010 15:06:06 -0000
@@ -12,9 +12,9 @@ CATEGORIES= net
DISTFILES= dhcp-${VERSION}.tar.gz
WRKDIST= ${WRKDIR}/dhcp-${VERSION}
-PKGNAME-main= isc-dhcp-server-${VERSION}
-PKGNAME-client= isc-dhcp-client-${VERSION}
-PKGNAME-omapi= isc-dhcp-omapi-${VERSION}
+PKGNAME-main= isc-dhcp-server-${VERSION}p0
+PKGNAME-client= isc-dhcp-client-${VERSION}p0
+PKGNAME-omapi= isc-dhcp-omapi-${VERSION}p0
MASTER_SITES= ftp://ftp.isc.org/isc/dhcp/ \
ftp://ftp.isc.org/isc/dhcp/dhcp-3.0-history/
Index: patches/patch-Makefile_conf
===================================================================
RCS file: /pub/cvsroot/OpenBSD/ports/net/isc-dhcp/patches/patch-Makefile_conf,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-Makefile_conf
--- patches/patch-Makefile_conf 24 Sep 2007 06:17:19 -0000 1.2
+++ patches/patch-Makefile_conf 20 Feb 2010 14:44:02 -0000
@@ -1,11 +1,30 @@
$OpenBSD: patch-Makefile_conf,v 1.2 2007/09/24 06:17:19 jakob Exp $
---- Makefile.conf.orig Thu Jun 16 21:39:35 2005
-+++ Makefile.conf Fri Jul 13 09:25:09 2007
-@@ -199,6 +199,7 @@ MINORVERSION=MinorVersion
+--- Makefile.conf.orig Thu Jul 23 17:43:33 2009
++++ Makefile.conf Sat Feb 20 09:40:55 2010
+@@ -27,13 +27,13 @@ USERBINDIR = /usr/bin
+ BINDIR = /usr/sbin
+ CLIENTBINDIR=/sbin
+ ADMMANDIR = /usr/share/man/cat8
+-ADMMANEXT = .8
++ADMMANEXT = .0
+ FFMANDIR = /usr/share/man/cat5
+-FFMANEXT = .5
++FFMANEXT = .0
+ LIBMANDIR = /usr/share/man/cat3
+-LIBMANEXT = .3
++LIBMANEXT = .0
+ USRMANDIR = /usr/share/man/cat1
+-USRMANEXT = .1
++USRMANEXT = .0
+ MANCAT = cat
+ INSTALL = install -c -m 444
+ MANINSTALL = install -c
+@@ -200,6 +200,8 @@ MINORVERSION=MinorVersion
##--openbsd--
#CF = cf/openbsd.h
#SCRIPT=openbsd
+INSTALL = install -c -m 555 -s
++HDRINSTALL = install -c -m 555
##--openbsd--
## FreeBSD
Index: patches/patch-omapip_Makefile_dist
===================================================================
RCS file: patches/patch-omapip_Makefile_dist
diff -N patches/patch-omapip_Makefile_dist
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-omapip_Makefile_dist 20 Feb 2010 14:44:02 -0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+--- omapip/Makefile.dist.orig Thu Jul 23 17:43:35 2009
++++ omapip/Makefile.dist Sat Feb 20 09:43:33 2010
+@@ -66,12 +66,12 @@ install: all
+ $(INSTALL) libomapi.a $(DESTDIR)$(LIBDIR)
+ $(CHMOD) 644 $(DESTDIR)$(LIBDIR)/libomapi.a
+ for file in alloc.h buffer.h omapip.h; do \
+- $(INSTALL) $(TOP)/includes/omapip/$$file \
++ $(HDRINSTALL) $(TOP)/includes/omapip/$$file \
+ $(DESTDIR)$(INCDIR)/omapip; \
+ $(CHMOD) 644 $(DESTDIR)$(INCDIR)/omapip/$$file; \
+ done
+ for file in boolean.h dst.h int.h lang.h list.h result.h types.h; do \
+- $(INSTALL) $(TOP)/includes/isc-dhcp/$$file \
++ $(HDRINSTALL) $(TOP)/includes/isc-dhcp/$$file \
+ $(DESTDIR)$(INCDIR)/isc-dhcp; \
+ $(CHMOD) 644 $(DESTDIR)$(INCDIR)/isc-dhcp/$$file; \
+ done
Index: pkg/PLIST-client
===================================================================
RCS file: /pub/cvsroot/OpenBSD/ports/net/isc-dhcp/pkg/PLIST-client,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST-client
--- pkg/PLIST-client 22 Oct 2009 21:13:29 -0000 1.3
+++ pkg/PLIST-client 20 Feb 2010 14:01:19 -0000
@@ -4,7 +4,7 @@
sbin/dhclient-script
share/examples/isc-dhcp/
share/examples/isc-dhcp/dhclient.conf
-...@man man/cat5/dhclient.conf.5
-...@man man/cat5/dhclient.leases.5
-...@man man/cat8/dhclient-script.8
-...@man man/cat8/dhclient.8
+...@man man/cat5/dhclient.conf.0
+...@man man/cat5/dhclient.leases.0
+...@man man/cat8/dhclient-script.0
+...@man man/cat8/dhclient.0
Index: pkg/PLIST-main
===================================================================
RCS file: /pub/cvsroot/OpenBSD/ports/net/isc-dhcp/pkg/PLIST-main,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST-main
--- pkg/PLIST-main 22 Oct 2009 21:13:29 -0000 1.3
+++ pkg/PLIST-main 20 Feb 2010 14:01:29 -0000
@@ -1,12 +1,12 @@
@comment $OpenBSD: PLIST-main,v 1.3 2009/10/22 21:13:29 jakob Exp $
@conflict isc-dhcp-*
@pkgpath net/isc-dhcp
-man/cat5/dhcp-eval.5
-man/cat5/dhcp-options.5
-man/cat5/dhcpd.conf.5
-man/cat5/dhcpd.leases.5
-man/cat8/dhcpd.8
-man/cat8/dhcrelay.8
+...@man man/cat5/dhcp-eval.0
+...@man man/cat5/dhcp-options.0
+...@man man/cat5/dhcpd.conf.0
+...@man man/cat5/dhcpd.leases.0
+...@man man/cat8/dhcpd.0
+...@man man/cat8/dhcrelay.0
@bin sbin/dhcpd
@bin sbin/dhcrelay
share/examples/isc-dhcp/
Index: pkg/PLIST-omapi
===================================================================
RCS file: /pub/cvsroot/OpenBSD/ports/net/isc-dhcp/pkg/PLIST-omapi,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST-omapi
--- pkg/PLIST-omapi 22 Oct 2009 21:13:29 -0000 1.3
+++ pkg/PLIST-omapi 20 Feb 2010 13:59:06 -0000
@@ -16,6 +16,6 @@ include/omapip/buffer.h
include/omapip/omapip.h
lib/libdhcpctl.a
lib/libomapi.a
-...@man man/cat1/omshell.1
-...@man man/cat3/dhcpctl.3
-...@man man/cat3/omapi.3
+...@man man/cat1/omshell.0
+...@man man/cat3/dhcpctl.0
+...@man man/cat3/omapi.0
