aboutsummaryrefslogtreecommitdiff
path: root/databases/postgresql-tcltk
diff options
context:
space:
mode:
authorSADA Kenji <sada@FreeBSD.org>2002-11-13 01:42:44 +0000
committerSADA Kenji <sada@FreeBSD.org>2002-11-13 01:42:44 +0000
commitf160a7126fd6551fbcd2944247f09fd165f9a868 (patch)
treea2c7fd6a4449305ea99c770afb59f7152d11520c /databases/postgresql-tcltk
parent6758d1271c92b67003024f316148f3620cae1724 (diff)
downloadports-f160a7126fd6551fbcd2944247f09fd165f9a868.tar.gz
ports-f160a7126fd6551fbcd2944247f09fd165f9a868.zip
Notes
Diffstat (limited to 'databases/postgresql-tcltk')
-rw-r--r--databases/postgresql-tcltk/Makefile10
-rw-r--r--databases/postgresql-tcltk/files/patch-libpgtcl9
2 files changed, 17 insertions, 2 deletions
diff --git a/databases/postgresql-tcltk/Makefile b/databases/postgresql-tcltk/Makefile
index 153eaed06295..714339482ee2 100644
--- a/databases/postgresql-tcltk/Makefile
+++ b/databases/postgresql-tcltk/Makefile
@@ -26,13 +26,19 @@ CONFIGURE_ARGS= --with-tcl \
TCL_INCDIR= ${LOCALBASE}/include/tcl${TCLVERSION}
TCLCONFIG= ${LOCALBASE}/lib/tcl${TCLVERSION}
MAKE_ENV+= TCL_INCDIR=${TCL_INCDIR}
+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
+CONFIGURE_ARGS+= --without-tk
INCDIRS= ${TCL_INCDIR}
PLIST_SUB+= TK="@comment "
.else
-CONFIGURE_ARGS+= --with-tkconfig="${TKCONFIG}"
+CONFIGURE_ARGS+= --with-tkconfig="${TKCONFIG}"
TK_INCDIR= ${LOCALBASE}/include/tk${TCLVERSION}
CONFIGURE_ENV+= WISH=${LOCALBASE}/bin/wish${TCLVERSION}
LIB_DEPENDS+= tk${TCLVERSION:S/.//}:${PORTSDIR}/x11-toolkits/tk${TCLVERSION:S/.//}
diff --git a/databases/postgresql-tcltk/files/patch-libpgtcl b/databases/postgresql-tcltk/files/patch-libpgtcl
new file mode 100644
index 000000000000..831a4622f761
--- /dev/null
+++ b/databases/postgresql-tcltk/files/patch-libpgtcl
@@ -0,0 +1,9 @@
+--- 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))
+
+ all: submake all-lib