From vadim@vk.crocodile.org  Sat Jan 17 21:28:51 2004
Return-Path: <vadim@vk.crocodile.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id CDF3116A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 17 Jan 2004 21:28:51 -0800 (PST)
Received: from citadel01.netcitadel.com (citadel01.netcitadel.com [69.56.183.146])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 74A8543D62
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 17 Jan 2004 21:28:47 -0800 (PST)
	(envelope-from vadim@vk.crocodile.org)
Received: from noir.crocodile.org (noir.crocodile.org [216.218.215.147])
	by citadel01.netcitadel.com (8.12.8/8.12.8) with ESMTP id i0I5SQNc032096
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 17 Jan 2004 23:28:28 -0600
Received: from mail.vk.crocodile.org (c-24-6-129-253.client.comcast.net [24.6.129.253])
	by noir.crocodile.org (8.11.6/8.11.6) with ESMTP id i0I3YKf15817
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 17 Jan 2004 19:34:21 -0800
Received: from freebsd51c.vk.crocodile.org ([10.3.14.52])
	by mail.vk.crocodile.org (8.12.8/8.12.8) with ESMTP id i0I3YKne017201
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 17 Jan 2004 19:34:20 -0800
Received: from freebsd51c.vk.crocodile.org (localhost [127.0.0.1])
	by freebsd51c.vk.crocodile.org (8.12.9p1/8.12.9) with ESMTP id i0I3YMOW049862
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 17 Jan 2004 19:34:22 -0800 (PST)
	(envelope-from root@freebsd51c.vk.crocodile.org)
Received: (from root@localhost)
	by freebsd51c.vk.crocodile.org (8.12.9p1/8.12.9/Submit) id i0I3YMeZ049861;
	Sat, 17 Jan 2004 19:34:22 -0800 (PST)
Message-Id: <200401180334.i0I3YMeZ049861@freebsd51c.vk.crocodile.org>
Date: Sat, 17 Jan 2004 19:34:22 -0800 (PST)
From: vadim@fwbuilder.org
Reply-To: vadim@fwbuilder.org
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [maintainer update] security/fwbuilder to 1.1.2
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         61510
>Category:       ports
>Synopsis:       [maintainer update] security/fwbuilder to 1.1.2
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    clement
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 17 21:30:21 PST 2004
>Closed-Date:    Sun Jan 18 06:20:12 PST 2004
>Last-Modified:  Sun Jan 18 06:20:12 PST 2004
>Originator:     Vadim Kurland
>Release:        FreeBSD 5.1-RELEASE-p10 i386
>Organization:
Firewall Builder Project
>Environment:
System: FreeBSD freebsd51c.vk.crocodile.org 5.1-RELEASE-p10 FreeBSD 5.1-RELEASE-p10 #0: Sun Nov 16 02:14:54 PST 2003 root@freebsd51c.vk.crocodile.org:/usr/obj/usr/src/sys/GENERIC i386


	
>Description:
	Brings port in sync with upstream project
	Fixes PR 59479

>How-To-Repeat:
	
>Fix:

	

--- fwbuilder-port.diff begins here ---
diff -urN --exclude=README.html --exclude=work --exclude=*.tbz --ignore-matching-lines=$FreeBSD fwbuilder-old/Makefile fwbuilder/Makefile
--- fwbuilder-old/Makefile	Fri Dec 19 07:53:53 2003
+++ fwbuilder/Makefile	Sat Jan 17 15:15:16 2004
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fwbuilder
-PORTVERSION=	1.1.1
+PORTVERSION=	1.1.2
 PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}/fwbuilder/
@@ -16,23 +16,19 @@
 COMMENT=	Firewall Builder GUI and policy compilers
 
 LIB_DEPENDS=	gtkmm.2:${PORTSDIR}/x11-toolkits/gtk-- \
+		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
 		fwbuilder.5:${PORTSDIR}/security/libfwbuilder
 
+USE_GNOME=	glib12 gtk12
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-USE_AUTOCONF=	yes
-WANT_AUTOMAKE_VER=	15
-CONFIGURE_SCRIPT=	autogen.sh
-CONFIGURE_ARGS=		--with-docdir=${DOCSDIR}
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_GNOME=	glib12 gtk12 gdkpixbuf
+GNU_CONFIGURE=  yes
+CONFIGURE_ENV=  CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 INSTALLS_SHLIB=	yes
+PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
-MAN1=		fwbuilder.1 fwblookup.1 fwbedit.1 fwb_ipt.1 fwb_ipf.1 fwb_ipfw.1 fwb_pf.1 \
+MAN1=           fwbuilder.1 fwblookup.1 fwbedit.1 fwb_ipt.1 fwb_ipf.1 fwb_ipfw.1 fwb_pf.1 \
 		fwb_install.1 fwb_compile_all.1
