diff options
| -rw-r--r-- | accessibility/atk/Makefile | 2 | ||||
| -rw-r--r-- | accessibility/atk/files/patch-configure | 13 | ||||
| -rw-r--r-- | accessibility/atk/files/patch-ltmain.sh | 45 | ||||
| -rw-r--r-- | devel/atk/Makefile | 2 | ||||
| -rw-r--r-- | devel/atk/files/patch-configure | 13 | ||||
| -rw-r--r-- | devel/atk/files/patch-ltmain.sh | 45 |
6 files changed, 28 insertions, 92 deletions
diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile index 8a25f41af8b6..4150e8ac59cd 100644 --- a/accessibility/atk/Makefile +++ b/accessibility/atk/Makefile @@ -23,7 +23,7 @@ LIB_DEPENDS= glib-2.0.0:${PORTSDIR}/devel/glib20 USE_BZIP2= yes INSTALLS_SHLIB= yes -GNU_CONFIGURE= yes +USE_LIBTOOL= yes CONFIGURE_ARGS= --enable-static CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/accessibility/atk/files/patch-configure b/accessibility/atk/files/patch-configure new file mode 100644 index 000000000000..13ee380f4f66 --- /dev/null +++ b/accessibility/atk/files/patch-configure @@ -0,0 +1,13 @@ + +$FreeBSD$ + +--- configure 2002/04/26 06:33:48 1.1 ++++ configure 2002/04/26 06:33:59 +@@ -6885,6 +6885,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/accessibility/atk/files/patch-ltmain.sh b/accessibility/atk/files/patch-ltmain.sh deleted file mode 100644 index 91713d2306f8..000000000000 --- a/accessibility/atk/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/devel/atk/Makefile b/devel/atk/Makefile index 8a25f41af8b6..4150e8ac59cd 100644 --- a/devel/atk/Makefile +++ b/devel/atk/Makefile @@ -23,7 +23,7 @@ LIB_DEPENDS= glib-2.0.0:${PORTSDIR}/devel/glib20 USE_BZIP2= yes INSTALLS_SHLIB= yes -GNU_CONFIGURE= yes +USE_LIBTOOL= yes CONFIGURE_ARGS= --enable-static CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/devel/atk/files/patch-configure b/devel/atk/files/patch-configure new file mode 100644 index 000000000000..13ee380f4f66 --- /dev/null +++ b/devel/atk/files/patch-configure @@ -0,0 +1,13 @@ + +$FreeBSD$ + +--- configure 2002/04/26 06:33:48 1.1 ++++ configure 2002/04/26 06:33:59 +@@ -6885,6 +6885,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/devel/atk/files/patch-ltmain.sh b/devel/atk/files/patch-ltmain.sh deleted file mode 100644 index 91713d2306f8..000000000000 --- a/devel/atk/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" |