summaryrefslogtreecommitdiff
path: root/x11-toolkits
diff options
context:
space:
mode:
authorJean-Marc Zucconi <jmz@FreeBSD.org>2002-05-10 01:13:46 +0000
committerJean-Marc Zucconi <jmz@FreeBSD.org>2002-05-10 01:13:46 +0000
commitbdb7d2aab2d019c9746ddf87e07f140f7ab5ff9d (patch)
treeae15e5660f21ff57f46b5b0a174e7219886733f6 /x11-toolkits
parentUpgrade to 2.4.96b. (diff)
Link the library with -lX11 -ltk82 so that the tix library can be loaded
safely from a tk program. Submitted by: Daniel O'Connor <doconnor@gsoft.com.au>
Notes
Notes: svn path=/head/; revision=58825
Diffstat (limited to 'x11-toolkits')
-rw-r--r--x11-toolkits/tix/Makefile2
-rw-r--r--x11-toolkits/tix/files/patch-aa7
2 files changed, 5 insertions, 4 deletions
diff --git a/x11-toolkits/tix/Makefile b/x11-toolkits/tix/Makefile
index 8106d699e0aa..ea6d30b4a7bb 100644
--- a/x11-toolkits/tix/Makefile
+++ b/x11-toolkits/tix/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tix
PORTVERSION= 4.1.0.007
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits tk82
MASTER_SITES= http://www.neosoft.com/tcl/ftparchive/%SUBDIR%/ \
ftp://ftp.riken.go.jp/pub/lang/tcl/netsoft/%SUBDIR%/
diff --git a/x11-toolkits/tix/files/patch-aa b/x11-toolkits/tix/files/patch-aa
index 705c7b177962..2d809488aa9b 100644
--- a/x11-toolkits/tix/files/patch-aa
+++ b/x11-toolkits/tix/files/patch-aa
@@ -1,5 +1,5 @@
---- configure.orig Mon Feb 15 04:20:06 1999
-+++ configure Sun Dec 5 07:03:17 1999
+--- configure.orig Mon Feb 15 03:20:06 1999
++++ configure Thu May 9 01:24:55 2002
@@ -14,9 +14,9 @@
ac_help="$ac_help
--enable-gcc allow use of gcc if available"
@@ -114,8 +114,9 @@
# The main Tix library
#
- eval "TIX_LIB_FILE=libtix${TCL_SHARED_LIB_SUFFIX}"
+- TIX_MAKE_LIB="\${SHLIB_LD} -o ${TIX_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS}"
+ eval "TIX_LIB_FILE=libtix${LIB_VERSION}.so.1"
- TIX_MAKE_LIB="\${SHLIB_LD} -o ${TIX_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS}"
++ TIX_MAKE_LIB="\${SHLIB_LD} -o ${TIX_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS} -L${PREFIX}/lib -L\${X11BASE}/lib -lX11 -ltk82"
# The Tcl SAM library
#