Import of pkgsrc-2016Q3

security/fwbuilder/Makefile

@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2015/04/25 14:24:48 tnn Exp $
+# $NetBSD: Makefile,v 1.45 2016/04/21 10:44:40 jperkin Exp $
 
 DISTNAME=	fwbuilder-5.1.0.3599
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	security net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fwbuilder/}
 
@@ -16,7 +16,7 @@ USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_TOOLS+=		aclocal autoconf automake gmake
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--mandir=${P} --without-distcc
+CONFIGURE_ARGS+=	--without-distcc
 #UNLIMIT_RESOURCES+=	datasize
 
 INSTALL_MAKE_FLAGS+=	INSTALL_ROOT=${DESTDIR}

security/fwbuilder/distinfo

@@ -1,13 +1,14 @@
-$NetBSD: distinfo,v 1.9 2015/03/29 15:28:43 rodent Exp $
+$NetBSD: distinfo,v 1.11 2016/04/21 10:44:40 jperkin Exp $
 
 SHA1 (fwbuilder-5.1.0.3599.tar.gz) = 4a693eb7d5cd51b5eb16e874540cb27c5b726dc5
 RMD160 (fwbuilder-5.1.0.3599.tar.gz) = 38cb91aaa137bb5f0bc14b8d7e70da5a83467349
+SHA512 (fwbuilder-5.1.0.3599.tar.gz) = 3a0d726736ad841a070a26b101fe4a5388a082e99146554fc60af53c10b1f01ccdd1206046502d355afdb0819ea28f7b309f6ae62b087b3de5da75d8dd56b62c
 Size (fwbuilder-5.1.0.3599.tar.gz) = 7182573 bytes
 SHA1 (patch-aa) = 92a8962a12882507d4b8eb3e536899c3638b9cd9
 SHA1 (patch-ab) = e1d7c25ffdcd5e6b89b5b9339fb8a3ac26515b54
 SHA1 (patch-ac) = bf432946fa9e69e2ea7ef1ddce1af95baa678c43
 SHA1 (patch-ad) = 33189f54678ac147be99bf4d126afde38665b13e
 SHA1 (patch-ae) = d0a20d6592c54065d26c1008e6b40e1e4d7fcdc7
-SHA1 (patch-configure.in) = 80794f50c96886d01604087e18cee875a2aa5c77
+SHA1 (patch-configure.in) = b8c65d446b5761f835ea3275476c395f8426d6d7
 SHA1 (patch-src_gui_main.cpp) = 36b869852d9ed25aa1124f79ff926fe060558c08
 SHA1 (patch-src_libfwbuilder_qmake.inc.in) = 43043c98224da7c3050b1a1d9b7a01a7950a5c30

security/fwbuilder/patches/patch-configure.in

@@ -1,52 +1,23 @@
-$NetBSD: patch-configure.in,v 1.2 2015/03/29 15:28:43 rodent Exp $
+$NetBSD: patch-configure.in,v 1.3 2016/04/21 10:44:41 jperkin Exp $
 
 Fix MANDIR and DEFAULT_RES_DIR.
 
 --- configure.in.orig	2012-03-23 06:10:54.000000000 +0000
 +++ configure.in
-@@ -490,15 +490,15 @@ case ${host} in
-   *-*-darwin*)
-     OS=MacOSX
+@@ -492,7 +492,7 @@ case ${host} in
      OS_MACOSX=1
--    MANDIR="${PREFIX}/share/man/"
-+    MANDIR="${PREFIX}/man/"
+     MANDIR="${PREFIX}/share/man/"
      AC_MSG_RESULT(MacOSX)
 -    DEFAULT_RES_DIR="../Resources"
 +    DEFAULT_RES_DIR="${PREFIX}/share/fwbuilder-${VERSION}"
      ;;
  
    *-*-solaris*)
-     OS=Solaris
-     OS_SOLARIS=1
--    MANDIR="${PREFIX}/share/man/"
-+    MANDIR="${PREFIX}/man/"
-     AC_MSG_RESULT(Solaris)
-     DEFAULT_RES_DIR="${PREFIX}/share/fwbuilder-${VERSION}"
-     ;;
-@@ -527,7 +527,7 @@ case ${host} in
-     else
-        DISTRO="Unknown"
-     fi
--    MANDIR="${PREFIX}/share/man/"
-+    MANDIR="${PREFIX}/man/"
-     AC_MSG_RESULT($DISTRO GNU/kFreeBSD)
-     DEFAULT_RES_DIR="${PREFIX}/share/fwbuilder-${VERSION}"
-     ;;
-@@ -553,7 +553,7 @@ case ${host} in
-     else
- 	DISTRO="Unknown"
-     fi
--    MANDIR="${PREFIX}/share/man/"
-+    MANDIR="${PREFIX}/man/"
-     ICONSDIR="${DATADIR}/icons/hicolor/"
-     AC_MSG_RESULT($DISTRO Linux)
-     ;;
-@@ -562,7 +562,7 @@ case ${host} in
-     OS=Unknown
-     OS_UNKNOWN=1
-     DISTRO=Unknown
--    MANDIR="${PREFIX}/share/man/"
-+    MANDIR="${PREFIX}/man/"
-     AC_MSG_RESULT(Unknown)
+@@ -567,6 +567,7 @@ case ${host} in
      DEFAULT_RES_DIR="${PREFIX}/share/fwbuilder-${VERSION}"
      ;;
+ esac
++MANDIR="$mandir"
+ 
+ if test "x$with_templatedir" != "x"; then
+   RES_DIR="${with_templatedir}"