From owner-freebsd-ports Sat Aug 31 13: 0:32 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 955C637B407 for ; Sat, 31 Aug 2002 13:00:15 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6D7AB43E84 for ; Sat, 31 Aug 2002 13:00:13 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7VK0DJU002480 for ; Sat, 31 Aug 2002 13:00:13 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7VK0D4u002479; Sat, 31 Aug 2002 13:00:13 -0700 (PDT) Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 23A2937B400 for ; Sat, 31 Aug 2002 12:58:02 -0700 (PDT) Received: from net2.dinoex.sub.org (net2.dinoex.de [212.184.201.182]) by mx1.FreeBSD.org (Postfix) with ESMTP id B614A43E6A for ; Sat, 31 Aug 2002 12:57:59 -0700 (PDT) (envelope-from dm@home.dinoex.sub.de) Received: from home.dinoex.sub.de (home [217.6.200.196]) by net2.dinoex.sub.org (8.12.6/8.12.6) with ESMTP id g7VJvckg027790 for ; Sat, 31 Aug 2002 21:57:45 +0200 (CEST) (envelope-from dm@home.dinoex.sub.de) Received: (from dm@localhost) by home.dinoex.sub.de (8.12.5/8.12.5/Submit) id g7VJxAIZ084162; Sat, 31 Aug 2002 21:59:10 +0200 (CEST) (envelope-from dm) Message-Id: <200208311959.g7VJxAIZ084162@home.dinoex.sub.de> Date: Sat, 31 Aug 2002 21:59:10 +0200 (CEST) From: dirk.meyer@dinoex.sub.org Reply-To: dirk.meyer@dinoex.sub.org To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/42261: [PATCH] postgresql7 must be confureed interactive Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 42261 >Category: ports >Synopsis: [PATCH] postgresql7 must be confureed interactive >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sat Aug 31 13:00:12 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Dirk Meyer >Release: FreeBSD 4.6-STABLE i386 >Organization: privat >Environment: System: FreeBSD 4.6-STABLE i386 >Description: postgresql7 must be configured interactive. >How-To-Repeat: make >Fix: allow user to set option in /etc/make.conf apply this patch: diff postgresql7/Makefile postgresql7/Makefile --- postgresql7/Makefile Wed Aug 28 09:03:39 2002 +++ postgresql7/Makefile Fri Aug 30 22:22:29 2002 @@ -95,7 +99,9 @@ FILESDIR="${FILESDIR}" \ TOUCH="${TOUCH}" \ MKDIR="${MKDIR}" \ - DISTNAME="${DISTNAME}" + DISTNAME="${DISTNAME}" \ + PGSQL_OPTIONS1="${PGSQL_OPTIONS1}" \ + PGSQL_OPTIONS2="${PGSQL_OPTIONS2}" # We must .include here because we need the Makefile.inc @ pre-install # to determine the correct plist. diff postgresql7/scripts/configure.postgresql postgresql7/scripts/configure.postgresql --- postgresql7/scripts/configure.postgresql Sat Apr 13 16:18:49 2002 +++ postgresql7/scripts/configure.postgresql Fri Apr 19 19:59:32 2002 @@ -21,7 +21,11 @@ fi if [ "${BATCH}" ]; then - set \"MultiByte\" \"KRB5\" + if [ "${PGSQL_OPTIONS1}" ]; then + set ${PGSQL_OPTIONS1} + else + set \"MultiByte\" \"KRB5\" + fi else /usr/bin/dialog --title "configuration options" --clear \ --checklist "\n\ @@ -83,7 +87,11 @@ echo "WITHOUT_MULTIBYTE=YES" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc else if [ "${BATCH}" ]; then - set "nothing" + if [ "${PGSQL_OPTIONS2}" ]; then + set ${PGSQL_OPTIONS2} + else + set "nothing" + fi else /usr/bin/dialog --title "Default encoding system" --clear \ --radiolist "\n\ >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message