From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Dec 24 02:20:16 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BD7B416A403 for ; Sun, 24 Dec 2006 02:20:16 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id A1F4F13C457 for ; Sun, 24 Dec 2006 02:20:16 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id kBO2KGM4038332 for ; Sun, 24 Dec 2006 02:20:16 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id kBO2KGdL038326; Sun, 24 Dec 2006 02:20:16 GMT (envelope-from gnats) Resent-Date: Sun, 24 Dec 2006 02:20:16 GMT Resent-Message-Id: <200612240220.kBO2KGdL038326@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Marat N.Afanasyev" Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5676016A40F for ; Sun, 24 Dec 2006 02:13:54 +0000 (UTC) (envelope-from marat@zealot.ksu.ru) Received: from zealot.ksu.ru (zealot.ksu.ru [194.85.245.161]) by mx1.freebsd.org (Postfix) with ESMTP id B2A7413C448 for ; Sun, 24 Dec 2006 02:13:53 +0000 (UTC) (envelope-from marat@zealot.ksu.ru) Received: from zealot.ksu.ru (localhost.lnet [127.0.0.1]) by zealot.ksu.ru (8.13.8/8.13.8) with ESMTP id kBO1pNui022341 for ; Sun, 24 Dec 2006 04:51:23 +0300 (MSK) (envelope-from marat@zealot.ksu.ru) Received: (from marat@localhost) by zealot.ksu.ru (8.13.8/8.13.8/Submit) id kBO1pM08022340; Sun, 24 Dec 2006 04:51:22 +0300 (MSK) (envelope-from marat) Message-Id: <200612240151.kBO1pM08022340@zealot.ksu.ru> Date: Sun, 24 Dec 2006 04:51:22 +0300 (MSK) From: "Marat N.Afanasyev" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/107161: patch devel/devhelp to build with seamonkey X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: "Marat N.Afanasyev" List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Dec 2006 02:20:16 -0000 >Number: 107161 >Category: ports >Synopsis: patch devel/devhelp to build with seamonkey >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Dec 24 02:20:15 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Marat N.Afanasyev >Release: FreeBSD 6.2-PRERELEASE amd64 >Organization: >Environment: System: FreeBSD zealot.ksu.ru 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #0: Fri Dec 22 04:33:17 MSK 2006 root@zealot.ksu.ru:/usr/obj/usr/src/sys/ZEALOT amd64 >Description: devel/devhelp knows nothing about seamonkey >How-To-Repeat: >Fix: attached patches should fix the problem --- Makefile.orig Sun Dec 24 04:35:50 2006 +++ Makefile Sun Dec 24 04:38:33 2006 @@ -27,4 +27,8 @@ .if ${WITH_MOZILLA}=="firefox" MOZILLA= firefox +.else +.if ${WITH_MOZILLA}=="seamonkey" +MOZILLA= seamonkey +.endif .endif .endif @@ -53,5 +57,5 @@ @${ECHO_MSG} " change this by defining WITH_MOZILLA to one of the following values:" @${ECHO_MSG} - @${ECHO_MSG} " firefox " + @${ECHO_MSG} " firefox seamonkey " @${ECHO_MSG} "" --- configure.orig Sun Dec 24 04:41:19 2006 +++ configure Sun Dec 24 04:43:38 2006 @@ -1048,7 +1048,7 @@ --with-gconf-source=sourceaddress Config database for installing schema files. --with-gconf-schema-file-dir=dir Directory for installing schema files. - --with-mozilla[=mozilla|firefox|thunderbird] - Whether to use mozilla, firefox or thunderbird - gtkmozembed (default: mozilla) + --with-mozilla[=mozilla|firefox|seamonkey|thunderbird] + Whether to use mozilla, firefox, seamonkey + or thunderbird gtkmozembed (default: mozilla) --with-zlib=DIR use libz in DIR @@ -20254,4 +20254,6 @@ elif pkg-config --exists firefox-gtkmozembed; then MOZILLA=firefox + elif pkg-config --exists seamonkey-gtkmozembed; then + MOZILLA=seamonkey elif pkg-config --exists thunderbird-gtkmozembed; then MOZILLA=thunderbird @@ -20261,5 +20263,5 @@ { (exit 1); exit 1; }; } fi -elif test "x$with_mozilla" != "xmozilla" -a "x$with_mozilla" != "xfirefox" -a "x$with_mozilla" != "xthunderbird"; then +elif test "x$with_mozilla" != "xmozilla" -a "x$with_mozilla" != "xfirefox" -a "x$with_mozilla" != "xseamonkey" -a "x$with_mozilla" != "xthunderbird"; then { { echo "$as_me:$LINENO: error: unknown mozilla name ($MOZILLA)" >&5 echo "$as_me: error: unknown mozilla name ($MOZILLA)" >&2;} @@ -20275,4 +20277,5 @@ mozilla) min_version=1.7 flavour=mozilla ;; firefox) min_version=0.10 flavour=toolkit ;; +seamonkey) min_version=1.0 flavour=toolkit ;; thunderbird) min_version=0.8 flavour=toolkit ;; esac --- configure.in.orig Sun Dec 24 04:40:11 2006 +++ configure.in Sun Dec 24 04:40:47 2006 @@ -45,6 +45,6 @@ MOZILLA= AC_ARG_WITH([mozilla], - AC_HELP_STRING([--with-mozilla@<:@=mozilla|firefox|thunderbird@:>@], - [Whether to use mozilla, firefox or thunderbird gtkmozembed (default: mozilla)]), + AC_HELP_STRING([--with-mozilla@<:@=mozilla|firefox|seamonkey|thunderbird@:>@], + [Whether to use mozilla, firefox, seamonkey or thunderbird gtkmozembed (default: mozilla)]), [MOZILLA="$withval"]) >Release-Note: >Audit-Trail: >Unformatted: