pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mbone/vic Modular Xorg support. Never use static linka...
details: https://anonhg.NetBSD.org/pkgsrc/rev/53c6302ae1eb
branches: trunk
changeset: 523770:53c6302ae1eb
user: joerg <joerg%pkgsrc.org@localhost>
date: Sat Jan 13 11:27:02 2007 +0000
description:
Modular Xorg support. Never use static linkage on some platforms by
default.
diffstat:
mbone/vic/Makefile | 7 ++++++-
mbone/vic/distinfo | 6 +++---
mbone/vic/patches/patch-ag | 17 +++++++++++++----
mbone/vic/patches/patch-ay | 46 ++++++++++++++++++++++++++++++++--------------
4 files changed, 54 insertions(+), 22 deletions(-)
diffs (205 lines):
diff -r 65df469a2681 -r 53c6302ae1eb mbone/vic/Makefile
--- a/mbone/vic/Makefile Sat Jan 13 11:02:12 2007 +0000
+++ b/mbone/vic/Makefile Sat Jan 13 11:27:02 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2006/05/13 13:18:20 joerg Exp $
+# $NetBSD: Makefile,v 1.36 2007/01/13 11:27:02 joerg Exp $
DISTNAME= vicsrc-2.8
PKGNAME= ${DISTNAME:S/src//}
@@ -25,5 +25,10 @@
CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl}
CONFIGURE_ARGS+= --with-tk=${BUILDLINK_PREFIX.tk}
+BUILDLINK_DEPMETHOD.libXt?= build
+
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
.include "../../x11/tk83/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 65df469a2681 -r 53c6302ae1eb mbone/vic/distinfo
--- a/mbone/vic/distinfo Sat Jan 13 11:02:12 2007 +0000
+++ b/mbone/vic/distinfo Sat Jan 13 11:27:02 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2006/02/27 15:49:56 joerg Exp $
+$NetBSD: distinfo,v 1.10 2007/01/13 11:27:02 joerg Exp $
SHA1 (vicsrc-2.8.tar.gz) = ec58bf10aed99301f1e0e0828d0f2f32acdafe1d
RMD160 (vicsrc-2.8.tar.gz) = 1c102bfb4effd54bb3ac90e8d86213c392f3e10f
@@ -12,7 +12,7 @@
SHA1 (patch-ad) = 4604ae7077aee9e3165532a9a7947ed1875ae810
SHA1 (patch-ae) = 05b45b8ac88a0c86d39b53cc1f2c4499411745da
SHA1 (patch-af) = 4a82bb5322d16c8269923cd65c0e776a2570de90
-SHA1 (patch-ag) = d3458b0a01cea09b55795574c54cd8b6007e75a6
+SHA1 (patch-ag) = 75fdeba7082c220cd105250f72e7899047c0d28a
SHA1 (patch-ah) = b5ed0c03955ee1f60c18ea71a142a365947a4962
SHA1 (patch-ai) = 2d651ec7bb05115ae655239716bde8856bab7ff2
SHA1 (patch-aj) = 148d183345c159e4f02a0ea10648406eb733545a
@@ -30,4 +30,4 @@
SHA1 (patch-av) = 8811a912a1f166a5576ce0efdb1284941b62fa16
SHA1 (patch-aw) = 735e7cda5f1cabe312decdcf992258ac8a895f63
SHA1 (patch-ax) = 9f7ab611dc426a4f317b46803dbca218be903b10
-SHA1 (patch-ay) = 5c6fe3e6cdbf0544ae1f92cc1f351a0655707af7
+SHA1 (patch-ay) = 78cbf2e981efa40a21bcd9295670cae98bfe3ea3
diff -r 65df469a2681 -r 53c6302ae1eb mbone/vic/patches/patch-ag
--- a/mbone/vic/patches/patch-ag Sat Jan 13 11:02:12 2007 +0000
+++ b/mbone/vic/patches/patch-ag Sat Jan 13 11:27:02 2007 +0000
@@ -1,8 +1,17 @@
-$NetBSD: patch-ag,v 1.3 2000/02/05 02:50:52 wiz Exp $
+$NetBSD: patch-ag,v 1.4 2007/01/13 11:27:03 joerg Exp $
---- ./configure.in.orig Fri Jun 21 08:36:47 1996
-+++ ./configure.in Wed Feb 2 13:38:58 2000
-@@ -226,7 +226,12 @@
+--- configure.in.orig 1996-06-21 06:36:47.000000000 +0000
++++ configure.in
+@@ -10,7 +10,7 @@ V_SHM="-DUSE_SHM"
+ builtin(include, configure.in.head)
+
+ #XXX
+-V_STATIC="-static"
++V_STATIC=""
+
+ AC_ARG_WITH(aix-shm, --with-aix-shm=path specify a pathname for the AIX shm X extension library file, lib=$withval, lib="")
+ if test "$lib" != "" ; then
+@@ -226,7 +226,12 @@ sparc-sun-sunos*)
;;
*-*-netbsd*)
V_TARCMD="tar -h -c -f"
diff -r 65df469a2681 -r 53c6302ae1eb mbone/vic/patches/patch-ay
--- a/mbone/vic/patches/patch-ay Sat Jan 13 11:02:12 2007 +0000
+++ b/mbone/vic/patches/patch-ay Sat Jan 13 11:27:02 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ay,v 1.1 2002/10/02 22:53:09 wiz Exp $
+$NetBSD: patch-ay,v 1.2 2007/01/13 11:27:03 joerg Exp $
---- configure.orig Mon Jun 24 02:59:45 1996
+--- configure.orig 1996-06-24 00:59:45.000000000 +0000
+++ configure
-@@ -1468,6 +1664,8 @@ else
+@@ -1468,6 +1468,8 @@ else
d=""
fi
@@ -11,7 +11,7 @@
if test "$d" != "" ; then
if test ! -d $d ; then
echo "'$d' is not a directory"
-@@ -1478,8 +1676,8 @@ if test "$d" != "" ; then
+@@ -1478,8 +1480,8 @@ if test "$d" != "" ; then
echo "can't find tcl.h in $d/include"
exit 1
fi
@@ -22,7 +22,7 @@
$d/lib/libtcl.so \
$d/lib/libtcl.a"
V_LIB_TCL=FAIL
-@@ -1493,7 +1691,7 @@ if test "$d" != "" ; then
+@@ -1493,7 +1495,7 @@ if test "$d" != "" ; then
echo "can't find libtcl.a in $d/lib"
exit 1
fi
@@ -31,7 +31,7 @@
$d/lib/tcl"
V_LIBRARY_TCL=FAIL
for dir in $places; do
-@@ -1513,23 +1711,26 @@ else
+@@ -1513,23 +1515,26 @@ else
#include <tcl.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
@@ -63,7 +63,7 @@
$x_includes/tk \
$x_includes \
/usr/local/include \
-@@ -1546,81 +1747,43 @@ rm -f conftest*
+@@ -1546,81 +1551,43 @@ rm -f conftest*
exit 1
fi
fi
@@ -178,7 +178,7 @@
/usr/local/lib/tcl \
/usr/lib/tcl \
/usr/lib/tk/tcl \
-@@ -1651,6 +1814,8 @@ else
+@@ -1651,6 +1618,8 @@ else
d=""
fi
@@ -187,7 +187,7 @@
if test "$d" != "" ; then
if test ! -d $d ; then
echo "'$d' is not a directory"
-@@ -1661,8 +1826,8 @@ if test "$d" != "" ; then
+@@ -1661,8 +1630,8 @@ if test "$d" != "" ; then
echo "can't find tk.h in $d/include"
exit 1
fi
@@ -198,7 +198,7 @@
$d/lib/libtk.so \
$d/lib/libtk.a"
V_LIB_TK=FAIL
-@@ -1676,7 +1841,7 @@ if test "$d" != "" ; then
+@@ -1676,7 +1645,7 @@ if test "$d" != "" ; then
echo "can't find libtk.a in $d/lib"
exit 1
fi
@@ -207,7 +207,7 @@
$d/lib/tk"
V_LIBRARY_TK=FAIL
for dir in $places; do
-@@ -1696,13 +1861,15 @@ else
+@@ -1696,13 +1665,15 @@ else
#include <tk.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
@@ -225,7 +225,7 @@
rm -rf conftest*
V_INCLUDE_TK=FAIL
fi
-@@ -1712,15 +1879,16 @@ rm -f conftest*
+@@ -1712,15 +1683,16 @@ rm -f conftest*
V_INCLUDE_TK=""
places="\
$prefix/include \
@@ -245,7 +245,7 @@
"
for dir in $places; do
if test -r $dir/tk.h ; then
-@@ -1733,82 +1901,47 @@ rm -f conftest*
+@@ -1733,82 +1705,47 @@ rm -f conftest*
exit 1
fi
fi
@@ -365,7 +365,16 @@
/usr/local/lib/tk \
/usr/lib/tk \
/usr/lib/tk/tk \
-@@ -2072,7 +2205,12 @@ sparc-sun-sunos*)
+@@ -1842,7 +1779,7 @@ fi
+
+
+ #XXX
+-V_STATIC="-static"
++V_STATIC=""
+
+ # Check whether --with-aix-shm or --without-aix-shm was given.
+ if test "${with_aix_shm+set}" = set; then
+@@ -2072,7 +2009,12 @@ sparc-sun-sunos*)
;;
*-*-netbsd*)
V_TARCMD="tar -h -c -f"
@@ -379,3 +388,12 @@
;;
*-*-hpux*)
V_CCOPT="-O"
+@@ -2347,6 +2289,8 @@ for ac_option
+ do
+ case "\$ac_option" in
+ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++ : Avoid regenerating within pkgsrc
++ exit 0
+ echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
+ exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
+ -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
Home |
Main Index |
Thread Index |
Old Index