aboutsummaryrefslogtreecommitdiffstats
path: root/net/imm
diff options
context:
space:
mode:
authorpav <pav@FreeBSD.org>2008-04-04 21:59:26 +0800
committerpav <pav@FreeBSD.org>2008-04-04 21:59:26 +0800
commit2ed758975febc27bdea68dc9cf85485101a57a1a (patch)
tree8b49fc5b62c002dfc9fcc8fc53e338da9836845d /net/imm
parent687ab08c8c9eee90c46e57032327cae3096f08ec (diff)
downloadfreebsd-ports-gnome-2ed758975febc27bdea68dc9cf85485101a57a1a.tar.gz
freebsd-ports-gnome-2ed758975febc27bdea68dc9cf85485101a57a1a.tar.zst
freebsd-ports-gnome-2ed758975febc27bdea68dc9cf85485101a57a1a.zip
- Move from Tk 8.2 to Tk 8.4
PR: ports/110429 Submitted by: Martin Tournoij <carpetsmoker@xs4all.nl> Approved by: maintainer timeout (fenner; 1 year)
Diffstat (limited to 'net/imm')
-rw-r--r--net/imm/Makefile8
-rw-r--r--net/imm/files/Makefile.freebsd6
-rw-r--r--net/imm/files/patch-src-tkAppInit.c12
3 files changed, 18 insertions, 8 deletions
diff --git a/net/imm/Makefile b/net/imm/Makefile
index dd5ebaddfb53..6d5e44e69700 100644
--- a/net/imm/Makefile
+++ b/net/imm/Makefile
@@ -7,8 +7,8 @@
PORTNAME= imm
PORTVERSION= 3.5a1
-PORTREVISION= 1
-CATEGORIES= mbone tk82
+PORTREVISION= 2
+CATEGORIES= mbone tk84
MASTER_SITES= ftp://ftp.hawaii.edu/paccom/imm-3.5a1/
DISTNAME= imm.source
EXTRACT_SUFX= .tar.Z
@@ -16,10 +16,8 @@ EXTRACT_SUFX= .tar.Z
MAINTAINER= fenner@FreeBSD.org
COMMENT= Internet Image(or other data) Multicaster (and receiver)
-LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82
-
+USE_TK= yes
WRKSRC= ${WRKDIR}/mnm
-USE_X_PREFIX= yes
.include <bsd.port.pre.mk>
diff --git a/net/imm/files/Makefile.freebsd b/net/imm/files/Makefile.freebsd
index ae7ce6434e6f..948ca8f54099 100644
--- a/net/imm/files/Makefile.freebsd
+++ b/net/imm/files/Makefile.freebsd
@@ -1,17 +1,17 @@
# Some versions of make, like SGI's, use the following variable to
# determine which shell to use for executing commands:
SHELL = /bin/sh
-INCLUDE_DIR = -I${PREFIX}/include -I${LOCALBASE}/include/tcl8.2 -I${LOCALBASE}/include/tk8.2
+INCLUDE_DIR = -I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4 -I${X11BASE}/include
# Libraries to use when linking:
LIBS = -lm
-TKLIBS= -L$(PREFIX)/lib -L${LOCALBASE}/lib -ltk82 -ltcl82 -lX11
+TKLIBS= -L${X11BASE}/lib -L$(PREFIX)/lib -L${LOCALBASE}/lib -ltk84 -ltcl84 -lX11
TARGET = ../freebsd
CFLAGS = -g -DSIG_T=void -DMULTICAST -I. -DERROR_TEST
-CC = gcc
+CC ?= gcc
CC_SWITCHES = ${CFLAGS}
ROBJS = protocol.o utils.o
diff --git a/net/imm/files/patch-src-tkAppInit.c b/net/imm/files/patch-src-tkAppInit.c
new file mode 100644
index 000000000000..8dacd5fa95aa
--- /dev/null
+++ b/net/imm/files/patch-src-tkAppInit.c
@@ -0,0 +1,12 @@
+--- src/tkAppInit.c.orig Thu Mar 15 10:00:05 2007
++++ src/tkAppInit.c Thu Mar 15 10:00:12 2007
+@@ -97,9 +97,6 @@
+ * Sun shared libraries to be used for Tcl.
+ */
+
+-extern int matherr();
+-void GetDspStatus();
+-int *tclDummyMathPtr = (int *) matherr;
+
+ /***************************************************************************/
+ /* fork and initiate server process */