aboutsummaryrefslogtreecommitdiff
path: root/x11-toolkits/libzvt
diff options
context:
space:
mode:
authorMaxim Sobolev <sobomax@FreeBSD.org>2002-04-26 13:52:08 +0000
committerMaxim Sobolev <sobomax@FreeBSD.org>2002-04-26 13:52:08 +0000
commit0d8426c41799f84e46b7bd4d0768b9bc8956b7ee (patch)
tree5dd3cdd3956bb4039f586ecd8aee98a5a2761152 /x11-toolkits/libzvt
parentc5922361d4536b175f5902d7210f9a704d6a9e0f (diff)
downloadports-0d8426c41799f84e46b7bd4d0768b9bc8956b7ee.tar.gz
ports-0d8426c41799f84e46b7bd4d0768b9bc8956b7ee.zip
Notes
Diffstat (limited to 'x11-toolkits/libzvt')
-rw-r--r--x11-toolkits/libzvt/Makefile11
-rw-r--r--x11-toolkits/libzvt/distinfo2
-rw-r--r--x11-toolkits/libzvt/files/patch-configure13
-rw-r--r--x11-toolkits/libzvt/files/patch-ltmain.sh45
4 files changed, 21 insertions, 50 deletions
diff --git a/x11-toolkits/libzvt/Makefile b/x11-toolkits/libzvt/Makefile
index af6a110f5cd5..1f6a0c23807b 100644
--- a/x11-toolkits/libzvt/Makefile
+++ b/x11-toolkits/libzvt/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= libzvt
-PORTVERSION= 1.113.0
+PORTVERSION= 1.114.0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta3
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta4
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -22,7 +22,9 @@ USE_X_PREFIX= yes
USE_GMAKE= yes
USE_BISON= yes
INSTALLS_SHLIB= yes
-GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
+CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome2 \
+ --datadir=${PREFIX}/share/gnome2
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
@@ -31,7 +33,8 @@ pre-patch:
@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
- 's|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g'
+ 's|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g ; \
+ s|\$\(datadir\)/gnome/|\$\(datadir\)/|g'
@find ${WRKSRC} -name "*.[ch]" | xargs ${PERL} -pi -e \
's|malloc\.h|stdlib.h|g'
diff --git a/x11-toolkits/libzvt/distinfo b/x11-toolkits/libzvt/distinfo
index ce94fc3a777a..132b236fcc0d 100644
--- a/x11-toolkits/libzvt/distinfo
+++ b/x11-toolkits/libzvt/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libzvt-1.113.0.tar.bz2) = da4ad73ac6153b845d33fc04fd5fb85a
+MD5 (gnome2/libzvt-1.114.0.tar.bz2) = 647713b39bd642434262ac80a8340ef1
diff --git a/x11-toolkits/libzvt/files/patch-configure b/x11-toolkits/libzvt/files/patch-configure
new file mode 100644
index 000000000000..e2e4f4b47992
--- /dev/null
+++ b/x11-toolkits/libzvt/files/patch-configure
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- configure 2002/04/26 13:00:17 1.1
++++ configure 2002/04/26 13:01:55
+@@ -6884,6 +6884,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/x11-toolkits/libzvt/files/patch-ltmain.sh b/x11-toolkits/libzvt/files/patch-ltmain.sh
deleted file mode 100644
index 91713d2306f8..000000000000
--- a/x11-toolkits/libzvt/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"