Mosquitto compiles and installs cleanly

koha/Makefile

@@ -15,7 +15,7 @@ DEPENDS+=	apache>=2.2:../../www/apache22
 DEPENDS+=	p5-Date-Calc>=5.4:../../devel/p5-Date-Calc
 DEPENDS+=	p5-Date-Manip>=5.44:../../devel/p5-Date-Manip
 DEPENDS+=	p5-Digest-MD5>=2.35:../../security/p5-Digest-MD5
-DEPENDS+=	p5-DBD-mysql>=3.0002:../../databases/p5-DBD-mysql
+DEPENDS+=	p5-DBD-{mysql,percona}*-[0-9]*:../../databases/p5-DBD-mysql
 DEPENDS+=	p5-DBI>=1.56:../../databases/p5-DBI
 DEPENDS+=	p5-Event>=1.06:../../devel/p5-Event
 DEPENDS+=	p5-HTML-Template>=2.9:../../www/p5-HTML-Template

libee/Makefile

@@ -17,6 +17,7 @@ MAKE_JOBS_SAFE=		no
 
 USE_LIBTOOL=		yes
 USE_TOOLS+=		bash pkg-config
+USE_MULTIARCH=		lib
 
 PKGCONFIG_OVERRIDE+=	libee.pc.in
 

libeio/Makefile

@@ -14,6 +14,7 @@ LICENSE=	2-clause-bsd OR gnu-gpl-v2
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	autoconf automake
+USE_MULTIARCH=	lib
 
 WRKSRC=	${WRKDIR}/${PKGBASE}-${DISTNAME}
 

man/Makefile

@@ -21,7 +21,7 @@ USE_TOOLS+=		groff:run
 PKGMANDIR?=		man
 USE_PKGLOCALEDIR=	yes
 HAS_CONFIGURE=		yes
-CONFIGURE_ARGS+=	-confdir ${PKG_SYSCONFDIR} +sgid +fhs +lang all
+CONFIGURE_ARGS+=	-confdir ${PKG_SYSCONFDIR} +sgid +traditional
 CONFIGURE_ARGS+=	-prefix=${PREFIX:Q}
 CONFIGURE_ARGS+=	-mandir=${PREFIX}/${PKGMANDIR}
 CONFIGURE_ENV+=		deflocale=${PREFIX}/${PKGLOCALEDIR}/locale/
@@ -33,6 +33,19 @@ PKG_GROUPS=		${MAN_GROUP}
 EXAMPLESDIR=		${PREFIX}/share/examples/man/
 CONF_FILES=		${EXAMPLESDIR}/man.conf ${PKG_SYSCONFDIR}/man.conf
 
