From owner-freebsd-ports@FreeBSD.ORG Mon Jun 9 18:29:09 2003 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 005D137B401; Mon, 9 Jun 2003 18:29:09 -0700 (PDT) Received: from drago.fomokka.net (drago.fomokka.net [140.117.205.99]) by mx1.FreeBSD.org (Postfix) with ESMTP id A60A743FBF; Mon, 9 Jun 2003 18:29:07 -0700 (PDT) (envelope-from foxfair@drago.fomokka.net) Received: from drago.fomokka.net (patmze@localhost [127.0.0.1]) by drago.fomokka.net (8.12.9/8.12.8) with ESMTP id h5A1T5D0005357; Tue, 10 Jun 2003 09:29:06 +0800 (CST) (envelope-from foxfair@drago.fomokka.net) Received: (from foxfair@localhost) by drago.fomokka.net (8.12.9/8.12.8/Submit) id h5A1T4Jq005302; Tue, 10 Jun 2003 09:29:04 +0800 (CST) Date: Tue, 10 Jun 2003 09:29:03 +0800 From: Foxfair Hu To: freebsd-gnats-submit@FreeBSD.org, vadim@vk.crocodile.org Message-ID: <20030610012903.GA43742@drago.fomokka.net> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="+HP7ph2BbKc20aGI" Content-Disposition: inline X-PGP-Fingerprint: E05E A572 2F0C 166E 3711 17C7 B168 790B 0DC2 57EA X-PGP-KeyID: 1024D/0x0DC257EA User-Agent: Mutt/1.5.3i cc: freebsd-ports@FreeBSD.org Subject: Re: ports/53120: [patch] port: security/fwbuilder Fix build errors under 5.x X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: foxfair@FreeBSD.org List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jun 2003 01:29:09 -0000 --+HP7ph2BbKc20aGI Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable This is another patch against to Makefile v1.12, the latest version in ports CVS. You can also obtain it at this link: http://www.freebsd.org/cgi/cvsweb.cgi/ports/security/fwbuilder/ =20 Note that I bump PORTREVISION too. I sill have some trouble with port package issue, and you can reproduce the problem by doing `make package` and pkg_add / pkg_delete things. There are several errors in the last two steps in my boxes. foxfair =3D=3D=3D=3D=3D=3D=3D patch start =3D=3D=3D=3D=3D=3D diff --exclude=3Dwork -ruN /usr/ports/security/fwbuilder/Makefile ./Makefile --- /usr/ports/security/fwbuilder/Makefile Mon Jun 2 12:56:07 2003 +++ ./Makefile Tue Jun 10 09:04:52 2003 @@ -7,33 +7,38 @@ =20 PORTNAME=3D fwbuilder PORTVERSION=3D 1.0.10 -PORTREVISION=3D 1 +PORTREVISION=3D 2 CATEGORIES=3D security MASTER_SITES=3D ${MASTER_SITE_SOURCEFORGE}/fwbuilder/ MASTER_SITE_SUBDIR=3D fwbuilder =20 -MAINTAINER=3D devnull@uptsoft.com +MAINTAINER=3D vadim@fwbuilder.org COMMENT=3D Firewall Builder GUI and policy compilers =20 -BUILD_DEPENDS=3D autoconf:${PORTSDIR}/devel/autoconf \ - automake:${PORTSDIR}/devel/automake +BUILD_DEPENDS=3D autoconf:${PORTSDIR}/devel/autoconf \ + aclocal:${PORTSDIR}/devel/automake LIB_DEPENDS=3D gtkmm.2:${PORTSDIR}/x11-toolkits/gtk-- \ + gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \ fwbuilder.5:${PORTSDIR}/security/libfwbuilder =20 CONFIGURE_SCRIPT=3D autogen.sh -# CONFIGURE_ARGS+=3D --with-iconsdir=3D${X11BASE}/share/gnome/fwbuilder/p= ixmaps/ --with-templatedir=3D${X11BASE}/share/gnome/fwbuilder -# USE_AUTOCONF=3D yes USE_GMAKE=3D yes USE_LIBTOOL=3D yes USE_GTK=3D yes INSTALLS_SHLIB=3D yes PLIST_SUB+=3D PORTVERSION=3D"${PORTVERSION}" =20 -MAN1=3D fwbuilder.1 fwblookup.1 fwb_ipt.1 fwb_ipf.1 fwb_ipfw.1 fwb_pf.1 \ +MAN1=3D fwbuilder.1 fwblookup.1 fwb_ipt.1 fwb_ipf.1 fwb_ipfw.1 f= wb_pf.1 \ fwb_install.1 =20 -post-extract: +.include + +.if ${OSVERSION} >=3D 500000 +EXTRA_PATCHES=3D ${FILESDIR}/CertDruidP30Dialog.cc-patch +.endif + +post-patch: @${ECHO_CMD} "=3D=3D=3D! Running aclocal" @(cd ${WRKSRC}; aclocal; autoconf) =20 -.include +.include diff --exclude=3Dwork -ruN /usr/ports/security/fwbuilder/files/CertDruidP30= Dialog.cc-patch ./files/CertDruidP30Dialog.cc-patch --- /usr/ports/security/fwbuilder/files/CertDruidP30Dialog.cc-patch Thu Jan= 1 08:00:00 1970 +++ ./files/CertDruidP30Dialog.cc-patch Mon Jun 9 11:18:32 2003 @@ -0,0 +1,16 @@ +diff --exclude=3Dwork -ruN /usr/ports/security/fwbuilder/files/CertDruidP3= 0Dialog. +cc-patch ./files/CertDruidP30Dialog.cc-patch +--- /usr/ports/security/fwbuilder/files/CertDruidP30Dialog.cc-patch Th= u Jan=20 + 1 08:00:00 1970 ++++ ./files/CertDruidP30Dialog.cc-patch Fri May 23 07:37:51 2003 +@@ -0,0 +1,9 @@ ++--- src/gui/CertDruidP30Dialog.cc.orig Thu May 22 22:42:13 2003 +++++ src/gui/CertDruidP30Dialog.cc Thu May 22 22:42:37 2003 ++@@ -25,5 +25,5 @@ ++ */ ++=20 ++- +++#include ++=20 ++ #define _XOPEN_SOURCE /* glibc2 needs this for strptime --vk */ + diff --exclude=3Dwork -ruN /usr/ports/security/fwbuilder/files/patch-aa ./f= iles/patch-aa --- /usr/ports/security/fwbuilder/files/patch-aa Thu Jan 1 08:00:00 1970 +++ ./files/patch-aa Mon Jun 9 16:56:08 2003 @@ -0,0 +1,14 @@ +--- 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 +=20 ++#ifdef HAVE_GETOPT_H ++# define HAVE_DECL_GETOPT HAVE_GETOPT_H ++#endif ++ ++ + /* + * This is needed for Solaris + */ =3D=3D=3D=3D=3D=3D patch end =3D=3D=3D=3D=3D=3D To Vadim: Another patch made only for your tarball file is also availble here: http://people.freebsd.org/~foxfair/patch.fwbuilder-orig --+HP7ph2BbKc20aGI Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (FreeBSD) iD8DBQE+5TRfsWh5Cw3CV+oRAontAJ9fRPP8w7aNlrQ3KubEPeSD2wYGuwCfYvTq ZPFDXZm1Sgm3lBhnmQn/y4M= =ugeM -----END PGP SIGNATURE----- --+HP7ph2BbKc20aGI--