summaryrefslogtreecommitdiff
path: root/mbone
diff options
context:
space:
mode:
authorMartin Wilke <miwi@FreeBSD.org>2008-04-19 17:56:05 +0000
committerMartin Wilke <miwi@FreeBSD.org>2008-04-19 17:56:05 +0000
commit3e4ed01146cfe2bdca465bd0e4d199341f62a0b6 (patch)
treed573ea09b2bf6be67cb497df199932da9e2707c4 /mbone
parentUpdate to version 2.2.6 (diff)
- Remove unneeded dependency from gtk12/gtk20 [1]
- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG - Remove X11BASE support in favor of LOCALBASE or PREFIX - Use USE_LDCONFIG instead of INSTALLS_SHLIB - Remove unneeded USE_GCC 3.4+ Thanks to all Helpers: Dmitry Marakasov, Chess Griffin, beech@, dinoex, rafan, gahr, ehaupt, nox, itetcu, flz, pav PR: 116263 Tested on: pointyhat Approved by: portmgr (pav)
Notes
Notes: svn path=/head/; revision=211584
Diffstat (limited to 'mbone')
-rw-r--r--mbone/imm/files/Makefile.freebsd4
-rw-r--r--mbone/mcl/Makefile4
-rw-r--r--mbone/nte/Makefile3
-rw-r--r--mbone/nte/files/Makefile.freebsd4
-rw-r--r--mbone/rat/Makefile3
-rw-r--r--mbone/rat30/files/patch-Makefile_FreeBSD_44
-rw-r--r--mbone/relate/files/patch-Makefile4
-rw-r--r--mbone/rqm/Makefile2
-rw-r--r--mbone/rqm/files/patch-aa2
-rw-r--r--mbone/rtpmon/Makefile3
-rw-r--r--mbone/sdr/Makefile3
-rw-r--r--mbone/sdr/files/Makefile.freebsd4
-rw-r--r--mbone/vat/Makefile4
-rw-r--r--mbone/vic/Makefile10
-rw-r--r--mbone/wbd/files/patch-aa4
-rw-r--r--mbone/xspeakfree/Makefile3
16 files changed, 28 insertions, 33 deletions
diff --git a/mbone/imm/files/Makefile.freebsd b/mbone/imm/files/Makefile.freebsd
index 948ca8f54099..379dae4d11a3 100644
--- a/mbone/imm/files/Makefile.freebsd
+++ b/mbone/imm/files/Makefile.freebsd
@@ -1,11 +1,11 @@
# 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${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4 -I${X11BASE}/include
+INCLUDE_DIR = -I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4 -I${LOCALBASE}/include
# Libraries to use when linking:
LIBS = -lm
-TKLIBS= -L${X11BASE}/lib -L$(PREFIX)/lib -L${LOCALBASE}/lib -ltk84 -ltcl84 -lX11
+TKLIBS= -L$(PREFIX)/lib -L${LOCALBASE}/lib -ltk84 -ltcl84 -lX11
TARGET = ../freebsd
diff --git a/mbone/mcl/Makefile b/mbone/mcl/Makefile
index 259be8735047..d087695902d6 100644
--- a/mbone/mcl/Makefile
+++ b/mbone/mcl/Makefile
@@ -16,11 +16,11 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
COMMENT= Implementation of the ALC and NORM Reliable Multicast Protocols
-BUILD_DEPENDS= makedepend:${X_IMAKE_PORT} \
+BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend \
gdome-config:${PORTSDIR}/textproc/gdome2 \
glib-gettextize:${PORTSDIR}/devel/glib20
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
USE_GMAKE= yes
MAN1= fcast.1 fcastn.1 mclrecv2.1 mclsend2.1
MAN2= mcl_abort.2 mcl_close.2 mcl_ctl.2 mcl_open.2 mcl_recv.2 \
diff --git a/mbone/nte/Makefile b/mbone/nte/Makefile
index 2888e9da6604..d2603395ad82 100644
--- a/mbone/nte/Makefile
+++ b/mbone/nte/Makefile
@@ -7,7 +7,7 @@
PORTNAME= nte
PORTVERSION= 1.5a29
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= mbone tk
MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/nte/1.5a29/
@@ -20,7 +20,6 @@ WRKSRC= ${WRKDIR}/nte
PLIST_FILES= bin/nte
USE_GMAKE= yes
-USE_X_PREFIX= yes
MAKE_ENV= LOCALBASE="${LOCALBASE}"
diff --git a/mbone/nte/files/Makefile.freebsd b/mbone/nte/files/Makefile.freebsd
index 1f02b96499d7..d2f6822e0b30 100644
--- a/mbone/nte/files/Makefile.freebsd
+++ b/mbone/nte/files/Makefile.freebsd
@@ -1,7 +1,7 @@
CC=cc
-INCLUDES=-I${LOCALBASE}/include/tcl8.0 -I${LOCALBASE}/include/tk8.0 -I${LOCALBASE}/include/tk8.0/generic -I${X11BASE}/include
+INCLUDES=-I${LOCALBASE}/include/tcl8.0 -I${LOCALBASE}/include/tk8.0 -I${LOCALBASE}/include/tk8.0/generic -I${LOCALBASE}/include
LIB_DIR=${LOCALBASE}/lib
-LIBS=-L${LIB_DIR} -ltk80 -ltcl80 -lm -L${X11BASE}/lib -lX11
+LIBS=-L${LIB_DIR} -ltk80 -ltcl80 -lm -L${LOCALBASE}/lib -lX11
CFLAGS+=-ggdb $(INCLUDES) -DFREEBSD -DPROTOTYPES -DHAVE_NO_VALUES_H -DHAVE_LIMITS_H -DHAVE_UNISTD_H -DMAXINT=INT_MAX -DDEFINED_ERRLIST
# for search.h
CFLAGS+=-I../src
diff --git a/mbone/rat/Makefile b/mbone/rat/Makefile
index 70db2f24e3ca..b750d989c9af 100644
--- a/mbone/rat/Makefile
+++ b/mbone/rat/Makefile
@@ -19,8 +19,7 @@ USE_TK= yes
USE_XORG= x11 xext sm ice
USE_AUTOTOOLS= autoconf:213
USE_GMAKE= yes
-CONFIGURE_ARGS= --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include \
- --enable-ipv6
+CONFIGURE_ARGS= --enable-ipv6
MAN1= rat.1
MANCOMPRESSED= no
diff --git a/mbone/rat30/files/patch-Makefile_FreeBSD_4 b/mbone/rat30/files/patch-Makefile_FreeBSD_4
index 61d20251f05d..d4a838d12316 100644
--- a/mbone/rat30/files/patch-Makefile_FreeBSD_4
+++ b/mbone/rat30/files/patch-Makefile_FreeBSD_4
@@ -3,7 +3,7 @@
@@ -0,0 +1,6 @@
+TCL_INC = ${LOCALBASE}/include/tcl8.2
+TK_INC = ${LOCALBASE}/include/tk8.2
-+INCS = -I${X11BASE}/include \
++INCS = -I${LOCALBASE}/include \
+ -I$(TCL_INC)/generic -I$(TK_INC)/generic
+LDLIBS = -L${LOCALBASE}/lib \
-+ -L${X11BASE}/lib -ltk82 -ltcl82 -lXext -lX11 -lm
++ -L${LOCALBASE}/lib -ltk82 -ltcl82 -lXext -lX11 -lm
diff --git a/mbone/relate/files/patch-Makefile b/mbone/relate/files/patch-Makefile
index fcc881cf3b6f..b82c818d102e 100644
--- a/mbone/relate/files/patch-Makefile
+++ b/mbone/relate/files/patch-Makefile
@@ -8,8 +8,8 @@
+
+# for FreeBSD
+CC = cc
-+LIBFLAGS = -L$(LIBDIR) -L$(X11BASE)/lib
-+IFLAGS = -I$(INCDIR)/tk8.2 -I$(INCDIR)/tcl8.2 -I$(X11BASE)/include
++LIBFLAGS = -L$(LIBDIR) -L$(LOCALBASE)/lib
++IFLAGS = -I$(INCDIR)/tk8.2 -I$(INCDIR)/tcl8.2 -I$(LOCALBASE)/include
+LIBS = -ltk82 -ltcl82 -lm -lX11
+
+TCL_FILES = \
diff --git a/mbone/rqm/Makefile b/mbone/rqm/Makefile
index a78d7fc6fab7..b54862fca515 100644
--- a/mbone/rqm/Makefile
+++ b/mbone/rqm/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libuclmmbase.a:${PORTSDIR}/devel/uclmmbase
WRKSRC= ${WRKDIR}/rqm/
HAS_CONFIGURE= yes
-CONFIGURE_ENV= PREFIX=${PREFIX} X11BASE=${X11BASE}
+CONFIGURE_ENV= PREFIX=${PREFIX} X11BASE=${LOCALBASE}
ALL_TARGET= rqm
diff --git a/mbone/rqm/files/patch-aa b/mbone/rqm/files/patch-aa
index ba0b3c041db2..31697563d121 100644
--- a/mbone/rqm/files/patch-aa
+++ b/mbone/rqm/files/patch-aa
@@ -18,7 +18,7 @@
FreeBSD ) CC="gcc"
WFLAGS=$GCCWFLAGS
- INCLUDE="-I/usr/local/include"
-+ INCLUDE="-I${PREFIX}/include -I${X11BASE}/include"
++ INCLUDE="-I${LOCALBASE}/include"
LDLIBS="-lm"
DEBUG="-g"
CHAR="-fsigned-char"
diff --git a/mbone/rtpmon/Makefile b/mbone/rtpmon/Makefile
index 632c47d92346..7308a60f18f8 100644
--- a/mbone/rtpmon/Makefile
+++ b/mbone/rtpmon/Makefile
@@ -7,7 +7,7 @@
PORTNAME= rtpmon
PORTVERSION= 1.0a7
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= mbone tk
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= fenner
@@ -19,7 +19,6 @@ LIB_DEPENDS= tk83.1:${PORTSDIR}/x11-toolkits/tk83
USE_AUTOTOOLS= autoconf:261:env
GNU_CONFIGURE= yes
-USE_X_PREFIX= yes
USE_GCC= 3.2
MAN1= rtpmon.1
PLIST_FILES= bin/rtpmon
diff --git a/mbone/sdr/Makefile b/mbone/sdr/Makefile
index f6bcc8ff9474..7854475d5001 100644
--- a/mbone/sdr/Makefile
+++ b/mbone/sdr/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sdr
PORTVERSION= 3.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mbone tk
MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/sdr/3.0/
@@ -21,7 +21,6 @@ PLIST_FILES= bin/sdr
WRKSRC= ${WRKDIR}/sdr/freebsd
HAS_CONFIGURE= yes
USE_GMAKE= yes
-USE_X_PREFIX= yes
post-extract:
@${CP} ${FILESDIR}/Makefile.freebsd ${WRKSRC}/Makefile.freebsd
diff --git a/mbone/sdr/files/Makefile.freebsd b/mbone/sdr/files/Makefile.freebsd
index 303950175fa9..34a7a8c8a943 100644
--- a/mbone/sdr/files/Makefile.freebsd
+++ b/mbone/sdr/files/Makefile.freebsd
@@ -1,6 +1,6 @@
CC = gcc -g -O -fwritable-strings
-INCLUDES = -I${X11BASE}/include -I${LOCALBASE}/include/tk8.4 -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/uclmmbase
-LIBS = -L${LOCALBASE}/lib -ltk84 -ltcl84 -luclmmbase -L${X11BASE}/lib -lX11 -lz -lm
+INCLUDES = -I${LOCALBASE}/include -I${LOCALBASE}/include/tk8.4 -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/uclmmbase
+LIBS = -L${LOCALBASE}/lib -ltk84 -ltcl84 -luclmmbase -lX11 -lz -lm
CFLAGS = $(INCLUDES) -DDIFF_BYTE_ORDER -DFREEBSD -DNORANDPROTO -DDEFINED_ERRLIST -Wall -DAUTH -DHAVE_ZLIB -DFreeBSD
all:: sdr
diff --git a/mbone/vat/Makefile b/mbone/vat/Makefile
index ebffe32725a2..d1026e012f98 100644
--- a/mbone/vat/Makefile
+++ b/mbone/vat/Makefile
@@ -7,7 +7,7 @@
PORTNAME= vat
PORTVERSION= 4.0b2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= mbone tk
MASTER_SITES= ftp://ftp.ee.lbl.gov/conferencing/vat/alpha-test/
DISTFILES= vatsrc-4.0b2.tar.gz
@@ -25,7 +25,7 @@ BUILD_DEPENDS= ${GSM_WORK}/lib/libgsm.a:${GSM_DIR}:build
LIB_DEPENDS= tk83.1:${PORTSDIR}/x11-toolkits/tk83 \
gsm.1:${GSM_DIR}
-USE_X_PREFIX= yes
+USE_XORG= x11
USE_AUTOTOOLS= autoconf:213
CONFIGURE_ARGS= --with-gsm=${GSM_WORK}
INSTALL_TARGET= install install-man
diff --git a/mbone/vic/Makefile b/mbone/vic/Makefile
index b9a5417971ce..358a57848668 100644
--- a/mbone/vic/Makefile
+++ b/mbone/vic/Makefile
@@ -7,7 +7,7 @@
PORTNAME= vic
PORTVERSION= 2.8.1.1.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mbone tk ipv6
MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/vic/2.8ucl1.1.6/
DISTNAME= ${PORTNAME}-2.8ucl1.1.6
@@ -16,15 +16,15 @@ MAINTAINER= mi@aldan.algebra.com
COMMENT= MBONE video tool
BUILD_DEPENDS+= v4l_compat>=1.0.20060801:${PORTSDIR}/multimedia/v4l_compat
-
LIB_DEPENDS= uclmmbase:${PORTSDIR}/devel/uclmmbase
+
USE_TK= yes
USE_TK_BUILD= yes
USE_AUTOTOOLS= autoconf:213
-USE_X_PREFIX= yes
-CONFIGURE_ARGS= -x-libraries=${X11BASE}/lib \
- -x-includes=${X11BASE}/include \
+USE_XORG= xext
+CONFIGURE_ARGS= -x-libraries=${LOCALBASE}/lib \
+ -x-includes=${LOCALBASE}/include \
-without-ucltcl \
-with-tcl=${LOCALBASE} \
-without-ucltk \
diff --git a/mbone/wbd/files/patch-aa b/mbone/wbd/files/patch-aa
index b1184775ef01..fdc3f896db8d 100644
--- a/mbone/wbd/files/patch-aa
+++ b/mbone/wbd/files/patch-aa
@@ -40,8 +40,8 @@
+# Uncomment these lines for FreeBSD
+CC ?= cc
-+LIBFLAGS = -L$(LIBDIR) -L${X11BASE}/lib
-+IFLAGS = -I$(INCDIR)/tk8.0 -I$(INCDIR)/tcl8.0 -I${X11BASE}/include
++LIBFLAGS = -L$(LIBDIR) -L${LOCALBASE}/lib
++IFLAGS = -I$(INCDIR)/tk8.0 -I$(INCDIR)/tcl8.0 -I${LOCALBASE}/include
+LIBS = -ll -ltk80 -ltcl80 -lm -lX11
+
# Tcl initialisation files to be compiled into a C string.
diff --git a/mbone/xspeakfree/Makefile b/mbone/xspeakfree/Makefile
index d52027cd4048..963575b9c534 100644
--- a/mbone/xspeakfree/Makefile
+++ b/mbone/xspeakfree/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xspeakfree
PORTVERSION= 0.8.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mbone net audio
MASTER_SITES= http://www.liquidx.org/distfiles/
@@ -18,7 +18,6 @@ RUN_DEPENDS= ${LOCALBASE}/bin/wish8.4:${PORTSDIR}/x11-toolkits/tk84 \
${LOCALBASE}/bin/sfmike:${PORTSDIR}/mbone/speak_freely \
NO_BUILD= yes
-USE_X_PREFIX= yes
PORTDOCS= BUGS HISTORY INSTALL LICENSE README TODO