+SUBST_CLASSES+=		path
+SUBST_MESSAGE.path=	Fixing default tool search path.
+SUBST_STAGE.path=	post-patch
+SUBST_FILES.path=	configure src/man.conf.in
+SUBST_SED.path=		-e 's,@PREFIX@,${PREFIX},g'
+SUBST_SED.path+=	-e 's,@PKGMANDIR@,${PKGMANDIR},g'
+
+SUBST_CLASSES+=		awk
+SUBST_MESSAGE.awk=	Fixing default awk
+SUBST_STAGE.awk=	pre-patch
+SUBST_FILES.awk=	src/makewhatis.sh
+SUBST_SED.awk=		-e 's,@awk@,${AWK},g'
+
 post-install:
 	${INSTALL_DATA_DIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/src/man.conf ${EXAMPLESDIR}

man/PLIST

@@ -4,114 +4,11 @@ bin/man
 bin/man2dvi
 bin/man2html
 bin/whatis
-man/bg/man1/apropos.1
-man/bg/man1/man.1
-man/bg/man1/whatis.1
-man/bg/man5/man.conf.5
-man/bg/man8/makewhatis.8
-man/cs/man1/apropos.1
-man/cs/man1/man.1
-man/cs/man1/whatis.1
-man/cs/man5/man.conf.5
-man/da/man1/apropos.1
-man/da/man1/man.1
-man/da/man1/whatis.1
-man/da/man5/man.conf.5
-man/de/man1/apropos.1
-man/de/man1/man.1
-man/de/man1/whatis.1
-man/de/man5/man.conf.5
-man/el/man1/apropos.1
-man/el/man1/man.1
-man/el/man1/whatis.1
-man/el/man5/man.conf.5
-man/el/man8/makewhatis.8
-man/es/man1/apropos.1
-man/es/man1/man.1
-man/es/man1/whatis.1
-man/es/man5/man.conf.5
-man/es/man8/makewhatis.8
-man/fi/man1/apropos.1
-man/fi/man1/man.1
-man/fi/man1/whatis.1
-man/fi/man5/man.conf.5
-man/fr/man1/apropos.1
-man/fr/man1/man.1
-man/fr/man1/whatis.1
-man/fr/man5/man.conf.5
-man/fr/man8/makewhatis.8
-man/hr/man1/apropos.1
-man/hr/man1/man.1
-man/hr/man1/whatis.1
-man/hr/man5/man.conf.5
-man/it/man1/apropos.1
-man/it/man1/man.1
-man/it/man1/whatis.1
-man/it/man5/man.conf.5
-man/it/man8/makewhatis.8
-man/ja/man1/apropos.1
-man/ja/man1/man.1
-man/ja/man1/whatis.1
-man/ja/man5/man.conf.5
-man/ko/man1/apropos.1
-man/ko/man1/man.1
-man/ko/man1/whatis.1
-man/ko/man5/man.conf.5
 man/man1/apropos.1
 man/man1/man.1
 man/man1/man2html.1
 man/man1/whatis.1
 man/man5/man.conf.5
 man/man8/makewhatis.8
-man/nl/man1/apropos.1
-man/nl/man1/man.1
-man/nl/man1/whatis.1
-man/nl/man5/man.conf.5
-man/pl/man1/apropos.1
-man/pl/man1/man.1
-man/pl/man1/whatis.1
-man/pl/man5/man.conf.5
-man/pt/man1/apropos.1
-man/pt/man1/man.1
-man/pt/man1/whatis.1
-man/pt/man5/man.conf.5
-man/ro/man1/apropos.1
-man/ro/man1/man.1
-man/ro/man1/whatis.1
-man/ro/man5/man.conf.5
-man/ro/man8/makewhatis.8
-man/sl/man1/apropos.1
-man/sl/man1/man.1
-man/sl/man1/whatis.1
-man/sl/man5/man.conf.5
 sbin/makewhatis
 share/examples/man/man.conf
-share/locale/mess.bg.cat
-share/locale/mess.cs.cat
-share/locale/mess.da.cat
-share/locale/mess.de.cat
-share/locale/mess.el.cat
-share/locale/mess.en.cat
-share/locale/mess.es.cat
-share/locale/mess.fi.cat
-share/locale/mess.fr.cat
-share/locale/mess.hr.cat
-share/locale/mess.it.cat
-share/locale/mess.ja.cat
-share/locale/mess.ko.cat
-share/locale/mess.nl.cat
-share/locale/mess.pl.cat
-share/locale/mess.pt.cat
-share/locale/mess.ro.cat
-share/locale/mess.ru.cat
-share/locale/mess.sl.cat
-@exec ${MKDIR} %D/man/sl/man8
-@exec ${MKDIR} %D/man/pt/man8
-@exec ${MKDIR} %D/man/nl/man8
-@exec ${MKDIR} %D/man/ko/man8
-@exec ${MKDIR} %D/man/hr/man8
-@exec ${MKDIR} %D/man/fi/man8
-@exec ${MKDIR} %D/man/de/man8
-@exec ${MKDIR} %D/man/da/man8
-@exec ${MKDIR} %D/man/cs/man8
-@exec ${MKDIR} %D/man/bg/man8

man/distinfo

@@ -9,3 +9,7 @@ SHA1 (patch-ac) = f4281f4f2dd35ded4f8ab38c52181da385263df4
 SHA1 (patch-ad) = 81748bf4839f69e98b05525e529e4e86769fecec
 SHA1 (patch-ae) = 1f2a8c8894ad51c2b5d84d08a4f33eaf6496f62f
 SHA1 (patch-af) = 0d611a641927dd07719fb4d874ce9daaf9126b7c
+SHA1 (patch-configure) = 5c8dd6d5e867a90869a62c04a30de88a20bf6ac7
+SHA1 (patch-gencat_gencat.c) = 50563fd665b5f8916ffdb51339d3fcd02e106772
+SHA1 (patch-src_man.c) = 7512d0e273448656bf917a6234c74a547456fb6f
+SHA1 (patch-src_man.conf.in) = beea07007f36fe2fe84bab78085dd514bd180e56

man/patches/patch-configure

@@ -0,0 +1,36 @@
+$NetBSD$
+
+--- configure.orig	2006-05-01 17:56:14.000000000 +0000
++++ configure
+@@ -362,7 +362,7 @@ rm -f conftest
+ #   for i in /bin:/usr/bin:$PATH
+ # does not work everywhere.)
+ # Some people might prefer having $PATH first in PREPATH
+-PREPATH=/bin:/usr/bin:/usr/ucb:/usr/local/bin:$PATH
++PREPATH=@PREFIX@/bin:/bin:/usr/bin:/usr/ucb:/usr/local/bin:$PATH
+ IFS0="$IFS"
+ IFS=":$IFS"
+ for i in $PREPATH
+@@ -476,18 +476,18 @@ else
+   then
+     if test $Fnroff = "missing"
+     then
+-      nroff="nroff -Tlatin1 -mandoc"
++      nroff="nroff -mandoc"
+     else
+-      nroff="$Fnroff -Tlatin1 -mandoc"
++      nroff="$Fnroff -mandoc"
+     fi
+     troff="troff -mandoc"
+     echo "Warning: could not find groff"
+   else
+     if test $Fnroff = "missing"
+     then
+-      nroff="$Fgroff -Tlatin1 -mandoc"
++      nroff="$Fgroff -mandoc"
+     else
+-      nroff="$Fnroff -Tlatin1 -mandoc"
++      nroff="$Fnroff -mandoc"
+     fi
+     troff="$Fgroff -Tps -mandoc"
+     jnroff="$Fgroff -Tnippon -mandocj"

man/patches/patch-gencat_gencat.c

@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- gencat/gencat.c.orig	2006-08-02 18:11:44.000000000 +0000
++++ gencat/gencat.c
+@@ -43,7 +43,7 @@ up-to-date.  Many thanks.
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <sys/types.h>
+-#ifdef SYSV
++#if defined(SYSV) || defined(__sun)
+ #include <sys/fcntl.h>
+ #include <string.h>
+ #else

man/patches/patch-src_man.c

@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/man.c.orig	2006-05-01 20:34:22.000000000 +0000
++++ src/man.c
+@@ -594,7 +594,7 @@ make_roff_command (const char *path, con
+		 the current position plus 10 lines.  This plus setpl()
+		 gives us a single page that just contains the whole
+		 man page. (William Webber, [email protected]) */
+-	      strcat(buft, "; echo \".\\\\\\\"\"; echo \".pl \\n(nlu+10\"");
++	      strcat(buft, "; echo \".\\\\\\\"\"; echo \".pl \\\\\\n(n;lu+10\"");
+ #if 0
+	      /* In case this doesnt work for some reason,
+		 michaelkjohnson suggests: I've got a simple

man/patches/patch-src_man.conf.in

@@ -0,0 +1,67 @@
+$NetBSD$
+
+--- src/man.conf.in.orig	2005-08-20 23:26:06.000000000 +0000
++++ src/man.conf.in
+@@ -32,14 +32,14 @@
+ # This file is also read by man in order to find how to call nroff, less, etc.,
+ # and to determine the correspondence between extensions and decompressors.
+ #
+-# MANBIN		/usr/local/bin/man
++# MANBIN		@PREFIX@/bin/@PKGMANDIR@
+ #
+ # Every automatically generated MANPATH includes these fields
+ #
++MANPATH	@PREFIX@/gcc*/@PKGMANDIR@
++MANPATH	@PREFIX@/@PKGMANDIR@
+ MANPATH	/usr/man
+ MANPATH	/usr/share/man
+-MANPATH	/usr/local/man
+-MANPATH	/usr/local/share/man
+ MANPATH	/usr/X11R6/man
+ #
+ # Uncomment if you want to include one of these by default
+@@ -58,26 +58,24 @@ MANPATH	/usr/X11R6/man
+ # in the mandatory manpath already, but will keep man from statting
+ # lots of other nearby files and directories.
+ #
+-MANPATH_MAP	/bin			/usr/share/man
+-MANPATH_MAP	/sbin			/usr/share/man
+-MANPATH_MAP	/usr/bin		/usr/share/man
+-MANPATH_MAP	/usr/sbin		/usr/share/man
+-MANPATH_MAP	/usr/local/bin		/usr/local/share/man
+-MANPATH_MAP	/usr/local/sbin		/usr/local/share/man
+-MANPATH_MAP	/usr/X11R6/bin		/usr/X11R6/man
+-MANPATH_MAP	/usr/bin/X11		/usr/X11R6/man
+-MANPATH_MAP	/usr/bin/mh		/usr/share/man
++# MANPATH_MAP	/bin			/usr/share/man
++# MANPATH_MAP	/sbin			/usr/share/man
++# MANPATH_MAP	/usr/bin		/usr/share/man
++# MANPATH_MAP	/usr/sbin		/usr/share/man
++# MANPATH_MAP	/usr/X11R6/bin		/usr/X11R6/man
++# MANPATH_MAP	/usr/bin/X11		/usr/X11R6/man
++# MANPATH_MAP	/usr/bin/mh		/usr/share/man
+ #
+ # NOAUTOPATH keeps man from automatically adding directories that look like
+ # manual page directories to the path.
+ #
+-#NOAUTOPATH
++NOAUTOPATH
+ #
+ # NOCACHE keeps man from creating cache pages ("cat pages")
+ # (generally one enables/disable cat page creation by creating/deleting
+ # the directory they would live in - man never does mkdir)
+ #
+-#NOCACHE
++NOCACHE
+ #
+ # Useful paths - note that COL should not be defined when
+ # NROFF is defined as "groff -Tascii" or "groff -Tlatin1";
+@@ -119,7 +117,7 @@ COMPRESS_EXT	@compress_ext@
+ # Default manual sections (and order) to search if -S is not specified
+ # and the MANSECT environment variable is not set.
+ #
+-MANSECT		@sections@
++MANSECT		1:2:3:4:5:7:8:9:1m:3bsm:3c:3c_db:3cfgadm:3commputil:3contract:3cpc:3curses:3dat:3devid:3devinfo:3dlpi:3dns_sd:3elf:3exacct:3ext:3fcoe:3fstyp:3gen:3gss:3head:3kstat:3kvm:3layout:3ldap:3lgrp:3lib:3libucb:3m:3malloc:3mms:3mp:3mpapi:3mvec:3nsl:3nvpair:3pam:3papi:3perl:3picl:3picltree:3plot:3pool:3proc:3project:3resolv:3rpc:3rsm:3sasl:3scf:3sec:3secdb:3sip:3slp:3snmp:3socket:3stmf:3sysevent:3tecla:3tnf:3ucb:3uuid:3volmgt:3x11:3xau:3xaw:3xcurses:3xext:3xmu:3xnet:4b:7d:7fs:9e:9f:9p:9s
+ #
+ # Default options to use when man is invoked without options
+ # This is mainly for the benefit of those that think -a should be the default

manatee/Makefile

@@ -12,7 +12,7 @@ COMMENT=		Web-based gene evaluation and genome annotation tool
 WRKSRC=			${WRKDIR}/manatee
 
 DEPENDS+=		p5-CGI>=2.91:../../www/p5-CGI
-DEPENDS+=		p5-DBD-mysql>=2.1017:../../databases/p5-DBD-mysql
+DEPENDS+=		p5-DBD-{mysql,percona}*-[0-9]*:../../databases/p5-DBD-mysql
 DEPENDS+=		p5-XML-Parser>=2.31:../../textproc/p5-XML-Parser
 DEPENDS+=		p5-XML-Simple>=2.07:../../textproc/p5-XML-Simple
 DEPENDS+=		p5-HTML-Template>=2.6:../../www/p5-HTML-Template

mk/git-package.mk

@@ -27,7 +27,11 @@
 .if !defined(_PKG_MK_GIT_PACKAGE_MK)
 _PKG_MK_GIT_PACKAGE_MK=	# defined
 
+.if exists(../../devel/git/Makefile)
 BUILD_DEPENDS+=		git-base>=1.6.4:../../devel/git-base
+.else
+BUILD_DEPENDS+=		scmgit-base>=1.6.4:../../devel/scmgit-base
+.endif
 
 #
 # defaults for user-visible input variables

mosquitto/distinfo

@@ -11,10 +11,10 @@ SHA1 (patch-ad) = 722c3b11f8ff75d2ce6dc987dc31982f9d53ba81
 SHA1 (patch-ae) = a370b6e7de6bdcb62cbac86211963be45b4601a3
 SHA1 (patch-af) = 90561fcebe1bc2212e834d7cb12608d226246977
 SHA1 (patch-ag) = dd645cca8be0ca63b34737e35a1dcc3c29bd55f7
-SHA1 (patch-ah) = 87a54f8a1b75986352dc27ad720202281c017a57
+SHA1 (patch-ah) = 6d22293d6ddb7733cc414ed0940ade81cb7e42c7
 SHA1 (patch-ai) = c15ccca3b0bcdee389324f6e2090a371fb7be74d
 SHA1 (patch-aj) = d592d5442e2b3364bd6cf7cec25d8bf41bf6027d
-SHA1 (patch-ak) = 85e65fa30dac09bcb9b8150fe98d967ba0cf25e4
-SHA1 (patch-al) = 4baa9d647953eec6149c95ba871aaec562206c69
-SHA1 (patch-am) = 67b1cbf3514d37e3f9b0253c65f5ad21cfc201de
-SHA1 (patch-an) = 28f82706cc0e8cc211f62ac316d0c354b4f0bc0d
+SHA1 (patch-ak) = c8314903c380e6b15769854cf025fa820798e13d
+SHA1 (patch-al) = ffb0ef3f3b4b9a00bdc90933ca0c906807f0b5be
+SHA1 (patch-am) = 11f7d046afbdcb136cec8425615ba379f58ee1d2
+SHA1 (patch-an) = 63618f2dc40f1aa2e7036ed473ff357e868c3155

mosquitto/patches/patch-ah

@@ -1,5 +1,5 @@
 $NetBSD$
-Support exception for NetBSD, taken from FreeBSD
+Support exception for NetBSD, taken from FreeBSD. Correctly locate the library
 --- config.mk.orig	2016-06-02 21:20:22.000000000 +0000
 +++ config.mk	2016-08-28 15:27:03.968104814 +0000
 @@ -115,7 +115,7 @@
@@ -11,14 +11,22 @@ Support exception for NetBSD, taken from FreeBSD
  	BROKER_LIBS:=-lm
  else
  	BROKER_LIBS:=-ldl -lm
+@@ -128,7 +128,7 @@
+ 	LIB_LIBS:=$(LIB_LIBS) -lrt
+ endif
+
+-CLIENT_LDFLAGS:=$(LDFLAGS) -L../lib ../lib/libmosquitto.so.${SOVERSION}
++CLIENT_LDFLAGS:=$(LDFLAGS) libmosquitto.so.${SOVERSION}
+
+ ifeq ($(UNAME),SunOS)
+ 	ifeq ($(CC),cc)
 @@ -241,7 +241,7 @@
  endif
 
  INSTALL?=install
 -prefix=/usr/local
--mandir=${prefix}/share/man
--localedir=${prefix}/share/locale
 +prefix=${PREFIX}
-+mandir=${PREFIX}/man
-+localedir=${PREFIX}/share/locale
+-mandir=${prefix}/share/man
++mandir=${prefix}/man
+ localedir=${prefix}/share/locale
  STRIP?=strip