-
-post-patch:
-	@${ECHO_MSG} "===! Running aclocal"
-	cd ${WRKSRC} && aclocal && autoconf
 
 .include <bsd.port.mk>
diff -urN --exclude=README.html --exclude=work --exclude=*.tbz --ignore-matching-lines=$FreeBSD fwbuilder-old/distinfo fwbuilder/distinfo
--- fwbuilder-old/distinfo	Fri Dec 19 07:53:54 2003
+++ fwbuilder/distinfo	Sat Jan 17 15:15:16 2004
@@ -1 +1 @@
-MD5 (fwbuilder-1.1.1.tar.gz) = c0c86c5d0a2f6eeff388c66d49c63463
+MD5 (fwbuilder-1.1.2.tar.gz) = 54a57c9e82da151b59afe0a1c0e66586
diff -urN --exclude=README.html --exclude=work --exclude=*.tbz --ignore-matching-lines=$FreeBSD fwbuilder-old/files/patch-configure.in fwbuilder/files/patch-configure.in
--- fwbuilder-old/files/patch-configure.in	Fri Dec 19 07:53:54 2003
+++ fwbuilder/files/patch-configure.in	Wed Dec 31 16:00:00 1969
@@ -1,20 +0,0 @@
---- 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
diff -urN --exclude=README.html --exclude=work --exclude=*.tbz --ignore-matching-lines=$FreeBSD fwbuilder-old/pkg-plist fwbuilder/pkg-plist
--- fwbuilder-old/pkg-plist	Fri Dec 19 07:53:54 2003
+++ fwbuilder/pkg-plist	Sat Jan 17 18:46:58 2004
@@ -8,11 +8,6 @@
 bin/fwbedit
 bin/fwblookup
 bin/fwbuilder
-share/bug-buddy/bugzilla/fwbuilder.bugzilla
-share/bug-buddy/fwbuilder-bug-buddy.png
-share/bug-buddy/fwbuilder-packages
-share/bug-buddy/fwbuilder.appmap
-share/bug-buddy/xml/fwbuilder.bts
 %%DOCSDIR%%/AUTHORS
 %%DOCSDIR%%/Build
 %%DOCSDIR%%/Build.html
@@ -73,6 +68,8 @@
 %%DOCSDIR%%/ReleaseNotes_1.1.0.html
 %%DOCSDIR%%/ReleaseNotes_1.1.1
 %%DOCSDIR%%/ReleaseNotes_1.1.1.html
+%%DOCSDIR%%/ReleaseNotes_1.1.2
+%%DOCSDIR%%/ReleaseNotes_1.1.2.html
 %%DOCSDIR%%/examples/README.examples
 %%DOCSDIR%%/examples/objects.xml
 share/fwbuilder/filters/policy-html.xsl
@@ -107,6 +104,7 @@
 share/fwbuilder/migration/1.0.8/FWBuilderPreferences.xslt
 share/fwbuilder/migration/1.0.9/FWBuilderPreferences.xslt
 share/fwbuilder/migration/1.1.0/FWBuilderPreferences.xslt
+share/fwbuilder/migration/1.1.1/FWBuilderPreferences.xslt
 share/fwbuilder/modules/gui/lib_freebsd_dlg.so
 share/fwbuilder/modules/gui/lib_ipf_dlg.so
 share/fwbuilder/modules/gui/lib_ipfw_dlg.so
@@ -133,11 +131,9 @@
 share/fwbuilder/platform/pix.xml
 share/fwbuilder/platform/unknown.xml
 share/fwbuilder/resources.xml
-share/locale/br/LC_MESSAGES/fwbuilder.mo
 share/locale/de/LC_MESSAGES/fwbuilder.mo
 share/locale/fr/LC_MESSAGES/fwbuilder.mo
 share/locale/ru/LC_MESSAGES/fwbuilder.mo
-share/locale/tr/LC_MESSAGES/fwbuilder.mo
 share/pixmaps/fwbuilder/accept.png
 share/pixmaps/fwbuilder/accounting.png
 share/pixmaps/fwbuilder/address-neg.png
--- fwbuilder-port.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->clement 
Responsible-Changed-By: clement 
Responsible-Changed-When: Sun Jan 18 04:02:11 PST 2004 
Responsible-Changed-Why:  
Take. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=61510 
State-Changed-From-To: open->closed 
State-Changed-By: clement 
State-Changed-When: Sun Jan 18 06:19:33 PST 2004 
State-Changed-Why:  
Committed, thanks ! 
Nest time, please check your plist ! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=61510 
>Unformatted:
