From 97fcbb955811dd665ffbe3d3e97c826c9db24169 Mon Sep 17 00:00:00 2001 From: sobomax Date: Sun, 22 Apr 2007 22:49:42 +0000 Subject: Update to 0.9.2. --- textproc/wbxml2/Makefile | 34 ++++++-------- textproc/wbxml2/distinfo | 6 +-- textproc/wbxml2/files/patch-Makefile.am | 29 ++++++++++++ textproc/wbxml2/files/patch-src_Makefile.am | 25 ++++++++++ textproc/wbxml2/files/patch-tools_Makefile.am | 16 +++++++ textproc/wbxml2/pkg-descr | 3 +- textproc/wbxml2/pkg-plist | 67 +++++++-------------------- 7 files changed, 104 insertions(+), 76 deletions(-) create mode 100644 textproc/wbxml2/files/patch-Makefile.am create mode 100644 textproc/wbxml2/files/patch-src_Makefile.am create mode 100644 textproc/wbxml2/files/patch-tools_Makefile.am (limited to 'textproc/wbxml2') diff --git a/textproc/wbxml2/Makefile b/textproc/wbxml2/Makefile index 0b39c7e5337e..cab238e33a4b 100644 --- a/textproc/wbxml2/Makefile +++ b/textproc/wbxml2/Makefile @@ -6,37 +6,29 @@ # PORTNAME= wbxml2 -PORTVERSION= 0.9.0 -PORTREVISION= 2 +PORTVERSION= 0.9.2 CATEGORIES= textproc devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://czauner.onlineloop.com/pub/FreeBSD/distfiles/ MASTER_SITE_SUBDIR= wbxmllib -DISTNAME= wbxml2-0.9.0-src +DISTNAME= wbxml2-${PORTVERSION} MAINTAINER= czauner+ports@onlineloop.com COMMENT= Library & tools for converting wbxml<->xml LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USE_AUTOTOOLS= automake:19 autoconf:259 libtool:15 -AUTOMAKE_ARGS= -acf -GNU_CONFIGURE= yes -USE_LDCONFIG= yes -CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -lexpat" +USE_AUTOTOOLS= aclocal:19 autoconf:259 autoheader:259 automake:19 libtool:15 +AUTOMAKE_ARGS= -acf +INSTALLS_SHLIB= yes +USE_GNOME= pkgconfig +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" -post-patch: - ${REINPLACE_CMD} "s,^CFLAGS,AM_CFLAGS," ${WRKSRC}/src/Makefile.am \ - ${WRKSRC}/Makefile.am ${WRKSRC}/tools/Makefile.am - -pre-configure: - cd ${WRKSRC} && \ - ${LIBTOOLIZE} --force --copy && \ - ${ACLOCAL} -I ${LOCALBASE}/share/aclocal && \ - ${AUTOHEADER} && \ - ${AUTOMAKE} --add-missing && \ - ${AUTOCONF} +patch-autotools: + @${CP} ${LOCALBASE}/share/libtool/ltmain.sh ${WRKSRC}/ltmain.sh + @${CAT} ${LOCALBASE}/share/aclocal/libtool.m4 >> ${WRKSRC}/aclocal.m4 + @${TOUCH} ${WRKSRC}/config.h.in + @${REINPLACE_CMD} 's|^.*install_prog.*instname.*destdir.*$$||' ${WRKSRC}/ltmain.sh .include diff --git a/textproc/wbxml2/distinfo b/textproc/wbxml2/distinfo index f4204adf99be..c3b4891a5ef3 100644 --- a/textproc/wbxml2/distinfo +++ b/textproc/wbxml2/distinfo @@ -1,3 +1,3 @@ -MD5 (wbxml2-0.9.0-src.tar.gz) = 3f9b5bf104ec523b8eebe69f93919ded -SHA256 (wbxml2-0.9.0-src.tar.gz) = acd218148d7f92ee7bd0539d6aabd0b42cca8ae4ffe241bfa8760d30605b28c9 -SIZE (wbxml2-0.9.0-src.tar.gz) = 301756 +MD5 (wbxml2-0.9.2.tar.gz) = 67a48fd9b69db8818a4dca5375c7993a +SHA256 (wbxml2-0.9.2.tar.gz) = cb4909d8753dff7f6ac90a62a61ed1ae68e49ead2dbc60c22673c55bb0e14a36 +SIZE (wbxml2-0.9.2.tar.gz) = 304115 diff --git a/textproc/wbxml2/files/patch-Makefile.am b/textproc/wbxml2/files/patch-Makefile.am new file mode 100644 index 000000000000..6ba27f9f3dfe --- /dev/null +++ b/textproc/wbxml2/files/patch-Makefile.am @@ -0,0 +1,29 @@ + +$FreeBSD$ + +--- Makefile.am.orig ++++ Makefile.am +@@ -5,10 +5,10 @@ + + SUBDIRS = src tools + +-pkgconfigdir=$(libdir)/pkgconfig ++pkgconfigdir=${prefix}/libdata/pkgconfig + pkgconfig_DATA = libwbxml2.pc + +-wbxmldocdir = ${prefix}/share/doc/wbxml2-${VERSION} ++wbxmldocdir = ${prefix}/share/doc/wbxml2 + wbxmldoc_DATA = \ + AUTHORS\ + bootstrap\ +@@ -25,8 +25,8 @@ + doxygen.h + + install-data-local: +- $(mkinstalldirs) $(DESTDIR)$(wbxmldocdir)/manual +- cp -Rp doc/* $(DESTDIR)$(wbxmldocdir)/manual ++# $(mkinstalldirs) $(DESTDIR)$(wbxmldocdir)/manual ++# cp -Rp doc/* $(DESTDIR)$(wbxmldocdir)/manual + + dist-bz2: distdir + sed -e "s/tar.gz/tar.bz2/g" $(distdir)/wbxml2.spec > $(distdir)/wbxml2.spec.aux diff --git a/textproc/wbxml2/files/patch-src_Makefile.am b/textproc/wbxml2/files/patch-src_Makefile.am new file mode 100644 index 000000000000..5d552f7d4f64 --- /dev/null +++ b/textproc/wbxml2/files/patch-src_Makefile.am @@ -0,0 +1,25 @@ + +$FreeBSD: /tmp/pcvs/ports/textproc/wbxml2/files/Attic/patch-src_Makefile.am,v 1.1 2007-04-22 22:49:42 sobomax Exp $ + +--- src/Makefile.am ++++ src/Makefile.am +@@ -3,7 +3,7 @@ + INCLUDES =\ + -I. -I/usr/include + +-CFLAGS =\ ++CFLAGS +=\ + -DHAVE_CONFIG_H\ + -DHAVE_EXPAT\ + -D_REENTRANT\ +@@ -20,9 +20,7 @@ + -DWBXML_SUPPORT_SYNCML\ + -DWBXML_SUPPORT_WV\ + -DWBXML_SUPPORT_AIRSYNC\ +- -Wall -Wimplicit -Wreturn-type -Wunused -Wswitch -Wcomment -Wuninitialized -Wparentheses -Wpointer-arith -Wmissing-prototypes\ +- -O3\ +- -g ++ -Wall -Wimplicit -Wreturn-type -Wunused -Wswitch -Wcomment -Wuninitialized -Wparentheses -Wpointer-arith -Wmissing-prototypes + + lib_LTLIBRARIES = libwbxml2.la + diff --git a/textproc/wbxml2/files/patch-tools_Makefile.am b/textproc/wbxml2/files/patch-tools_Makefile.am new file mode 100644 index 000000000000..5e36a5c8c342 --- /dev/null +++ b/textproc/wbxml2/files/patch-tools_Makefile.am @@ -0,0 +1,16 @@ + +$FreeBSD: /tmp/pcvs/ports/textproc/wbxml2/files/Attic/patch-tools_Makefile.am,v 1.1 2007-04-22 22:49:42 sobomax Exp $ + +--- tools/Makefile.am ++++ tools/Makefile.am +@@ -20,9 +20,7 @@ + -DWBXML_SUPPORT_SYNCML\ + -DWBXML_SUPPORT_WV\ + -DWBXML_SUPPORT_AIRSYNC\ +- -Wall -Wimplicit -Wreturn-type -Wunused -Wswitch -Wcomment -Wuninitialized -Wparentheses -Wpointer-arith -Wmissing-prototypes\ +- -O3\ +- -g ++ -Wall -Wimplicit -Wreturn-type -Wunused -Wswitch -Wcomment -Wuninitialized -Wparentheses -Wpointer-arith -Wmissing-prototypes + + bin_PROGRAMS = wbxml2xml xml2wbxml + diff --git a/textproc/wbxml2/pkg-descr b/textproc/wbxml2/pkg-descr index e503a861c301..8f7bce1de873 100644 --- a/textproc/wbxml2/pkg-descr +++ b/textproc/wbxml2/pkg-descr @@ -1,5 +1,6 @@ -libwbxml is a library for converting an XML Document to a WBXML Document +The libwbxml is a library for converting an XML Document to a WBXML Document and vice-versa. + The WBXML format is a binary representation of XML, defined by the Wap Forum, and used to reduce bandwidth in mobile communications. diff --git a/textproc/wbxml2/pkg-plist b/textproc/wbxml2/pkg-plist index 329933c3616b..891b7b00ad00 100644 --- a/textproc/wbxml2/pkg-plist +++ b/textproc/wbxml2/pkg-plist @@ -3,6 +3,7 @@ bin/xml2wbxml include/wbxml.h include/wbxml_base64.h include/wbxml_buffers.h +include/wbxml_charset.h include/wbxml_conv.h include/wbxml_elt.h include/wbxml_encoder.h @@ -17,56 +18,20 @@ include/wbxml_tree.h include/wbxml_tree_clb_wbxml.h include/wbxml_tree_clb_xml.h lib/libwbxml2.a -lib/libwbxml2.la lib/libwbxml2.so lib/libwbxml2.so.0 -share/doc/wbxml2-0.9.0/AUTHORS -share/doc/wbxml2-0.9.0/BUGS -share/doc/wbxml2-0.9.0/COPYING -share/doc/wbxml2-0.9.0/ChangeLog -share/doc/wbxml2-0.9.0/GNU-GPL -share/doc/wbxml2-0.9.0/INSTALL -share/doc/wbxml2-0.9.0/NEWS -share/doc/wbxml2-0.9.0/README -share/doc/wbxml2-0.9.0/References -share/doc/wbxml2-0.9.0/THANKS -share/doc/wbxml2-0.9.0/TODO -share/doc/wbxml2-0.9.0/bootstrap -share/doc/wbxml2-0.9.0/doxygen.h -share/doc/wbxml2-0.9.0/manual/README -share/doc/wbxml2-0.9.0/manual/e-novative.css -share/doc/wbxml2-0.9.0/manual/images/blank.png -share/doc/wbxml2-0.9.0/manual/images/callouts/1.png -share/doc/wbxml2-0.9.0/manual/images/callouts/10.png -share/doc/wbxml2-0.9.0/manual/images/callouts/11.png -share/doc/wbxml2-0.9.0/manual/images/callouts/12.png -share/doc/wbxml2-0.9.0/manual/images/callouts/13.png -share/doc/wbxml2-0.9.0/manual/images/callouts/14.png -share/doc/wbxml2-0.9.0/manual/images/callouts/15.png -share/doc/wbxml2-0.9.0/manual/images/callouts/2.png -share/doc/wbxml2-0.9.0/manual/images/callouts/3.png -share/doc/wbxml2-0.9.0/manual/images/callouts/4.png -share/doc/wbxml2-0.9.0/manual/images/callouts/5.png -share/doc/wbxml2-0.9.0/manual/images/callouts/6.png -share/doc/wbxml2-0.9.0/manual/images/callouts/7.png -share/doc/wbxml2-0.9.0/manual/images/callouts/8.png -share/doc/wbxml2-0.9.0/manual/images/callouts/9.png -share/doc/wbxml2-0.9.0/manual/images/caution.png -share/doc/wbxml2-0.9.0/manual/images/draft.png -share/doc/wbxml2-0.9.0/manual/images/home.png -share/doc/wbxml2-0.9.0/manual/images/important.png -share/doc/wbxml2-0.9.0/manual/images/next.png -share/doc/wbxml2-0.9.0/manual/images/note.png -share/doc/wbxml2-0.9.0/manual/images/prev.png -share/doc/wbxml2-0.9.0/manual/images/tip.png -share/doc/wbxml2-0.9.0/manual/images/toc-blank.png -share/doc/wbxml2-0.9.0/manual/images/toc-minus.png -share/doc/wbxml2-0.9.0/manual/images/toc-plus.png -share/doc/wbxml2-0.9.0/manual/images/up.png -share/doc/wbxml2-0.9.0/manual/images/warning.png -share/doc/wbxml2-0.9.0/manual/wbxml2.html -share/doc/wbxml2-0.9.0/manual/wbxml2.xml -@dirrm share/doc/wbxml2-0.9.0/manual/images/callouts -@dirrm share/doc/wbxml2-0.9.0/manual/images -@dirrm share/doc/wbxml2-0.9.0/manual -@dirrm share/doc/wbxml2-0.9.0 +libdata/pkgconfig/libwbxml2.pc +share/doc/wbxml2/AUTHORS +share/doc/wbxml2/BUGS +share/doc/wbxml2/COPYING +share/doc/wbxml2/ChangeLog +share/doc/wbxml2/GNU-LGPL +share/doc/wbxml2/INSTALL +share/doc/wbxml2/NEWS +share/doc/wbxml2/README +share/doc/wbxml2/References +share/doc/wbxml2/THANKS +share/doc/wbxml2/TODO +share/doc/wbxml2/bootstrap +share/doc/wbxml2/doxygen.h +@dirrm share/doc/wbxml2 -- cgit