diff --git a/textproc/libwpd/Makefile b/textproc/libwpd/Makefile index a233407856f..a07cff2e3a1 100644 --- a/textproc/libwpd/Makefile +++ b/textproc/libwpd/Makefile @@ -1,13 +1,13 @@ -# $OpenBSD: Makefile,v 1.2 2006/11/10 12:41:26 steven Exp $ +# $OpenBSD: Makefile,v 1.3 2006/11/11 14:39:10 robert Exp $ COMMENT= "library for importing and exporting WordPerfect(tm) documents" DISTNAME= libwpd-0.8.7 -PKGNAME= ${DISTNAME}p0 +PKGNAME= ${DISTNAME}p1 CATEGORIES= textproc -SHARED_LIBS= wpd-0.8 8.7 \ - wpd-stream-0.8 8.7 +SHARED_LIBS= wpd 8.7 \ + wpd-stream 8.7 HOMEPAGE= http://libwpd.sourceforge.net/ @@ -28,4 +28,11 @@ LIB_DEPENDS= gsf-1::devel/libgsf USE_LIBTOOL= Yes CONFIGURE_STYLE= gnu +pre-configure: + @cd ${WRKSRC} && \ + for PCFILE in *.pc.in; do \ + cp $$PCFILE \ + `echo $$PCFILE | sed 's/-0.8//g'`; \ + done + .include diff --git a/textproc/libwpd/patches/patch-Makefile_in b/textproc/libwpd/patches/patch-Makefile_in new file mode 100644 index 00000000000..d3d77dbad70 --- /dev/null +++ b/textproc/libwpd/patches/patch-Makefile_in @@ -0,0 +1,44 @@ +$OpenBSD: patch-Makefile_in,v 1.1 2006/11/11 14:39:10 robert Exp $ +--- Makefile.in.orig Fri Nov 10 15:06:48 2006 ++++ Makefile.in Fri Nov 10 15:07:40 2006 +@@ -38,7 +38,7 @@ build_triplet = @build@ + host_triplet = @host@ + DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/config.h.in \ +- $(srcdir)/libwpd-0.8.pc.in $(srcdir)/libwpd-stream-0.8.pc.in \ ++ $(srcdir)/libwpd.pc.in $(srcdir)/libwpd-stream.pc.in \ + $(srcdir)/libwpd-zip.in $(srcdir)/libwpd.spec.in \ + $(top_srcdir)/configure COPYING INSTALL TODO config.guess \ + config.sub depcomp install-sh ltmain.sh missing +@@ -51,7 +51,7 @@ am__CONFIG_DISTCLEAN_FILES = config.stat + configure.lineno configure.status.lineno + mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = config.h +-CONFIG_CLEAN_FILES = libwpd-0.8.pc libwpd-stream-0.8.pc libwpd.spec \ ++CONFIG_CLEAN_FILES = libwpd.pc libwpd-stream.pc libwpd.spec \ + libwpd-zip + SOURCES = + DIST_SOURCES = +@@ -218,8 +218,8 @@ sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + pkgconfdir = $(libdir)/pkgconfig +-@WITH_LIBWPD_STREAM_TRUE@LIBWPD_STREAM_PC = libwpd-stream-0.8.pc +-pkgconf_DATA = libwpd-0.8.pc $(LIBWPD_STREAM_PC) ++@WITH_LIBWPD_STREAM_TRUE@LIBWPD_STREAM_PC = libwpd-stream.pc ++pkgconf_DATA = libwpd.pc $(LIBWPD_STREAM_PC) + SUBDIRS = src build docs autopackage + EXTRA_DIST = \ + autogen.sh \ +@@ -289,9 +289,9 @@ $(srcdir)/config.h.in: $(am__configure_ + + distclean-hdr: + -rm -f config.h stamp-h1 +-libwpd-0.8.pc: $(top_builddir)/config.status $(srcdir)/libwpd-0.8.pc.in ++libwpd.pc: $(top_builddir)/config.status $(srcdir)/libwpd.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $@ +-libwpd-stream-0.8.pc: $(top_builddir)/config.status $(srcdir)/libwpd-stream-0.8.pc.in ++libwpd-stream.pc: $(top_builddir)/config.status $(srcdir)/libwpd-stream.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $@ + libwpd.spec: $(top_builddir)/config.status $(srcdir)/libwpd.spec.in + cd $(top_builddir) && $(SHELL) ./config.status $@ diff --git a/textproc/libwpd/patches/patch-configure b/textproc/libwpd/patches/patch-configure new file mode 100644 index 00000000000..6d24d1ce5d7 --- /dev/null +++ b/textproc/libwpd/patches/patch-configure @@ -0,0 +1,23 @@ +$OpenBSD: patch-configure,v 1.1 2006/11/11 14:39:10 robert Exp $ +--- configure.orig Fri Nov 10 15:08:09 2006 ++++ configure Fri Nov 10 15:08:23 2006 +@@ -19501,7 +19501,7 @@ LIBWPD_CXXFLAGS="$LIBWPD_CFLAGS" + + + +- ac_config_files="$ac_config_files Makefile src/Makefile src/conv/Makefile src/conv/html/Makefile src/conv/html/wpd2html.rc src/conv/raw/Makefile src/conv/raw/wpd2raw.rc src/conv/text/Makefile src/conv/text/wpd2text.rc src/lib/Makefile src/lib/libwpd.rc src/lib/libwpd-stream.rc docs/Makefile docs/doxygen/Makefile build/Makefile build/win32/Makefile libwpd-0.8.pc libwpd-stream-0.8.pc libwpd.spec libwpd-zip autopackage/Makefile autopackage/default.apspec" ++ ac_config_files="$ac_config_files Makefile src/Makefile src/conv/Makefile src/conv/html/Makefile src/conv/html/wpd2html.rc src/conv/raw/Makefile src/conv/raw/wpd2raw.rc src/conv/text/Makefile src/conv/text/wpd2text.rc src/lib/Makefile src/lib/libwpd.rc src/lib/libwpd-stream.rc docs/Makefile docs/doxygen/Makefile build/Makefile build/win32/Makefile libwpd.pc libwpd-stream.pc libwpd.spec libwpd-zip autopackage/Makefile autopackage/default.apspec" + cat >confcache <<\_ACEOF + # This file is a shell script that caches the results of configure + # tests run on this system so they can be shared between configure +@@ -20109,8 +20109,8 @@ do + "docs/doxygen/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/doxygen/Makefile" ;; + "build/Makefile" ) CONFIG_FILES="$CONFIG_FILES build/Makefile" ;; + "build/win32/Makefile" ) CONFIG_FILES="$CONFIG_FILES build/win32/Makefile" ;; +- "libwpd-0.8.pc" ) CONFIG_FILES="$CONFIG_FILES libwpd-0.8.pc" ;; +- "libwpd-stream-0.8.pc" ) CONFIG_FILES="$CONFIG_FILES libwpd-stream-0.8.pc" ;; ++ "libwpd.pc" ) CONFIG_FILES="$CONFIG_FILES libwpd.pc" ;; ++ "libwpd-stream.pc" ) CONFIG_FILES="$CONFIG_FILES libwpd-stream.pc" ;; + "libwpd.spec" ) CONFIG_FILES="$CONFIG_FILES libwpd.spec" ;; + "libwpd-zip" ) CONFIG_FILES="$CONFIG_FILES libwpd-zip" ;; + "autopackage/Makefile" ) CONFIG_FILES="$CONFIG_FILES autopackage/Makefile" ;; diff --git a/textproc/libwpd/patches/patch-libwpd-0_8_pc_in b/textproc/libwpd/patches/patch-libwpd-0_8_pc_in new file mode 100644 index 00000000000..27e7f5ea128 --- /dev/null +++ b/textproc/libwpd/patches/patch-libwpd-0_8_pc_in @@ -0,0 +1,15 @@ +$OpenBSD: patch-libwpd-0_8_pc_in,v 1.1 2006/11/11 14:39:10 robert Exp $ +--- libwpd-0.8.pc.in.orig Mon Oct 9 05:42:27 2006 ++++ libwpd-0.8.pc.in Fri Nov 10 16:11:19 2006 +@@ -3,8 +3,8 @@ exec_prefix=@exec_prefix@ + libdir=@libdir@ + includedir=@includedir@ + +-Name: libwpd-0.8 ++Name: libwpd + Description: A library for reading and writing Corel WordPerfect(tm) documents + Version: @VERSION@ +-Libs: -L${libdir} -lwpd-0.8 +-Cflags: -I${includedir}/libwpd-0.8 ++Libs: -L${libdir} -lwpd ++Cflags: -I${includedir} diff --git a/textproc/libwpd/patches/patch-libwpd-stream-0_8_pc_in b/textproc/libwpd/patches/patch-libwpd-stream-0_8_pc_in new file mode 100644 index 00000000000..0ff64d17220 --- /dev/null +++ b/textproc/libwpd/patches/patch-libwpd-stream-0_8_pc_in @@ -0,0 +1,17 @@ +$OpenBSD: patch-libwpd-stream-0_8_pc_in,v 1.1 2006/11/11 14:39:10 robert Exp $ +--- libwpd-stream-0.8.pc.in.orig Mon Oct 9 05:42:27 2006 ++++ libwpd-stream-0.8.pc.in Fri Nov 10 16:11:26 2006 +@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@ + libdir=@libdir@ + includedir=@includedir@ + +-Name: libwpd-stream-0.8 ++Name: libwpd-stream + Description: GSFStream support for libwpd, a library for reading and writing Corel WordPerfect(tm) documents + Version: @VERSION@ +-Requires: glib-2.0 libgsf-1 libwpd-0.8 +-Libs: -L${libdir} -lwpd-stream-0.8 +-Cflags: -I${includedir}/libwpd-0.8 ++Requires: glib-2.0 libgsf-1 libwpd ++Libs: -L${libdir} -lwpd-stream ++Cflags: -I${includedir} diff --git a/textproc/libwpd/patches/patch-libwpd_spec b/textproc/libwpd/patches/patch-libwpd_spec new file mode 100644 index 00000000000..74cb17fed86 --- /dev/null +++ b/textproc/libwpd/patches/patch-libwpd_spec @@ -0,0 +1,27 @@ +$OpenBSD: patch-libwpd_spec,v 1.1 2006/11/11 14:39:10 robert Exp $ +--- libwpd.spec.orig Fri Nov 10 15:08:47 2006 ++++ libwpd.spec Fri Nov 10 15:09:04 2006 +@@ -71,7 +71,7 @@ umask 022 + + %files + %defattr(644,root,root,755) +-%{_libdir}/libwpd*-0.8.so.* ++%{_libdir}/libwpd*.so.* + + %if %{!?_without_stream:1}%{?_without_stream:0} + %files tools +@@ -81,10 +81,10 @@ umask 022 + + %files devel + %defattr(644,root,root,755) +-%{_libdir}/libwpd*-0.8.so +-%{_libdir}/libwpd*-0.8.*a +-%{_libdir}/pkgconfig/libwpd*-0.8.pc +-%{_includedir}/libwpd-0.8/libwpd ++%{_libdir}/libwpd*.so ++%{_libdir}/libwpd*.*a ++%{_libdir}/pkgconfig/libwpd*.pc ++%{_includedir}/libwpd + + %if %{!?_without_docs:1}%{?_without_docs:0} + %files docs diff --git a/textproc/libwpd/patches/patch-src_conv_html_Makefile_in b/textproc/libwpd/patches/patch-src_conv_html_Makefile_in new file mode 100644 index 00000000000..067596b9f73 --- /dev/null +++ b/textproc/libwpd/patches/patch-src_conv_html_Makefile_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-src_conv_html_Makefile_in,v 1.1 2006/11/11 14:39:10 robert Exp $ +--- src/conv/html/Makefile.in.orig Fri Nov 10 15:56:45 2006 ++++ src/conv/html/Makefile.in Fri Nov 10 15:56:53 2006 +@@ -216,7 +216,7 @@ target_alias = @target_alias@ + AM_CXXFLAGS = $(LIBWPD_CXXFLAGS) $(DEBUG_CXXFLAGS) -I$(top_srcdir)/src/lib/ + wpd2html_LDFLAGS = -L../../lib/ + wpd2html_DEPENDENCIES = @WPD2HTML_WIN32_RESOURCE@ +-wpd2html_LDADD = -lwpd-0.8 -lwpd-stream-0.8 $(LIBWPD_LIBS) @WPD2HTML_WIN32_RESOURCE@ ++wpd2html_LDADD = -lwpd -lwpd-stream $(LIBWPD_LIBS) @WPD2HTML_WIN32_RESOURCE@ + wpd2html_SOURCES = \ + HtmlListenerImpl.cpp \ + HtmlListenerImpl.h \ diff --git a/textproc/libwpd/patches/patch-src_conv_raw_Makefile_in b/textproc/libwpd/patches/patch-src_conv_raw_Makefile_in new file mode 100644 index 00000000000..236977bdb23 --- /dev/null +++ b/textproc/libwpd/patches/patch-src_conv_raw_Makefile_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-src_conv_raw_Makefile_in,v 1.1 2006/11/11 14:39:10 robert Exp $ +--- src/conv/raw/Makefile.in.orig Fri Nov 10 15:56:10 2006 ++++ src/conv/raw/Makefile.in Fri Nov 10 15:56:18 2006 +@@ -216,7 +216,7 @@ target_alias = @target_alias@ + AM_CXXFLAGS = $(LIBWPD_CXXFLAGS) $(DEBUG_CXXFLAGS) -I$(top_srcdir)/src/lib/ + wpd2raw_LDFLAGS = -L../../lib/ + wpd2raw_DEPENDENCIES = @WPD2RAW_WIN32_RESOURCE@ +-wpd2raw_LDADD = -lwpd-0.8 -lwpd-stream-0.8 $(LIBWPD_LIBS) @WPD2RAW_WIN32_RESOURCE@ ++wpd2raw_LDADD = -lwpd -lwpd-stream $(LIBWPD_LIBS) @WPD2RAW_WIN32_RESOURCE@ + wpd2raw_SOURCES = \ + RawListener.cpp \ + RawListener.h \ diff --git a/textproc/libwpd/patches/patch-src_conv_text_Makefile_in b/textproc/libwpd/patches/patch-src_conv_text_Makefile_in new file mode 100644 index 00000000000..56de873ab1c --- /dev/null +++ b/textproc/libwpd/patches/patch-src_conv_text_Makefile_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-src_conv_text_Makefile_in,v 1.1 2006/11/11 14:39:10 robert Exp $ +--- src/conv/text/Makefile.in.orig Fri Nov 10 15:57:07 2006 ++++ src/conv/text/Makefile.in Fri Nov 10 15:57:17 2006 +@@ -216,7 +216,7 @@ target_alias = @target_alias@ + AM_CXXFLAGS = $(LIBWPD_CXXFLAGS) $(DEBUG_CXXFLAGS) -I$(top_srcdir)/src/lib/ + wpd2text_LDFLAGS = -L../../lib/ + wpd2text_DEPENDENCIES = @WPD2TEXT_WIN32_RESOURCE@ +-wpd2text_LDADD = -lwpd-0.8 -lwpd-stream-0.8 $(LIBWPD_LIBS) @WPD2TEXT_WIN32_RESOURCE@ ++wpd2text_LDADD = -lwpd -lwpd-stream $(LIBWPD_LIBS) @WPD2TEXT_WIN32_RESOURCE@ + wpd2text_SOURCES = \ + TextListenerImpl.cpp \ + TextListenerImpl.h \ diff --git a/textproc/libwpd/patches/patch-src_lib_Makefile_in b/textproc/libwpd/patches/patch-src_lib_Makefile_in new file mode 100644 index 00000000000..783216a0770 --- /dev/null +++ b/textproc/libwpd/patches/patch-src_lib_Makefile_in @@ -0,0 +1,242 @@ +$OpenBSD: patch-src_lib_Makefile_in,v 1.1 2006/11/11 14:39:10 robert Exp $ +--- src/lib/Makefile.in.orig Mon Oct 9 06:00:16 2006 ++++ src/lib/Makefile.in Fri Nov 10 15:40:29 2006 +@@ -38,8 +38,8 @@ POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ + subdir = src/lib +-DIST_COMMON = $(am__libwpd_stream_0_8_include_HEADERS_DIST) \ +- $(libwpd_0_8_include_HEADERS) $(srcdir)/Makefile.am \ ++DIST_COMMON = $(am__libwpd_stream_include_HEADERS_DIST) \ ++ $(libwpd_include_HEADERS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/libwpd-stream.rc.in \ + $(srcdir)/libwpd.rc.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +@@ -56,11 +56,11 @@ am__vpath_adj = case $$p in \ + esac; + am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; + am__installdirs = "$(DESTDIR)$(libdir)" \ +- "$(DESTDIR)$(libwpd_0_8_includedir)" \ +- "$(DESTDIR)$(libwpd_stream_0_8_includedir)" ++ "$(DESTDIR)$(libwpd_includedir)" \ ++ "$(DESTDIR)$(libwpd_stream_includedir)" + libLTLIBRARIES_INSTALL = $(INSTALL) + LTLIBRARIES = $(lib_LTLIBRARIES) +-am_libwpd_0_8_la_OBJECTS = libwpd_internal.lo libwpd_math.lo \ ++am_libwpd_la_OBJECTS = libwpd_internal.lo libwpd_math.lo \ + WP1BottomMarginGroup.lo WP1CenterTextGroup.lo \ + WP1ContentListener.lo WP1ExtendedCharacterGroup.lo \ + WP1FileStructure.lo WP1FixedLengthGroup.lo \ +@@ -124,14 +124,14 @@ am_libwpd_0_8_la_OBJECTS = libwpd_intern + WPXPart.lo WPXProperty.lo WPXPropertyList.lo \ + WPXPropertyListVector.lo WPXString.lo WPXStylesListener.lo \ + WPXSubDocument.lo WPXTable.lo +-libwpd_0_8_la_OBJECTS = $(am_libwpd_0_8_la_OBJECTS) ++libwpd_la_OBJECTS = $(am_libwpd_la_OBJECTS) + am__DEPENDENCIES_1 = +-am__libwpd_stream_0_8_la_SOURCES_DIST = GSFStream.cpp ++am__libwpd_stream_la_SOURCES_DIST = GSFStream.cpp + am__objects_1 = GSFStream.lo +-@WITH_LIBWPD_STREAM_TRUE@am_libwpd_stream_0_8_la_OBJECTS = \ ++@WITH_LIBWPD_STREAM_TRUE@am_libwpd_stream_la_OBJECTS = \ + @WITH_LIBWPD_STREAM_TRUE@ $(am__objects_1) +-libwpd_stream_0_8_la_OBJECTS = $(am_libwpd_stream_0_8_la_OBJECTS) +-@WITH_LIBWPD_STREAM_TRUE@am_libwpd_stream_0_8_la_rpath = -rpath \ ++libwpd_stream_la_OBJECTS = $(am_libwpd_stream_la_OBJECTS) ++@WITH_LIBWPD_STREAM_TRUE@am_libwpd_stream_la_rpath = -rpath \ + @WITH_LIBWPD_STREAM_TRUE@ $(libdir) + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp +@@ -152,14 +152,14 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=c + CCLD = $(CC) + LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-SOURCES = $(libwpd_0_8_la_SOURCES) $(libwpd_stream_0_8_la_SOURCES) +-DIST_SOURCES = $(libwpd_0_8_la_SOURCES) \ +- $(am__libwpd_stream_0_8_la_SOURCES_DIST) +-libwpd_0_8_includeHEADERS_INSTALL = $(INSTALL_HEADER) +-am__libwpd_stream_0_8_include_HEADERS_DIST = GSFStream.h +-libwpd_stream_0_8_includeHEADERS_INSTALL = $(INSTALL_HEADER) +-HEADERS = $(libwpd_0_8_include_HEADERS) \ +- $(libwpd_stream_0_8_include_HEADERS) ++SOURCES = $(libwpd_la_SOURCES) $(libwpd_stream_la_SOURCES) ++DIST_SOURCES = $(libwpd_la_SOURCES) \ ++ $(am__libwpd_stream_la_SOURCES_DIST) ++libwpd_includeHEADERS_INSTALL = $(INSTALL_HEADER) ++am__libwpd_stream_include_HEADERS_DIST = GSFStream.h ++libwpd_stream_includeHEADERS_INSTALL = $(INSTALL_HEADER) ++HEADERS = $(libwpd_include_HEADERS) \ ++ $(libwpd_stream_include_HEADERS) + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +@@ -302,18 +302,18 @@ target_alias = @target_alias@ + @OS_WIN32_FALSE@version_info = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) + @OS_WIN32_TRUE@version_info = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -avoid-version + @WITH_LIBWPD_STREAM_FALSE@target_libwpd_stream = +-@WITH_LIBWPD_STREAM_TRUE@target_libwpd_stream = libwpd-stream-0.8.la +-lib_LTLIBRARIES = libwpd-0.8.la $(target_libwpd_stream) +-libwpd_0_8_includedir = $(includedir)/libwpd-0.8/libwpd +-libwpd_0_8_include_HEADERS = libwpd.h libwpd_types.h WPXStream.h WPXProperty.h WPXPropertyList.h \ ++@WITH_LIBWPD_STREAM_TRUE@target_libwpd_stream = libwpd-stream.la ++lib_LTLIBRARIES = libwpd.la $(target_libwpd_stream) ++libwpd_includedir = $(includedir)/libwpd ++libwpd_include_HEADERS = libwpd.h libwpd_types.h WPXStream.h WPXProperty.h WPXPropertyList.h \ + WPXString.h WPXPropertyListVector.h WPDocument.h WPXHLListenerImpl.h + + INCLUDES = -I$(srcdir) + AM_CXXFLAGS = $(LIBWPD_CXXFLAGS) $(DEBUG_CXXFLAGS) +-libwpd_0_8_la_LIBADD = @LIBWPD_WIN32_RESOURCE@ +-libwpd_0_8_la_DEPENDENCIES = @LIBWPD_WIN32_RESOURCE@ +-libwpd_0_8_la_LDFLAGS = $(version_info) -export-dynamic $(no_undefined) +-libwpd_0_8_la_SOURCES = \ ++libwpd_la_LIBADD = @LIBWPD_WIN32_RESOURCE@ ++libwpd_la_DEPENDENCIES = @LIBWPD_WIN32_RESOURCE@ ++libwpd_la_LDFLAGS = $(version_info) -export-dynamic $(no_undefined) ++libwpd_la_SOURCES = \ + libwpd_internal.cpp \ + libwpd_math.cpp \ + WP1BottomMarginGroup.cpp \ +@@ -620,12 +620,12 @@ libwpd_0_8_la_SOURCES = \ + + libwpd_stream_headers = GSFStream.h + libwpd_stream_sources = GSFStream.cpp +-@WITH_LIBWPD_STREAM_TRUE@libwpd_stream_0_8_includedir = $(includedir)/libwpd-0.8/libwpd +-@WITH_LIBWPD_STREAM_TRUE@libwpd_stream_0_8_include_HEADERS = $(libwpd_stream_headers) +-@WITH_LIBWPD_STREAM_TRUE@libwpd_stream_0_8_la_LIBADD = $(LIBWPD_LIBS) @LIBWPD_STREAM_WIN32_RESOURCE@ +-@WITH_LIBWPD_STREAM_TRUE@libwpd_stream_0_8_la_DEPENDENCIES = @LIBWPD_STREAM_WIN32_RESOURCE@ +-@WITH_LIBWPD_STREAM_TRUE@libwpd_stream_0_8_la_LDFLAGS = $(version_info) -export-dynamic $(no_undefined) +-@WITH_LIBWPD_STREAM_TRUE@libwpd_stream_0_8_la_SOURCES = $(libwpd_stream_sources) ++@WITH_LIBWPD_STREAM_TRUE@libwpd_stream_includedir = $(includedir)/libwpd ++@WITH_LIBWPD_STREAM_TRUE@libwpd_stream_include_HEADERS = $(libwpd_stream_headers) ++@WITH_LIBWPD_STREAM_TRUE@libwpd_stream_la_LIBADD = $(LIBWPD_LIBS) @LIBWPD_STREAM_WIN32_RESOURCE@ ++@WITH_LIBWPD_STREAM_TRUE@libwpd_stream_la_DEPENDENCIES = @LIBWPD_STREAM_WIN32_RESOURCE@ ++@WITH_LIBWPD_STREAM_TRUE@libwpd_stream_la_LDFLAGS = $(version_info) -export-dynamic $(no_undefined) ++@WITH_LIBWPD_STREAM_TRUE@libwpd_stream_la_SOURCES = $(libwpd_stream_sources) + + # Include the GSFStream.* in case we build a tarball without stream + EXTRA_DIST = \ +@@ -705,10 +705,10 @@ clean-libLTLIBRARIES: + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +-libwpd-0.8.la: $(libwpd_0_8_la_OBJECTS) $(libwpd_0_8_la_DEPENDENCIES) +- $(CXXLINK) -rpath $(libdir) $(libwpd_0_8_la_LDFLAGS) $(libwpd_0_8_la_OBJECTS) $(libwpd_0_8_la_LIBADD) $(LIBS) +-libwpd-stream-0.8.la: $(libwpd_stream_0_8_la_OBJECTS) $(libwpd_stream_0_8_la_DEPENDENCIES) +- $(CXXLINK) $(am_libwpd_stream_0_8_la_rpath) $(libwpd_stream_0_8_la_LDFLAGS) $(libwpd_stream_0_8_la_OBJECTS) $(libwpd_stream_0_8_la_LIBADD) $(LIBS) ++libwpd.la: $(libwpd_la_OBJECTS) $(libwpd_la_DEPENDENCIES) ++ $(CXXLINK) -rpath $(libdir) $(libwpd_la_LDFLAGS) $(libwpd_la_OBJECTS) $(libwpd_la_LIBADD) $(LIBS) ++libwpd-stream.la: $(libwpd_stream_la_OBJECTS) $(libwpd_stream_la_DEPENDENCIES) ++ $(CXXLINK) $(am_libwpd_stream_la_rpath) $(libwpd_stream_la_LDFLAGS) $(libwpd_stream_la_OBJECTS) $(libwpd_stream_la_LIBADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -897,39 +897,39 @@ clean-libtool: + distclean-libtool: + -rm -f libtool + uninstall-info-am: +-install-libwpd_0_8_includeHEADERS: $(libwpd_0_8_include_HEADERS) ++install-libwpd_includeHEADERS: $(libwpd_include_HEADERS) + @$(NORMAL_INSTALL) +- test -z "$(libwpd_0_8_includedir)" || $(mkdir_p) "$(DESTDIR)$(libwpd_0_8_includedir)" +- @list='$(libwpd_0_8_include_HEADERS)'; for p in $$list; do \ ++ test -z "$(libwpd_includedir)" || $(mkdir_p) "$(DESTDIR)$(libwpd_includedir)" ++ @list='$(libwpd_include_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +- echo " $(libwpd_0_8_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libwpd_0_8_includedir)/$$f'"; \ +- $(libwpd_0_8_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libwpd_0_8_includedir)/$$f"; \ ++ echo " $(libwpd_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libwpd_includedir)/$$f'"; \ ++ $(libwpd_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libwpd_includedir)/$$f"; \ + done + +-uninstall-libwpd_0_8_includeHEADERS: ++uninstall-libwpd_includeHEADERS: + @$(NORMAL_UNINSTALL) +- @list='$(libwpd_0_8_include_HEADERS)'; for p in $$list; do \ ++ @list='$(libwpd_include_HEADERS)'; for p in $$list; do \ + f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(libwpd_0_8_includedir)/$$f'"; \ +- rm -f "$(DESTDIR)$(libwpd_0_8_includedir)/$$f"; \ ++ echo " rm -f '$(DESTDIR)$(libwpd_includedir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(libwpd_includedir)/$$f"; \ + done +-install-libwpd_stream_0_8_includeHEADERS: $(libwpd_stream_0_8_include_HEADERS) ++install-libwpd_stream_includeHEADERS: $(libwpd_stream_include_HEADERS) + @$(NORMAL_INSTALL) +- test -z "$(libwpd_stream_0_8_includedir)" || $(mkdir_p) "$(DESTDIR)$(libwpd_stream_0_8_includedir)" +- @list='$(libwpd_stream_0_8_include_HEADERS)'; for p in $$list; do \ ++ test -z "$(libwpd_stream_includedir)" || $(mkdir_p) "$(DESTDIR)$(libwpd_stream_includedir)" ++ @list='$(libwpd_stream_include_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +- echo " $(libwpd_stream_0_8_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libwpd_stream_0_8_includedir)/$$f'"; \ +- $(libwpd_stream_0_8_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libwpd_stream_0_8_includedir)/$$f"; \ ++ echo " $(libwpd_stream_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libwpd_stream_includedir)/$$f'"; \ ++ $(libwpd_stream_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libwpd_stream_includedir)/$$f"; \ + done + +-uninstall-libwpd_stream_0_8_includeHEADERS: ++uninstall-libwpd_stream_includeHEADERS: + @$(NORMAL_UNINSTALL) +- @list='$(libwpd_stream_0_8_include_HEADERS)'; for p in $$list; do \ ++ @list='$(libwpd_stream_include_HEADERS)'; for p in $$list; do \ + f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(libwpd_stream_0_8_includedir)/$$f'"; \ +- rm -f "$(DESTDIR)$(libwpd_stream_0_8_includedir)/$$f"; \ ++ echo " rm -f '$(DESTDIR)$(libwpd_stream_includedir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(libwpd_stream_includedir)/$$f"; \ + done + + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) +@@ -1011,7 +1011,7 @@ check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) $(HEADERS) + installdirs: +- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libwpd_0_8_includedir)" "$(DESTDIR)$(libwpd_stream_0_8_includedir)"; do \ ++ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libwpd_includedir)" "$(DESTDIR)$(libwpd_stream_includedir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done + install: install-am +@@ -1059,8 +1059,8 @@ info: info-am + + info-am: + +-install-data-am: install-data-local install-libwpd_0_8_includeHEADERS \ +- install-libwpd_stream_0_8_includeHEADERS ++install-data-am: install-data-local install-libwpd_includeHEADERS \ ++ install-libwpd_stream_includeHEADERS + + install-exec-am: install-libLTLIBRARIES + +@@ -1089,8 +1089,8 @@ ps: ps-am + ps-am: + + uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \ +- uninstall-libwpd_0_8_includeHEADERS \ +- uninstall-libwpd_stream_0_8_includeHEADERS uninstall-local ++ uninstall-libwpd_includeHEADERS \ ++ uninstall-libwpd_stream_includeHEADERS uninstall-local + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libLTLIBRARIES clean-libtool ctags distclean \ +@@ -1099,15 +1099,15 @@ uninstall-am: uninstall-info-am uninstal + install install-am install-data install-data-am \ + install-data-local install-exec install-exec-am install-info \ + install-info-am install-libLTLIBRARIES \ +- install-libwpd_0_8_includeHEADERS \ +- install-libwpd_stream_0_8_includeHEADERS install-man \ ++ install-libwpd_includeHEADERS \ ++ install-libwpd_stream_includeHEADERS install-man \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags uninstall uninstall-am \ + uninstall-info-am uninstall-libLTLIBRARIES \ +- uninstall-libwpd_0_8_includeHEADERS \ +- uninstall-libwpd_stream_0_8_includeHEADERS uninstall-local ++ uninstall-libwpd_includeHEADERS \ ++ uninstall-libwpd_stream_includeHEADERS uninstall-local + + + @OS_WIN32_TRUE@install-libtool-import-lib: diff --git a/textproc/libwpd/pkg/PFRAG.shared b/textproc/libwpd/pkg/PFRAG.shared index 7f2d62051a4..0bd3f3e7066 100644 --- a/textproc/libwpd/pkg/PFRAG.shared +++ b/textproc/libwpd/pkg/PFRAG.shared @@ -1,3 +1,3 @@ -@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2006/11/10 11:13:00 robert Exp $ -@lib lib/libwpd-0.8.so.${LIBwpd-0.8_VERSION} -@lib lib/libwpd-stream-0.8.so.${LIBwpd-stream-0.8_VERSION} +@comment $OpenBSD: PFRAG.shared,v 1.2 2006/11/11 14:39:10 robert Exp $ +@lib lib/libwpd-stream.so.${LIBwpd-stream_VERSION} +@lib lib/libwpd.so.${LIBwpd_VERSION} diff --git a/textproc/libwpd/pkg/PLIST b/textproc/libwpd/pkg/PLIST index cdf38504fe2..5359b5e62b3 100644 --- a/textproc/libwpd/pkg/PLIST +++ b/textproc/libwpd/pkg/PLIST @@ -1,24 +1,23 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2006/11/10 11:13:00 robert Exp $ +@comment $OpenBSD: PLIST,v 1.2 2006/11/11 14:39:10 robert Exp $ %%SHARED%% bin/wpd2html bin/wpd2raw bin/wpd2text -include/libwpd-0.8/ -include/libwpd-0.8/libwpd/ -include/libwpd-0.8/libwpd/GSFStream.h -include/libwpd-0.8/libwpd/WPDocument.h -include/libwpd-0.8/libwpd/WPXHLListenerImpl.h -include/libwpd-0.8/libwpd/WPXProperty.h -include/libwpd-0.8/libwpd/WPXPropertyList.h -include/libwpd-0.8/libwpd/WPXPropertyListVector.h -include/libwpd-0.8/libwpd/WPXStream.h -include/libwpd-0.8/libwpd/WPXString.h -include/libwpd-0.8/libwpd/libwpd.h -include/libwpd-0.8/libwpd/libwpd_types.h -lib/libwpd-0.8.a -lib/libwpd-0.8.la -lib/libwpd-stream-0.8.a -lib/libwpd-stream-0.8.la +include/libwpd/ +include/libwpd/GSFStream.h +include/libwpd/WPDocument.h +include/libwpd/WPXHLListenerImpl.h +include/libwpd/WPXProperty.h +include/libwpd/WPXPropertyList.h +include/libwpd/WPXPropertyListVector.h +include/libwpd/WPXStream.h +include/libwpd/WPXString.h +include/libwpd/libwpd.h +include/libwpd/libwpd_types.h +lib/libwpd-stream.a +lib/libwpd-stream.la +lib/libwpd.a +lib/libwpd.la lib/pkgconfig/ -lib/pkgconfig/libwpd-0.8.pc -lib/pkgconfig/libwpd-stream-0.8.pc +lib/pkgconfig/libwpd-stream.pc +lib/pkgconfig/libwpd.pc