diff options
| author | fenner <fenner@FreeBSD.org> | 2004-02-02 09:24:52 +0800 |
|---|---|---|
| committer | fenner <fenner@FreeBSD.org> | 2004-02-02 09:24:52 +0800 |
| commit | 4a78e36f7f4c5fbb6f83bdf15a88fd3bd2c146c8 (patch) | |
| tree | 8c8b04c23e63711b00a2808adf342071de6beae0 | |
| parent | db5a2fdf631d3ee87361a26a4b91a1ae6b891b0a (diff) | |
| download | freebsd-ports-gnome-4a78e36f7f4c5fbb6f83bdf15a88fd3bd2c146c8.tar.gz freebsd-ports-gnome-4a78e36f7f4c5fbb6f83bdf15a88fd3bd2c146c8.tar.zst freebsd-ports-gnome-4a78e36f7f4c5fbb6f83bdf15a88fd3bd2c146c8.zip | |
Update tcl/tk dependency to 8.4.
Remove incorrect library dependency in port's Makefile.
| -rw-r--r-- | mbone/rqm/Makefile | 2 | ||||
| -rw-r--r-- | mbone/rqm/files/patch-aa | 4 | ||||
| -rw-r--r-- | mbone/rqm/files/patch-ac | 11 | ||||
| -rw-r--r-- | net/rqm/Makefile | 2 | ||||
| -rw-r--r-- | net/rqm/files/patch-aa | 4 | ||||
| -rw-r--r-- | net/rqm/files/patch-ac | 11 |
6 files changed, 28 insertions, 6 deletions
diff --git a/mbone/rqm/Makefile b/mbone/rqm/Makefile index 9e345c81bbb4..230d6a3c4e0c 100644 --- a/mbone/rqm/Makefile +++ b/mbone/rqm/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/rqm/1.0.0/ MAINTAINER= fenner@FreeBSD.org COMMENT= A graphical RTP quality monitor -LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82 +LIB_DEPENDS= tk84.1:${PORTSDIR}/x11-toolkits/tk84 BUILD_DEPENDS= ${LOCALBASE}/lib/libuclmmbase.a:${PORTSDIR}/devel/uclmmbase WRKSRC= ${WRKDIR}/rqm/ diff --git a/mbone/rqm/files/patch-aa b/mbone/rqm/files/patch-aa index a12327db8444..ba0b3c041db2 100644 --- a/mbone/rqm/files/patch-aa +++ b/mbone/rqm/files/patch-aa @@ -8,8 +8,8 @@ -TCL_LIBS="../tk-8.0/unix/libtk8.0.a ../tcl-8.0/unix/libtcl8.0.a" -TCL_INCL="-I../tk-8.0/generic -I../tcl-8.0/generic" +GCCWFLAGS="-W -Wall -Wbad-function-cast -Wmissing-prototypes -Wno-implicit-int" -+TCL_LIBS="-L${PREFIX}/lib -ltk82 -ltcl82" -+TCL_INCL="-I${PREFIX}/include/tk8.2/generic -I${PREFIX}/include/tcl8.2/generic" ++TCL_LIBS="-L${PREFIX}/lib -ltk84 -ltcl84" ++TCL_INCL="-I${PREFIX}/include/tk8.4/generic -I${PREFIX}/include/tcl8.4/generic" DEFS="" AR="ar" diff --git a/mbone/rqm/files/patch-ac b/mbone/rqm/files/patch-ac new file mode 100644 index 000000000000..00ed9055e3ea --- /dev/null +++ b/mbone/rqm/files/patch-ac @@ -0,0 +1,11 @@ +--- Makefile.in.orig Sun Feb 1 17:22:05 2004 ++++ Makefile.in Sun Feb 1 17:22:12 2004 +@@ -6,7 +6,7 @@ + OBJS = main.o ui.o + BIN = rqm + +-$(BIN): $(OBJS) ../common/libcommon.a ++$(BIN): $(OBJS) + $(CC) $(CFLAGS) $(OBJS) __LDLIBS__ __PROFILE__ __OPTIMIZE__ __CHECK_LIB__ -o $(BIN) + + .c.o: diff --git a/net/rqm/Makefile b/net/rqm/Makefile index 9e345c81bbb4..230d6a3c4e0c 100644 --- a/net/rqm/Makefile +++ b/net/rqm/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/rqm/1.0.0/ MAINTAINER= fenner@FreeBSD.org COMMENT= A graphical RTP quality monitor -LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82 +LIB_DEPENDS= tk84.1:${PORTSDIR}/x11-toolkits/tk84 BUILD_DEPENDS= ${LOCALBASE}/lib/libuclmmbase.a:${PORTSDIR}/devel/uclmmbase WRKSRC= ${WRKDIR}/rqm/ diff --git a/net/rqm/files/patch-aa b/net/rqm/files/patch-aa index a12327db8444..ba0b3c041db2 100644 --- a/net/rqm/files/patch-aa +++ b/net/rqm/files/patch-aa @@ -8,8 +8,8 @@ -TCL_LIBS="../tk-8.0/unix/libtk8.0.a ../tcl-8.0/unix/libtcl8.0.a" -TCL_INCL="-I../tk-8.0/generic -I../tcl-8.0/generic" +GCCWFLAGS="-W -Wall -Wbad-function-cast -Wmissing-prototypes -Wno-implicit-int" -+TCL_LIBS="-L${PREFIX}/lib -ltk82 -ltcl82" -+TCL_INCL="-I${PREFIX}/include/tk8.2/generic -I${PREFIX}/include/tcl8.2/generic" ++TCL_LIBS="-L${PREFIX}/lib -ltk84 -ltcl84" ++TCL_INCL="-I${PREFIX}/include/tk8.4/generic -I${PREFIX}/include/tcl8.4/generic" DEFS="" AR="ar" diff --git a/net/rqm/files/patch-ac b/net/rqm/files/patch-ac new file mode 100644 index 000000000000..00ed9055e3ea --- /dev/null +++ b/net/rqm/files/patch-ac @@ -0,0 +1,11 @@ +--- Makefile.in.orig Sun Feb 1 17:22:05 2004 ++++ Makefile.in Sun Feb 1 17:22:12 2004 +@@ -6,7 +6,7 @@ + OBJS = main.o ui.o + BIN = rqm + +-$(BIN): $(OBJS) ../common/libcommon.a ++$(BIN): $(OBJS) + $(CC) $(CFLAGS) $(OBJS) __LDLIBS__ __PROFILE__ __OPTIMIZE__ __CHECK_LIB__ -o $(BIN) + + .c.o: |