From fa138715c6a6ecb65132c6b1846d9f932ae95f92 Mon Sep 17 00:00:00 2001
From: sergei <sergei@FreeBSD.org>
Date: Fri, 19 Dec 2003 15:53:54 +0000
Subject: - Update to 1.1.1 - Remove patches not needed anymore - Add patch to
 respect LOCALBASE when searching for glib

While I'm here:
- Remove explicit automake/autoconf dependencies from BUILD_DEPENDS
  in favor of USE_AUTOCONF and WANT_AUTOMAKE_VER
- Utilize USE_GNOME for glib12, gtk12 and gdk-pixbuf dependencies
- Switch to DOCSDIR that doesn't contain a version number in the name
- Sort pkg-plist

PR:		59918
Submitted by:	maintainer
---
 security/fwbuilder/files/CertDruidP30Dialog.cc-patch | 13 -------------
 security/fwbuilder/files/patch-aa                    | 14 --------------
 security/fwbuilder/files/patch-configure.in          | 20 ++++++++++++++++++++
 3 files changed, 20 insertions(+), 27 deletions(-)
 delete mode 100644 security/fwbuilder/files/CertDruidP30Dialog.cc-patch
 delete mode 100644 security/fwbuilder/files/patch-aa
 create mode 100644 security/fwbuilder/files/patch-configure.in

(limited to 'security/fwbuilder/files')

diff --git a/security/fwbuilder/files/CertDruidP30Dialog.cc-patch b/security/fwbuilder/files/CertDruidP30Dialog.cc-patch
deleted file mode 100644
index 5ff6ecb342cd..000000000000
--- a/security/fwbuilder/files/CertDruidP30Dialog.cc-patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/gui/CertDruidP30Dialog.cc.orig	Wed Jun 11 07:28:35 2003
-+++ src/gui/CertDruidP30Dialog.cc	Wed Jun 11 07:30:23 2003
-@@ -25,8 +25,9 @@
- */
- 
- 
--
-+#if 0
- #define _XOPEN_SOURCE /* glibc2 needs this for strptime   --vk */
-+#endif
- 
- #include "config.h"
- #include "CertDruidP30Dialog.hh"
diff --git a/security/fwbuilder/files/patch-aa b/security/fwbuilder/files/patch-aa
deleted file mode 100644
index 7c91a3de3f60..000000000000
--- a/security/fwbuilder/files/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
---- config.h.in.old	Sat May 31 14:40:22 2003
-+++ config.h.in	Sat May 31 14:40:40 2003
-@@ -33,6 +33,11 @@
- #undef HAVE_SETENV
- #undef HAVE_PUTENV
- 
-+#ifdef HAVE_GETOPT_H
-+#  define HAVE_DECL_GETOPT  HAVE_GETOPT_H
-+#endif
-+
-+
- /*
-  *  This is needed for Solaris
-  */
diff --git a/security/fwbuilder/files/patch-configure.in b/security/fwbuilder/files/patch-configure.in
new file mode 100644
index 000000000000..ef5c41d56a26
--- /dev/null
+++ b/security/fwbuilder/files/patch-configure.in
@@ -0,0 +1,20 @@
+--- configure.in.old	Thu Dec 18 09:24:41 2003
++++ configure.in	Thu Dec 18 09:24:53 2003
+@@ -281,17 +281,6 @@
+ 
+ AC_DEFINE_UNQUOTED(LIBFWBUILDER_VERSION, "$LIBFWBUILDER_VERSION")
+ 
+-dnl
+-dnl On FreeBSD glib-config is called glib12-config, but standard AM_PATH_GLIB
+-dnl macro does not know it ...
+-dnl
+-case "$build_os" in
+-  freebsd*)
+-   GLIB_CONFIG=/usr/local/bin/glib12-config
+-   ;;
+-esac
+-
+-
+ dnl TODO: remove this once we get rid of the old iptables compiler 
+ dnl  all other modules do not need separate GLIB_CFLAGS and GLIB_LIBS 
+ dnl  macro because we supply the same parameters via libfwbuilder-config
-- 
cgit