Date: Thu, 9 Jan 2003 16:17:31 +0100 (CET) From: Palle Girgensohn <girgen@pingpong.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/46894: postgresql fixes Message-ID: <200301091517.h09FHV1H082225@rambutan.pingpong.net>
next in thread | raw e-mail | index | archive | help
>Number: 46894 >Category: ports >Synopsis: postgresql fixes >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 Jan 09 07:20:06 PST 2003 >Closed-Date: >Last-Modified: >Originator: Palle Girgensohn >Release: FreeBSD 4.7-RELEASE i386 >Organization: PING PONG >Environment: System: FreeBSD rambutan.pingpong.net 4.7-RELEASE FreeBSD 4.7-RELEASE #11: Wed Oct 9 18:35:14 CEST 2002 girgen@tomat.pingpong.net:/usr/obj/usr/src/sys/WORKSTATION i386 >Description: Fix some problems/quirks with the PostgreSQL port after the 7.3.1 commit - Don't download unused distfiles. This was mistakenly added by the comitter. - shell commands must be in a target, so move the echoes for kerberos into pre-everything. This error propagated from the postgresql-devel port. Submitted by: Craig Boston <craig@olyun.gank.org> - the comitter added extra knobs for debug & strip, but they didn't quite work as expected. I hereby remove the stripping altogether, it simplifies the logic, and doesn't do much good anyway. This also fix so WITH_DEBUG actually works. Before, binaries where stripped anyway... If still possible, this should go into the 5.0 release. (is it still a moving target, by moving the cvs tags, or are the CDs burned already?) >How-To-Repeat: >Fix: *Don't* bump PORTREVISION, please, the installed stuff is practically identical. Index: Makefile =================================================================== RCS file: /misc/ncvs/ports/databases/postgresql7/Makefile,v retrieving revision 1.104 diff -u -r1.104 Makefile --- Makefile 4 Jan 2003 12:18:54 -0000 1.104 +++ Makefile 9 Jan 2003 15:01:38 -0000 @@ -24,9 +24,7 @@ ftp://ftp.postgresql.org/pub/%SUBDIR%/ MASTER_SITE_SUBDIR= source/v${PORTVERSION} DISTFILES= postgresql-base-${PORTVERSION}${EXTRACT_SUFX} \ - postgresql-opt-${PORTVERSION}${EXTRACT_SUFX} \ - postgresql-test-${PORTVERSION}${EXTRACT_SUFX} \ - postgresql-docs-${PORTVERSION}${EXTRACT_SUFX} + postgresql-opt-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER?= girgen@pingpong.net @@ -65,20 +63,10 @@ CFLAGS+= -O3 -funroll-loops .endif -.if defined(WITH_DEBUG) && defined(WITH_STRIPBIN) - @${ECHO} "WITH_DEBUG and WITH_STRIPBIN are mutually exclusive tunables." - @${ECHO} "Please choose one or the other." - @exit ${FALSE} -.endif - .if defined(WITH_DEBUG) CONFIGURE_ARGS+= --enable-debug .endif -.if defined(WITH_STRIPBIN) -INSTALL_TARGET= install-strip -.endif - .if !defined(WITHOUT_SSL) USE_OPENSSL= yes CONFIGURE_ARGS+= "--with-openssl=${OPENSSLBASE}" @@ -89,35 +77,17 @@ PLIST_SUB+= SERVER="@comment " PKGNAMESUFFIX= -client .else -SERVERBINARIES+= postgres PLIST_SUB+= SERVER="" INSTALL_TARGET= install install-all-headers .endif -.if defined(WITH_MIT_KRB5) && defined(WITH_HEIMDAL_KRB5) - @${ECHO} "WITH_MIT_KRB5 and WITH_HEIMDAL_KRB5 are mutually exclusive." - @${ECHO} "Please choose one or the other." - @exit 1 -.endif - .if defined(WITH_MIT_KRB5) KRB5CONF= ${LOCALBASE}/bin/krb5-config -.if !exists(${KRB5CONFIG}) - @${ECHO} "Unable to find krb5-config in your local base, please verify that" - @${ECHO} "security/krb5 is installed or undefine the WITH_MIT_KRB5 tunable." - @exit 1 -.endif WITH_KRB5= yes .endif .if defined(WITH_HEIMDAL_KRB5) KRB5CONF= /usr/bin/krb5-config -.if !exists(${KRB5CONFIG}) - @${ECHO} "Unable to find krb5-config in the base system. Undefine" - @${ECHO} "WITH_HEIMDAL_KRB5 or add MAKE_KERBEROS5=yes to /etc/make.conf" - @${ECHO} "and remake world (or undefine the WITH_HEIMDAL_KRB5 tunable)." - @exit 1 -.endif LIB_DEPENDS+= krb5.3:${PORTSDIR}/security/krb5 WITH_KRB5= yes .endif @@ -171,8 +141,23 @@ @${ECHO} " WITH_HEIMDAL_KRB5 Builds with Heimdal's kerberos support" @${ECHO} " WITH_OPTIMIZED_CFLAGS Builds with compiler optimizations (-O3)" @${ECHO} " WITH_DEBUG Builds with debugging symbols" - @${ECHO} " WITH_STRIPBIN Installs stripped binaries" @${ECHO} "" +.if defined(WITH_MIT_KRB5) && defined(WITH_HEIMDAL_KRB5) + @${ECHO} "WITH_MIT_KRB5 and WITH_HEIMDAL_KRB5 are mutually exclusive." + @${ECHO} "Please choose one or the other." + @exit 1 +.endif +.if defined(WITH_MIT_KRB5) && !exists(${KRB5CONFIG}) + @${ECHO} "Unable to find krb5-config in your local base, please verify that" + @${ECHO} "security/krb5 is installed or undefine the WITH_MIT_KRB5 tunable." + @exit 1 +.endif +.if defined(WITH_HEIMDAL_KRB5) && !exists(${KRB5CONFIG}) + @${ECHO} "Unable to find krb5-config in the base system. Undefine" + @${ECHO} "WITH_HEIMDAL_KRB5 or add MAKE_KERBEROS5=yes to /etc/make.conf" + @${ECHO} "and remake world (or undefine the WITH_HEIMDAL_KRB5 tunable)." + @exit 1 +.endif .if defined(WITHOUT_SERVER) do-install: @@ -192,14 +177,7 @@ ${CAT} ${FILESDIR}/post-install-notes ${PKGMESSAGE} |\ ${SED} "s|/usr/local|${PREFIX}|g" |\ tee ${PREFIX}/share/postgresql/post-install-notes -.if !defined(DEBUG_FLAGS) -.for file in ecpg pg_dump pg_id pg_restore psql ${SERVERBINARIES} - @ strip ${PREFIX}/bin/${file} -.endfor -.endif .if !defined(WITHOUT_SERVER) -# install shell defaults for pgsql user - @ strip ${PREFIX}/bin/postgres .for i in profile cshrc @ ${SED} "s|%%PREFIX%%|${PREFIX}|g" \ < ${FILESDIR}/dot.$i.in \ >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?200301091517.h09FHV1H082225>