diff options
| author | Sean Chittenden <seanc@FreeBSD.org> | 2003-12-04 12:00:49 +0000 |
|---|---|---|
| committer | Sean Chittenden <seanc@FreeBSD.org> | 2003-12-04 12:00:49 +0000 |
| commit | 8a928af72d1ebb839a332158c27129b8a154275e (patch) | |
| tree | c658c0da17e05366791dbe372c9e966663a70265 /databases/postgresql-tcltk | |
| parent | 75d6fb12df9343cebb166dc9ac575ae77c24dd4d (diff) | |
| download | ports-8a928af72d1ebb839a332158c27129b8a154275e.tar.gz ports-8a928af72d1ebb839a332158c27129b8a154275e.zip | |
Notes
Diffstat (limited to 'databases/postgresql-tcltk')
| -rw-r--r-- | databases/postgresql-tcltk/Makefile | 30 | ||||
| -rw-r--r-- | databases/postgresql-tcltk/files/patch-libpgtcl | 18 |
2 files changed, 21 insertions, 27 deletions
diff --git a/databases/postgresql-tcltk/Makefile b/databases/postgresql-tcltk/Makefile index 38d1e28b7d5c..84f960fc845e 100644 --- a/databases/postgresql-tcltk/Makefile +++ b/databases/postgresql-tcltk/Makefile @@ -4,31 +4,23 @@ # # $FreeBSD$ # -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@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 +TCLVERSION?= 8.4 PLIST_SUB+= TCLVERSION=${TCLVERSION} CONFIGURE_ARGS= --with-tcl \ --with-tclconfig=${TCLCONFIG} \ @@ -47,10 +39,6 @@ WITHOUT_TK= yes 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,8 +51,12 @@ LIB_DEPENDS+= tk${TCLVERSION:S/.//}:${PORTSDIR}/x11-toolkits/tk${TCLVERSION:S/./ 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 @ cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${GMAKE} -C src/interfaces/libpgtcl diff --git a/databases/postgresql-tcltk/files/patch-libpgtcl b/databases/postgresql-tcltk/files/patch-libpgtcl index 831a4622f761..e0a811261fe7 100644 --- a/databases/postgresql-tcltk/files/patch-libpgtcl +++ b/databases/postgresql-tcltk/files/patch-libpgtcl @@ -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 |