View | Details | Raw Unified | Return to bug 59401
Collapse All | Expand All

(-)Makefile (-18 / +10 lines)
Lines 4-32 Link Here
4
#
4
#
5
# $FreeBSD: ports/databases/postgresql-tcltk/Makefile,v 1.11 2003/09/18 11:31:50 osa Exp $
5
# $FreeBSD: ports/databases/postgresql-tcltk/Makefile,v 1.11 2003/09/18 11:31:50 osa Exp $
6
#
6
#
7
POSTGRESQL_PORT?=	databases/postgresql7
8
7
9
PORTNAME=	postgresql
8
PORTREVISION=	0
10
PORTVERSION!=	cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V PORTVERSION
9
CATEGORIES=	databases tcl${TCLVERSION:S/.//}
11
PORTREVISION?=	0
12
CATEGORIES=	databases tcl83 tk83
13
MASTER_SITES=	${MASTER_SITE_PGSQL}
14
MASTER_SITE_SUBDIR!=	cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V MASTER_SITE_SUBDIR
15
PKGNAMESUFFIX=	-tcltk
10
PKGNAMESUFFIX=	-tcltk
16
DISTFILES!=	cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V DISTFILES
17
DIST_SUBDIR=	postgresql
18
11
19
MAINTAINER=	girgen@pingpong.net
12
MAINTAINER=	girgen@pingpong.net
20
COMMENT=	An TCL interface to the database PostgreSQL, including a tk GUI
13
COMMENT=	An TCL interface to the database PostgreSQL, including a tk GUI
21
14
15
POSTGRESQL_PORT?=	databases/postgresql7
16
POSTGRESQL_SUBPORT=YES
17
.include <${.CURDIR}/../../${POSTGRESQL_PORT}/Makefile>
18
22
LIB_DEPENDS=	tcl${TCLVERSION:S/.//}:${PORTSDIR}/lang/tcl${TCLVERSION:S/.//} \
19
LIB_DEPENDS=	tcl${TCLVERSION:S/.//}:${PORTSDIR}/lang/tcl${TCLVERSION:S/.//} \
23
		pq:${PORTSDIR}/${POSTGRESQL_PORT}
20
		pq:${PORTSDIR}/${POSTGRESQL_PORT}
24
21
25
MD5_FILE=	${.CURDIR}/../../${POSTGRESQL_PORT}/distinfo
26
27
USE_GMAKE=	yes
28
GNU_CONFIGURE=	yes
29
30
# you can use "make TCLVERSION=8.4" or similar for your favourite tcl version
22
# you can use "make TCLVERSION=8.4" or similar for your favourite tcl version
31
TCLVERSION?=	8.3
23
TCLVERSION?=	8.3
32
PLIST_SUB+=	TCLVERSION=${TCLVERSION}
24
PLIST_SUB+=	TCLVERSION=${TCLVERSION}
Lines 47-56 Link Here
47
CONFIGURE_ENV+=	LIBS="-lm -L${LOCALBASE}/lib -ltcl${TCLVERSION:S/.//}" \
39
CONFIGURE_ENV+=	LIBS="-lm -L${LOCALBASE}/lib -ltcl${TCLVERSION:S/.//}" \
48
		CFLAGS=-DPGTCL_USE_TCLOBJ
40
		CFLAGS=-DPGTCL_USE_TCLOBJ
49
41
50
.if defined(WITHOUT_X11)
51
WITHOUT_TK=	yes
52
.endif
53
54
.if defined(WITHOUT_TK)
42
.if defined(WITHOUT_TK)
55
CONFIGURE_ARGS+=	--without-tk
43
CONFIGURE_ARGS+=	--without-tk
56
INCDIRS=	${TCL_INCDIR}
44
INCDIRS=	${TCL_INCDIR}
Lines 63-69 Link Here
63
TKCONFIG=	${LOCALBASE}/lib/tk${TCLVERSION}
51
TKCONFIG=	${LOCALBASE}/lib/tk${TCLVERSION}
64
INCDIRS=	${TCL_INCDIR}:${TK_INCDIR}
52
INCDIRS=	${TCL_INCDIR}:${TK_INCDIR}
65
PLIST_SUB+=	TK=""
53
PLIST_SUB+=	TK=""
54
CATEGORIES+=	tk${TCLVERSION:S/.//}
66
.endif
55
.endif
56
57
pre-build:
58
	cd ${WRKSRC}/src/port; ${GMAKE}
67
59
68
do-build:
60
do-build:
69
	@ cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${GMAKE} -C src/bin/pgtclsh
61
	@ cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${GMAKE} -C src/bin/pgtclsh
(-)files/patch-libpgtcl (-8 / +10 lines)
Lines 1-9 Link Here
1
--- src/interfaces/libpgtcl/Makefile	Thu May 10 21:46:33 2001
1
--- src/interfaces/libpgtcl/Makefile.orig	Tue Oct 28 22:55:58 2003
2
+++ src/interfaces/libpgtcl/Makefile	Fri Mar 29 05:11:10 2002
2
+++ src/interfaces/libpgtcl/Makefile	Tue Nov 18 04:21:46 2003
3
@@ -26,5 +26,5 @@
3
@@ -21,7 +21,7 @@
4
 # to be referenced separately to keep (broken) linkers happy.  (This is
4
 OBJS= pgtcl.o pgtclCmds.o pgtclId.o
5
 # braindead; users of libpq should not need to know what it depends on.)
5
 
6
-SHLIB_LINK+= $(filter -L%, $(LDFLAGS)) $(filter -lcrypt, $(LIBS))
6
 SHLIB_LINK = $(libpq) $(TCL_LIB_SPEC) $(TCL_LIBS) \
7
+SHLIB_LINK+= $(filter -L%, $(LDFLAGS)) $(filter -lcrypt -L% -ltcl83 -ltcl84, $(LIBS))
7
-	$(filter -lssl -lcrypto -lkrb5 -lcrypt, $(LIBS)) $(THREAD_LIBS)
8
+	$(filter -lssl -lcrypto -lkrb5 -lcrypt -L% -ltcl83 -ltcl84, $(LIBS)) $(THREAD_LIBS)
9
 
10
 all: submake-libpq all-lib
8
 
11
 
9
 all: submake all-lib

Return to bug 59401