diff options
author | Tijl Coosemans <tijl@FreeBSD.org> | 2014-09-02 15:05:37 +0000 |
---|---|---|
committer | Tijl Coosemans <tijl@FreeBSD.org> | 2014-09-02 15:05:37 +0000 |
commit | 5237786108256144699bbd76ec40d28d8a9979d0 (patch) | |
tree | 2c63a050ec8d0daca5830705537e05214fc46b08 | |
parent | 6595501b3cd948c77da90ff9fcbc141be520c80e (diff) |
- Add USES=libtool and bump dependent ports
- Add USES=iconv to fix build on FreeBSD 10
Notes
Notes:
svn path=/head/; revision=367025
-rw-r--r-- | textproc/gmetadom/Makefile | 12 | ||||
-rw-r--r-- | textproc/gmetadom/files/patch-ltmain.sh | 15 | ||||
-rw-r--r-- | textproc/gmetadom/pkg-plist | 3 | ||||
-rw-r--r-- | x11-toolkits/gtkmathview/Makefile | 2 |
4 files changed, 10 insertions, 22 deletions
diff --git a/textproc/gmetadom/Makefile b/textproc/gmetadom/Makefile index c40cfca8727b..253cc2c45b24 100644 --- a/textproc/gmetadom/Makefile +++ b/textproc/gmetadom/Makefile @@ -3,7 +3,7 @@ PORTNAME= gmetadom PORTVERSION= 0.2.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc MASTER_SITES= SF @@ -12,12 +12,12 @@ COMMENT= Collection of DOM Implementations LIB_DEPENDS= libgdome.so:${PORTSDIR}/textproc/gdome2 -USES= pathfix pkgconfig gmake +USES= gmake iconv libtool pathfix pkgconfig USE_GNOME= glib20 libxml2 +USE_LDCONFIG= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -USE_LDCONFIG= yes +LIBS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= OCAML OPTIONS_SUB= yes @@ -29,6 +29,8 @@ OCAML_BUILD_DEPENDS= ocamlfind:${PORTSDIR}/devel/ocaml-findlib \ OCAML_CONFIGURE_OFF= HAVE_OCAMLDEP=no HAVE_OCAMLFIND=no HAVE_OCAMLOPT=no post-patch: - @${REINPLACE_CMD} -e 's/-lstdc++//g' ${WRKSRC}/src/gdome_cpp_smart/Makefile.in + @${REINPLACE_CMD} -e 's/-lstdc++//g' \ + ${WRKSRC}/src/gdome_cpp_smart/Makefile.in \ + ${WRKSRC}/src/gdome_cpp_smart/test/Makefile.in .include <bsd.port.mk> diff --git a/textproc/gmetadom/files/patch-ltmain.sh b/textproc/gmetadom/files/patch-ltmain.sh deleted file mode 100644 index e638fd52020d..000000000000 --- a/textproc/gmetadom/files/patch-ltmain.sh +++ /dev/null @@ -1,15 +0,0 @@ ---- ltmain.sh.orig Sun May 11 23:50:20 2003 -+++ ltmain.sh Sun May 11 23:50:40 2003 -@@ -4247,10 +4247,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/textproc/gmetadom/pkg-plist b/textproc/gmetadom/pkg-plist index 768e2032ea83..2a4afaeb5212 100644 --- a/textproc/gmetadom/pkg-plist +++ b/textproc/gmetadom/pkg-plist @@ -35,7 +35,8 @@ include/gmetadom/gdome_cpp_smart/GdomeSmartDOMUTF16String.hh include/gmetadom/gdome_cpp_smart/GdomeSmartDOMUTF8String.hh lib/libgmetadom_gdome_cpp_smart.a lib/libgmetadom_gdome_cpp_smart.so -lib/libgmetadom_gdome_cpp_smart.so.2 +lib/libgmetadom_gdome_cpp_smart.so.0 +lib/libgmetadom_gdome_cpp_smart.so.0.2.6 %%OCAML%%lib/ocaml/gdome2/META %%OCAML%%lib/ocaml/gdome2/gdome.cmi %%OCAML%%lib/ocaml/gdome2/gdome.mli diff --git a/x11-toolkits/gtkmathview/Makefile b/x11-toolkits/gtkmathview/Makefile index 416e335ea139..f1e5e1a72b74 100644 --- a/x11-toolkits/gtkmathview/Makefile +++ b/x11-toolkits/gtkmathview/Makefile @@ -3,7 +3,7 @@ PORTNAME= gtkmathview PORTVERSION= 0.8.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= x11-toolkits MASTER_SITES= http://helm.cs.unibo.it/mml-widget/sources/ |