aboutsummaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorMaxim Sobolev <sobomax@FreeBSD.org>2002-04-26 09:38:05 +0000
committerMaxim Sobolev <sobomax@FreeBSD.org>2002-04-26 09:38:05 +0000
commit03043505eac4ed10e9e1e68c707a9c8376653b6c (patch)
treea077dac550edfdb8f9695ac85ceb79097be91d20 /graphics
parentbd808774965399f585fa20d4cd72c250b1f85b1b (diff)
downloadports-03043505eac4ed10e9e1e68c707a9c8376653b6c.tar.gz
ports-03043505eac4ed10e9e1e68c707a9c8376653b6c.zip
Notes
Diffstat (limited to 'graphics')
-rw-r--r--graphics/libart_lgpl/Makefile2
-rw-r--r--graphics/libart_lgpl/files/patch-configure13
-rw-r--r--graphics/libart_lgpl/files/patch-ltmain.sh45
-rw-r--r--graphics/libart_lgpl2/Makefile2
-rw-r--r--graphics/libart_lgpl2/files/patch-configure13
-rw-r--r--graphics/libart_lgpl2/files/patch-ltmain.sh45
6 files changed, 28 insertions, 92 deletions
diff --git a/graphics/libart_lgpl/Makefile b/graphics/libart_lgpl/Makefile
index b770f7b11738..16acc3b5bbef 100644
--- a/graphics/libart_lgpl/Makefile
+++ b/graphics/libart_lgpl/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
USE_BZIP2= yes
INSTALLS_SHLIB= yes
-GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
pre-patch:
diff --git a/graphics/libart_lgpl/files/patch-configure b/graphics/libart_lgpl/files/patch-configure
new file mode 100644
index 000000000000..35f3fa0bf356
--- /dev/null
+++ b/graphics/libart_lgpl/files/patch-configure
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- configure 2002/04/26 09:33:12 1.1
++++ configure 2002/04/26 09:33:33
+@@ -6330,6 +6330,7 @@
+
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/graphics/libart_lgpl/files/patch-ltmain.sh b/graphics/libart_lgpl/files/patch-ltmain.sh
deleted file mode 100644
index 91713d2306f8..000000000000
--- a/graphics/libart_lgpl/files/patch-ltmain.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh.orig Wed Jan 23 11:38:40 2002
-+++ ltmain.sh Sun Feb 3 01:44:17 2002
-@@ -1037,8 +1037,16 @@
- continue
- ;;
-
-+ -pthread)
-+ compile_command="$compile_command -pthread"
-+ finalize_command="$finalize_command -pthread"
-+ compiler_flags="$compiler_flags -pthread"
-+ continue
-+ ;;
-+
- -module)
- module=yes
-+ build_old_libs=no
- continue
- ;;
-
-@@ -2412,6 +2420,9 @@
- *-*-netbsd*)
- # Don't link with libc until the a.out ld.so is fixed.
- ;;
-+ *-*-freebsd*)
-+ # FreeBSD doesn't need this...
-+ ;;
- *)
- # Add libc to deplibs on all other systems if necessary.
- if test "$build_libtool_need_lc" = "yes"; then
-@@ -4179,10 +4190,12 @@
- fi
-
- # Install the pseudo-library for information purposes.
-+ if /usr/bin/false; then
- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- instname="$dir/$name"i
- $show "$install_prog $instname $destdir/$name"
- $run eval "$install_prog $instname $destdir/$name" || exit $?
-+ fi
-
- # Maybe install the static library, too.
- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/graphics/libart_lgpl2/Makefile b/graphics/libart_lgpl2/Makefile
index b770f7b11738..16acc3b5bbef 100644
--- a/graphics/libart_lgpl2/Makefile
+++ b/graphics/libart_lgpl2/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
USE_BZIP2= yes
INSTALLS_SHLIB= yes
-GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
pre-patch:
diff --git a/graphics/libart_lgpl2/files/patch-configure b/graphics/libart_lgpl2/files/patch-configure
new file mode 100644
index 000000000000..35f3fa0bf356
--- /dev/null
+++ b/graphics/libart_lgpl2/files/patch-configure
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- configure 2002/04/26 09:33:12 1.1
++++ configure 2002/04/26 09:33:33
+@@ -6330,6 +6330,7 @@
+
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/graphics/libart_lgpl2/files/patch-ltmain.sh b/graphics/libart_lgpl2/files/patch-ltmain.sh
deleted file mode 100644
index 91713d2306f8..000000000000
--- a/graphics/libart_lgpl2/files/patch-ltmain.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh.orig Wed Jan 23 11:38:40 2002
-+++ ltmain.sh Sun Feb 3 01:44:17 2002
-@@ -1037,8 +1037,16 @@
- continue
- ;;
-
-+ -pthread)
-+ compile_command="$compile_command -pthread"
-+ finalize_command="$finalize_command -pthread"
-+ compiler_flags="$compiler_flags -pthread"
-+ continue
-+ ;;
-+
- -module)
- module=yes
-+ build_old_libs=no
- continue
- ;;
-
-@@ -2412,6 +2420,9 @@
- *-*-netbsd*)
- # Don't link with libc until the a.out ld.so is fixed.
- ;;
-+ *-*-freebsd*)
-+ # FreeBSD doesn't need this...
-+ ;;
- *)
- # Add libc to deplibs on all other systems if necessary.
- if test "$build_libtool_need_lc" = "yes"; then
-@@ -4179,10 +4190,12 @@
- fi
-
- # Install the pseudo-library for information purposes.
-+ if /usr/bin/false; then
- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- instname="$dir/$name"i
- $show "$install_prog $instname $destdir/$name"
- $run eval "$install_prog $instname $destdir/$name" || exit $?
-+ fi
-
- # Maybe install the static library, too.
- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"