Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 8 Jun 2001 04:07:08 +0200 (CEST)
From:      girgen@partitur.se
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/27949: databases/postgresql7 dependency fix
Message-ID:  <200106080207.f58278P21066@palle.girgensohn.se>

next in thread | raw e-mail | index | archive | help

>Number:         27949
>Category:       ports
>Synopsis:       databases/postgresql7 dependency fix
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jun 07 19:10:00 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator:     Palle Girgensohn
>Release:        FreeBSD 4.3-STABLE i386
>Organization:
Partitur
>Environment:
System: FreeBSD palle.girgensohn.se 4.3-STABLE FreeBSD 4.3-STABLE #0: Sat May 19 03:59:57 CEST 2001 girgen@palle.girgensohn.se:/usr/obj/usr/src/sys/STORDATAN i386


	
>Description:
- The configure script *must* run pre-fetch, since the dependencies
  are checked in the fetch target. Before the patch below, make
  install will fail to depend on Tcl/Tk, for instance.

- Also, while I'm here, synchronize the batch and default interactive
  selections for optional parts of the port.

Bumped port revision.

>How-To-Repeat:
	
>Fix:
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/databases/postgresql7/Makefile,v
retrieving revision 1.85
diff -u -u -r1.85 Makefile
--- Makefile	2001/06/04 11:52:52	1.85
+++ Makefile	2001/06/08 02:00:24
@@ -7,7 +7,7 @@
 
 PORTNAME=	postgresql
 PORTVERSION=	7.1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases
 MASTER_SITES=	ftp://ftp.iodynamics.com/pub/mirror/postgresql/%SUBDIR%/ \
 		ftp://ftp.postgresql.org/pub/%SUBDIR%/ \
@@ -89,14 +89,14 @@
 		NO_OPENSSL="${NO_OPENSSL}" \
 		DISTNAME="${DISTNAME}"
 
-pre-extract:
-	@ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql
-
-# We must .include here because we need the Makefile.inc @ pre-install,
-# but it is created @ pre-extract
+# We must .include here because we need the Makefile.inc @ pre-install
+# to determine the correct plist.
 .if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
 .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
 .endif
+
+pre-fetch:
+	@ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql
 
 pre-install:
 	@ ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PORTNAME} PRE-INSTALL
Index: scripts/configure.postgresql
===================================================================
RCS file: /home/ncvs/ports/databases/postgresql7/scripts/configure.postgresql,v
retrieving revision 1.5
diff -u -u -r1.5 configure.postgresql
--- scripts/configure.postgresql	2001/05/18 01:30:20	1.5
+++ scripts/configure.postgresql	2001/06/08 01:15:32
@@ -15,14 +15,14 @@
 fi
 
 if [ "${BATCH}" ]; then
-	set \"MultiByte\" \"ODBC\" \"SSL\"
+	set \"MultiByte\" \"ODBC\" \"SSL\" \"TCL\" \"TK\"
 else
 	/usr/bin/dialog --title "configuration options" --clear \
 					--checklist "\n\
 Please select desired options:" -1 -1 7 \
 JDBC       "Java DataBase Connectivity" OFF \
 MultiByte  "Multibyte for Multilingualism" ON \
-ODBC       "Open Database Connectivity" OFF \
+ODBC       "Open Database Connectivity" ON \
 TCL        "Tcl" ON \
 TCLTK      "Tcl/Tk" ON \
 SSL        "Secure Socket Layer" ON \
>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?200106080207.f58278P21066>