diff options
author | Tijl Coosemans <tijl@FreeBSD.org> | 2014-10-05 21:03:22 +0000 |
---|---|---|
committer | Tijl Coosemans <tijl@FreeBSD.org> | 2014-10-05 21:03:22 +0000 |
commit | c340e84ccf950fc8b3e646ac2be798900eb38f10 (patch) | |
tree | 37a3827e75b01a58c41b738c563cc920a2180906 /devel/libole2 | |
parent | 1dcbd4a4fcbbf1f62c84c14f56a4ddfabc27f193 (diff) |
Notes
Diffstat (limited to 'devel/libole2')
-rw-r--r-- | devel/libole2/Makefile | 5 | ||||
-rw-r--r-- | devel/libole2/files/patch-libole2Conf.sh.in | 16 | ||||
-rw-r--r-- | devel/libole2/files/patch-ltmain.sh | 28 |
3 files changed, 3 insertions, 46 deletions
diff --git a/devel/libole2/Makefile b/devel/libole2/Makefile index 91f1c755c39a..7cf4d6d4b4a3 100644 --- a/devel/libole2/Makefile +++ b/devel/libole2/Makefile @@ -3,16 +3,17 @@ PORTNAME= libole2 PORTVERSION= 0.2.4 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel gnome MASTER_SITES= GNOME MAINTAINER= gnome@FreeBSD.org COMMENT= Support library for OLE functions (MS-Excel) for gnumeric +GNU_CONFIGURE= yes +INSTALL_TARGET= install-strip USES= gmake libtool USE_GNOME= glib12 -GNU_CONFIGURE= yes USE_LDCONFIG= yes .include <bsd.port.mk> diff --git a/devel/libole2/files/patch-libole2Conf.sh.in b/devel/libole2/files/patch-libole2Conf.sh.in deleted file mode 100644 index 16ac3e08f4cd..000000000000 --- a/devel/libole2/files/patch-libole2Conf.sh.in +++ /dev/null @@ -1,16 +0,0 @@ ---- libole2Conf.sh.in.orig Fri Jun 23 08:11:07 2000 -+++ libole2Conf.sh.in Fri Jun 23 12:23:06 2000 -@@ -2,11 +2,11 @@ - exec_prefix=@exec_prefix@ - - if test "@includedir@" != /usr/include ; then -- LIBOLE2_INCLUDEDIR="`glib-config --cflags` -I@includedir@" -+ LIBOLE2_INCLUDEDIR="`@GLIB_CONFIG@ --cflags` -I@includedir@" - else - LIBOLE2_INCLUDEDIR="" - fi - LIBOLE2_LIBDIR="-L@libdir@" --LIBOLE2_LIBS="-lgnomeole2 `glib-config --libs` @LIBS@" -+LIBOLE2_LIBS="-lgnomeole2 `@GLIB_CONFIG@ --libs` @LIBS@" - MODULE_VERSION="libole2-@VERSION@" - diff --git a/devel/libole2/files/patch-ltmain.sh b/devel/libole2/files/patch-ltmain.sh deleted file mode 100644 index 98cb05e4ddb3..000000000000 --- a/devel/libole2/files/patch-ltmain.sh +++ /dev/null @@ -1,28 +0,0 @@ - -$FreeBSD$ - ---- ltmain.sh 2001/08/27 09:51:26 1.1 -+++ ltmain.sh 2001/08/27 09:51:42 -@@ -2408,6 +2408,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 -@@ -4175,10 +4178,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" |