ports/59401: [MAINTAINER] databases/postgresql-tcltk: update to 7.4

[Palle Girgensohn]

>Number:         59401
>Category:       ports
>Synopsis:       [MAINTAINER] databases/postgresql-tcltk: update to 7.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 17 20:10:21 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Palle Girgensohn
>Release:        FreeBSD 4.9-RELEASE i386
>Organization:
Ping Pong AB
>Environment:
System: FreeBSD palle.girgensohn.se 4.9-RELEASE FreeBSD 4.9-RELEASE #6: Tue Nov  4 22:56:29 CET
>Description:
- Update to postgresql-7.4
- move back to using .include instead of cd xx && make -V

Generated with FreeBSD Port Tools 0.50
>How-To-Repeat:
>Fix:

--- postgresql-tcltk-7.4.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/databases/postgresql-tcltk/Makefile,v
retrieving revision 1.11
diff -u -u -r1.11 Makefile
--- Makefile	18 Sep 2003 11:31:50 -0000	1.11
+++ Makefile	18 Nov 2003 04:00:15 -0000
@@ -4,29 +4,21 @@
 #
 # $FreeBSD: ports/databases/postgresql-tcltk/Makefile,v 1.11 2003/09/18 11:31:50 osa Exp $
 #
-POSTGRESQL_PORT?=	databases/postgresql7
 
-PORTNAME=	postgresql
-PORTVERSION!=	cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V PORTVERSION
-PORTREVISION?=	0
-CATEGORIES=	databases tcl83 tk83
-MASTER_SITES=	${MASTER_SITE_PGSQL}
-MASTER_SITE_SUBDIR!=	cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V MASTER_SITE_SUBDIR
+PORTREVISION=	0
+CATEGORIES=	databases tcl${TCLVERSION:S/.//}
 PKGNAMESUFFIX=	-tcltk
-DISTFILES!=	cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V DISTFILES
-DIST_SUBDIR=	postgresql
 
 MAINTAINER=	girgen at pingpong.net
 COMMENT=	An TCL interface to the database PostgreSQL, including a tk GUI
 
+POSTGRESQL_PORT?=	databases/postgresql7
+POSTGRESQL_SUBPORT=YES
+.include <${.CURDIR}/../../${POSTGRESQL_PORT}/Makefile>
+
 LIB_DEPENDS=	tcl${TCLVERSION:S/.//}:${PORTSDIR}/lang/tcl${TCLVERSION:S/.//} \
 		pq:${PORTSDIR}/${POSTGRESQL_PORT}
 
-MD5_FILE=	${.CURDIR}/../../${POSTGRESQL_PORT}/distinfo
-
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-
 # you can use "make TCLVERSION=8.4" or similar for your favourite tcl version
 TCLVERSION?=	8.3
 PLIST_SUB+=	TCLVERSION=${TCLVERSION}
@@ -47,10 +39,6 @@
 CONFIGURE_ENV+=	LIBS="-lm -L${LOCALBASE}/lib -ltcl${TCLVERSION:S/.//}" \
 		CFLAGS=-DPGTCL_USE_TCLOBJ
 
-.if defined(WITHOUT_X11)
-WITHOUT_TK=	yes
-.endif
-
 .if defined(WITHOUT_TK)
 CONFIGURE_ARGS+=	--without-tk
 INCDIRS=	${TCL_INCDIR}
@@ -63,7 +51,11 @@
 TKCONFIG=	${LOCALBASE}/lib/tk${TCLVERSION}
 INCDIRS=	${TCL_INCDIR}:${TK_INCDIR}
 PLIST_SUB+=	TK=""
+CATEGORIES+=	tk${TCLVERSION:S/.//}
 .endif
+
+pre-build:
+	cd ${WRKSRC}/src/port; ${GMAKE}
 
 do-build:
 	@ cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${GMAKE} -C src/bin/pgtclsh
Index: files/patch-libpgtcl
===================================================================
RCS file: /home/ncvs/ports/databases/postgresql-tcltk/files/patch-libpgtcl,v
retrieving revision 1.1
diff -u -u -r1.1 patch-libpgtcl
--- files/patch-libpgtcl	13 Nov 2002 01:42:44 -0000	1.1
+++ files/patch-libpgtcl	18 Nov 2003 03:22:30 -0000
@@ -1,9 +1,11 @@
---- src/interfaces/libpgtcl/Makefile	Thu May 10 21:46:33 2001
-+++ src/interfaces/libpgtcl/Makefile	Fri Mar 29 05:11:10 2002
-@@ -26,5 +26,5 @@
- # to be referenced separately to keep (broken) linkers happy.  (This is
- # braindead; users of libpq should not need to know what it depends on.)
--SHLIB_LINK+= $(filter -L%, $(LDFLAGS)) $(filter -lcrypt, $(LIBS))
-+SHLIB_LINK+= $(filter -L%, $(LDFLAGS)) $(filter -lcrypt -L% -ltcl83 -ltcl84, $(LIBS))
+--- src/interfaces/libpgtcl/Makefile.orig	Tue Oct 28 22:55:58 2003
++++ src/interfaces/libpgtcl/Makefile	Tue Nov 18 04:21:46 2003
+@@ -21,7 +21,7 @@
+ OBJS= pgtcl.o pgtclCmds.o pgtclId.o
+ 
+ SHLIB_LINK = $(libpq) $(TCL_LIB_SPEC) $(TCL_LIBS) \
+-	$(filter -lssl -lcrypto -lkrb5 -lcrypt, $(LIBS)) $(THREAD_LIBS)
++	$(filter -lssl -lcrypto -lkrb5 -lcrypt -L% -ltcl83 -ltcl84, $(LIBS)) $(THREAD_LIBS)
+ 
+ all: submake-libpq all-lib
  
- all: submake all-lib
--- postgresql-tcltk-7.4.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: