Date: Thu, 2 Aug 2001 00:06:34 -0700 (PDT) From: Scott Renfro <scott@renfro.org> To: FreeBSD-gnats-submit@freebsd.org Cc: billf@freebsd.org Subject: ports/29381: [patch] fix ethereal build failure (on can't make mergecap.1) Message-ID: <200108020706.f7276YN34028@renfro.org>
next in thread | raw e-mail | index | archive | help
>Number: 29381 >Category: ports >Synopsis: [patch] fix ethereal build failure (on can't make mergecap.1) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Aug 02 00:10:01 PDT 2001 >Closed-Date: >Last-Modified: >Originator: Scott Renfro <scott@renfro.org> >Release: FreeBSD 4.3-STABLE i386 >Organization: >Environment: System: FreeBSD bonsai.home.renfro.org 4.3-STABLE FreeBSD 4.3-STABLE #0: Tue Jul 17 04:22:33 PDT 2001 scott@bonsai.home.renfro.org:/usr/obj/usr/src/sys/FWGW4 i386 >Description: Two problems: (1) ethereal will not build for users without automake installed due to a stale doc/Makefile.in in 0.8.19 release; and (2) the last port update missed two man pages from the patch for the MAN1= line, preventing them from being cleaned up later by pkg_delete This patch fixes both problems, and eliminates the dependency on gmake at the same time. Details on (1): The ethereal-08-19.tar.gz distribution had a stale doc/Makefile.in; we had tried to workaround this in the port skeleton using gmake, but that only works if automake is also installed, although automake is not listed as a dependency. >How-To-Repeat: pkg_delete /var/db/pkg/automake* cd /usr/ports/net/ethereal make install near the end, the build fails; can't make mergecap.1 >Fix: this patch fixes the original problem in doc/Makefile.in, eliminating the need for gmake and adds mergecap.1 and text2pcap.1 to the MAN1 variable NOTE FOR COMMITTER: this patch adds the first patch file to this port skeleton, so you'll have to create the files subdirectory and commit the patch file itself diff -urN ethereal/Makefile ethereal.fixed/Makefile --- ethereal/Makefile Wed Jul 25 00:32:52 2001 +++ ethereal.fixed/Makefile Wed Aug 1 23:40:57 2001 @@ -7,6 +7,7 @@ PORTNAME= ethereal PORTVERSION= 0.8.19 +PORTREVISION= 1 CATEGORIES= net ipv6 MASTER_SITES= ftp://ftp.ethereal.com/pub/ethereal/ \ ftp://gd.tuwien.ac.at/infosys/security/ethereal/ \ @@ -33,9 +34,7 @@ .endif PLIST_SUB= PORTVERSION=${PORTVERSION} -USE_GMAKE= yes - -MAN1= ethereal.1 tethereal.1 editcap.1 +MAN1= ethereal.1 tethereal.1 editcap.1 mergecap.1 text2pcap.1 pre-install: .for i in ${MAN1} diff -urN ethereal/files/patch-aa ethereal.fixed/files/patch-aa --- ethereal/files/patch-aa Wed Dec 31 16:00:00 1969 +++ ethereal.fixed/files/patch-aa Wed Aug 1 23:00:34 2001 @@ -0,0 +1,15 @@ +--- doc/Makefile.in.orig Wed Aug 1 22:49:55 2001 ++++ doc/Makefile.in Wed Aug 1 22:52:18 2001 +@@ -273,6 +273,12 @@ + --release=$(VERSION) \ + > ../editcap.1 + ++../mergecap.1: mergecap.pod ../config.h ++ pod2man $(srcdir)/mergecap.pod \ ++ --center="The Ethereal Network Analyzer" \ ++ --release=$(VERSION) \ ++ > ../mergecap.1 ++ + ../text2pcap.1: text2pcap.pod ../config.h + pod2man $(srcdir)/text2pcap.pod \ + --center="The Ethereal Network Analyzer" \ LocalWords: pkg >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200108020706.f7276YN34028>