[Midnightbsd-cvs] mports: graphics/poppler: Update to 0.6

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun Oct 21 19:49:45 EDT 2007 

Log Message:
-----------
Update to 0.6

Modified Files:
--------------
    mports/graphics/poppler:
        Makefile (r1.4 -> r1.5)
        distinfo (r1.1 -> r1.2)
        pkg-plist (r1.1 -> r1.2)
    mports/graphics/poppler/files:
        patch-Makefile.in (r1.1 -> r1.2)
        patch-configure (r1.1 -> r1.2)
        patch-glib_Makefile.in (r1.1 -> r1.2)
        patch-qt_Makefile.in (r1.1 -> r1.2)
        patch-utils_Makefile.in (r1.1 -> r1.2)

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/graphics/poppler/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lgraphics/poppler/pkg-plist -Lgraphics/poppler/pkg-plist -u -r1.1 -r1.2
--- graphics/poppler/pkg-plist
+++ graphics/poppler/pkg-plist
@@ -14,6 +14,7 @@
 include/poppler/ErrorCodes.h
 include/poppler/FontEncodingTables.h
 include/poppler/FontInfo.h
+include/poppler/Form.h
 include/poppler/Function.cc
 include/poppler/Function.h
 include/poppler/Gfx.h
@@ -35,14 +36,16 @@
 include/poppler/PSOutputDev.h
 include/poppler/PSTokenizer.h
 include/poppler/Page.h
+include/poppler/PageTransition.h
 include/poppler/Parser.h
+include/poppler/PreScanOutputDev.h
 include/poppler/ProfileData.h
 include/poppler/SecurityHandler.h
+include/poppler/Sound.h
 include/poppler/SplashOutputDev.h
 include/poppler/Stream-CCITT.h
 include/poppler/Stream.h
 include/poppler/TextOutputDev.h
-include/poppler/UGooString.h
 include/poppler/UTF8.h
 include/poppler/UnicodeCClassTables.h
 include/poppler/UnicodeCompTables.h
@@ -89,7 +92,7 @@
 lib/libpoppler.a
 lib/libpoppler.la
 lib/libpoppler.so
-lib/libpoppler.so.1
+lib/libpoppler.so.2
 libdata/pkgconfig/poppler-cairo.pc
 libdata/pkgconfig/poppler-splash.pc
 libdata/pkgconfig/poppler.pc
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/graphics/poppler/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lgraphics/poppler/Makefile -Lgraphics/poppler/Makefile -u -r1.4 -r1.5
--- graphics/poppler/Makefile
+++ graphics/poppler/Makefile
@@ -8,8 +8,7 @@
 #
 
 PORTNAME=	poppler
-PORTVERSION=	0.5.3
-PORTREVISION?=	3
+PORTVERSION=	0.6
 CATEGORIES=	graphics print
 MASTER_SITES=	http://poppler.freedesktop.org/
 
@@ -20,13 +19,13 @@
 USE_GMAKE=	yes
 USE_XLIB=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME=	gnomehack gnometarget
-INSTALLS_SHLIB=	yes
+USE_GNOME=	gnomehack gnometarget libxml2
+USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-zlib \
 		--enable-xpdf-headers \
 		--with-html-dir=${DOCSDIR}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
+		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
 .if !defined(SLAVEPORT)
 OPTIONS=	CAIRO "Enable cairo output backend" on
@@ -35,27 +34,48 @@
 .include <bsd.port.pre.mk>
 
 .if defined(SLAVEPORT)
-LIB_DEPENDS+=	poppler.1:${PORTSDIR}/graphics/poppler
+LIB_DEPENDS+=	poppler.2:${PORTSDIR}/graphics/poppler
 .if ${SLAVEPORT}=="gtk"
 CONFIGURE_ARGS+=--enable-poppler-glib
 USE_GNOME+=	gtk20
 BUILD_WRKSRC=	${WRKSRC}/glib
 INSTALL_WRKSRC=	${WRKSRC}/glib
-.elif ${SLAVEPORT}=="qt"
+.else
+CONFIGURE_ARGS+=--disable-poppler-glib
+.endif 
+
+.if ${SLAVEPORT}=="qt"
 CONFIGURE_ARGS+=--enable-poppler-qt
 USE_QT_VER+=	3
 BUILD_WRKSRC=	${WRKSRC}/qt
 INSTALL_WRKSRC=	${WRKSRC}/qt
 # blah.. USE_QT_VER can't be defined after bsd.port.pre.mk
 .include "${PORTSDIR}/Mk/bsd.kde.mk"
-.elif ${SLAVEPORT}=="utils"
+.else
+CONFIGURE_ARGS+=--disable-poppler-qt
+.endif
+
+.if ${SLAVEPORT}=="qt4"
+CONFIGURE_ARGS+=--enable-poppler-qt4
+USE_QT_VER+=	4
+QT_COMPONENTS=	gui corelib xml qtestlib
+#BUILD_WRKSRC=	${WRKSRC}/qt4
+INSTALL_WRKSRC=	${WRKSRC}/qt4
+.else
+CONFIGURE_ARGS+=--disable-poppler-qt4
+.endif
+
+.if ${SLAVEPORT}=="utils"
 CONFIGURE_ARGS+=--enable-utils
 CONFLICTS=	xpdf-[0-9]*
 BUILD_WRKSRC=	${WRKSRC}/utils
 INSTALL_WRKSRC=	${WRKSRC}/utils
 MAN1=	pdffonts.1 pdfimages.1 pdfinfo.1 \
 	pdftohtml.1  pdftops.1 pdftotext.1 pdftoppm.1
+.else 
+CONFIGURE_ARGS+=--disable-utils
 .endif
+
 .else
 CONFIGURE_ARGS+=--disable-poppler-glib --disable-poppler-qt \
 		--disable-poppler-qt4 --disable-utils
@@ -80,6 +100,8 @@
 	${INSTALL_DATA} ${WRKSRC}/poppler-glib.pc ${PREFIX}/libdata/pkgconfig
 .elif ${SLAVEPORT}=="qt"
 	${INSTALL_DATA} ${WRKSRC}/poppler-qt.pc ${PREFIX}/libdata/pkgconfig
+.elif ${SLAVEPORT}=="qt4"
+	${INSTALL_DATA} ${WRKSRC}/poppler-qt4.pc ${PREFIX}/libdata/pkgconfig
 .endif
 .endif
 
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/graphics/poppler/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lgraphics/poppler/distinfo -Lgraphics/poppler/distinfo -u -r1.1 -r1.2
--- graphics/poppler/distinfo
+++ graphics/poppler/distinfo
@@ -1,3 +1,3 @@
-MD5 (poppler-0.5.3.tar.gz) = d06207536555f5711e7bc61711c1b8a0
-SHA256 (poppler-0.5.3.tar.gz) = 5cfabff39670610fa8f5c33da7b9b0ae89d445445be6d6c245cdce8bf3f24190
-SIZE (poppler-0.5.3.tar.gz) = 1049900
+MD5 (poppler-0.6.tar.gz) = 96883867572aa1e55e979ec75369c562
+SHA256 (poppler-0.6.tar.gz) = ef4bb8fd1bb4dffd5dc689509bf3e33260774550425ee78995a8d0297f76bfae
+SIZE (poppler-0.6.tar.gz) = 1228142
Index: patch-utils_Makefile.in
===================================================================
RCS file: /home/cvs/mports/graphics/poppler/files/patch-utils_Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lgraphics/poppler/files/patch-utils_Makefile.in -Lgraphics/poppler/files/patch-utils_Makefile.in -u -r1.1 -r1.2
--- graphics/poppler/files/patch-utils_Makefile.in
+++ graphics/poppler/files/patch-utils_Makefile.in
@@ -1,32 +1,40 @@
---- utils/Makefile.in.orig	Sat May  6 22:21:41 2006
-+++ utils/Makefile.in	Sat May  6 22:22:56 2006
-@@ -61,42 +61,35 @@ am_pdffonts_OBJECTS = pdffonts.$(OBJEXT)
+--- utils/Makefile.in.orig	Wed Jun 20 07:19:52 2007
++++ utils/Makefile.in	Wed Jun 20 07:29:29 2007
+@@ -62,49 +62,41 @@
  pdffonts_OBJECTS = $(am_pdffonts_OBJECTS)
  pdffonts_LDADD = $(LDADD)
  am__DEPENDENCIES_1 =
 -pdffonts_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
 -	$(am__DEPENDENCIES_1)
-+pdffonts_DEPENDENCIES = $(am__DEPENDENCIES_1)
++pdffonts_DEPENDENCIES =	$(am__DEPENDENCIES_1)
  am_pdfimages_OBJECTS = pdfimages.$(OBJEXT) ImageOutputDev.$(OBJEXT) \
  	$(am__objects_1)
  pdfimages_OBJECTS = $(am_pdfimages_OBJECTS)
  pdfimages_LDADD = $(LDADD)
 -pdfimages_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
 -	$(am__DEPENDENCIES_1)
-+pdfimages_DEPENDENCIES = $(am__DEPENDENCIES_1)
++pdfimages_DEPENDENCIES =	$(am__DEPENDENCIES_1)
  am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) $(am__objects_1)
  pdfinfo_OBJECTS = $(am_pdfinfo_OBJECTS)
  pdfinfo_LDADD = $(LDADD)
 -pdfinfo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
 -	$(am__DEPENDENCIES_1)
-+pdfinfo_DEPENDENCIES = $(am__DEPENDENCIES_1)
++pdfinfo_DEPENDENCIES =	$(am__DEPENDENCIES_1)
+ am__pdftoabw_SOURCES_DIST = pdftoabw.cc parseargs.c parseargs.h
+ @BUILD_ABIWORD_OUTPUT_TRUE at am_pdftoabw_OBJECTS = pdftoabw.$(OBJEXT) \
+ @BUILD_ABIWORD_OUTPUT_TRUE@	$(am__objects_1)
+ pdftoabw_OBJECTS = $(am_pdftoabw_OBJECTS)
+ pdftoabw_LDADD = $(LDADD)
+-pdftoabw_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
+-	$(am__DEPENDENCIES_1)
++pdftoabw_DEPENDENCIES =	$(am__DEPENDENCIES_1)
  am_pdftohtml_OBJECTS = pdftohtml.$(OBJEXT) HtmlFonts.$(OBJEXT) \
  	HtmlLinks.$(OBJEXT) HtmlOutputDev.$(OBJEXT) $(am__objects_1)
  pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS)
  pdftohtml_LDADD = $(LDADD)
 -pdftohtml_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
 -	$(am__DEPENDENCIES_1)
-+pdftohtml_DEPENDENCIES = $(am__DEPENDENCIES_1)
++pdftohtml_DEPENDENCIES = 	$(am__DEPENDENCIES_1)
  am__pdftoppm_SOURCES_DIST = pdftoppm.cc parseargs.c parseargs.h
  @BUILD_SPLASH_OUTPUT_TRUE at am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT) \
  @BUILD_SPLASH_OUTPUT_TRUE@	$(am__objects_1)
@@ -34,28 +42,28 @@
  pdftoppm_LDADD = $(LDADD)
 -pdftoppm_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
 -	$(am__DEPENDENCIES_1)
-+pdftoppm_DEPENDENCIES = $(am__DEPENDENCIES_1)
++pdftoppm_DEPENDENCIES =	$(am__DEPENDENCIES_1)
  am_pdftops_OBJECTS = pdftops.$(OBJEXT) $(am__objects_1)
  pdftops_OBJECTS = $(am_pdftops_OBJECTS)
  pdftops_LDADD = $(LDADD)
 -pdftops_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
 -	$(am__DEPENDENCIES_1)
-+pdftops_DEPENDENCIES = $(am__DEPENDENCIES_1)
++pdftops_DEPENDENCIES = 	$(am__DEPENDENCIES_1)
  am_pdftotext_OBJECTS = pdftotext.$(OBJEXT) $(am__objects_1)
  pdftotext_OBJECTS = $(am_pdftotext_OBJECTS)
  pdftotext_LDADD = $(LDADD)
 -pdftotext_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
 -	$(am__DEPENDENCIES_1)
-+pdftotext_DEPENDENCIES = $(am__DEPENDENCIES_1)
++pdftotext_DEPENDENCIES = 	$(am__DEPENDENCIES_1)
  DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/poppler
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__depfiles_maybe = depfiles
-@@ -294,7 +287,7 @@ INCLUDES = \
- 	$(UTILS_CFLAGS)
+@@ -318,7 +310,7 @@
+ 	$(ABIWORD_CFLAGS)
  
  LDADD = \
 -	$(top_builddir)/poppler/libpoppler.la	\
 +	-lpoppler				\
- 	$(UTILS_LIBS)
- 
+ 	$(UTILS_LIBS)				\
+ 	$(FONTCONFIG_LIBS)
  
Index: patch-configure
===================================================================
RCS file: /home/cvs/mports/graphics/poppler/files/patch-configure,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lgraphics/poppler/files/patch-configure -Lgraphics/poppler/files/patch-configure -u -r1.1 -r1.2
--- graphics/poppler/files/patch-configure
+++ graphics/poppler/files/patch-configure
@@ -1,11 +1,11 @@
---- configure.orig	Tue May 23 08:07:51 2006
-+++ configure	Tue May 23 08:08:07 2006
-@@ -24856,7 +24856,7 @@
+--- configure.orig	Tue Jul  3 17:06:02 2007
++++ configure	Tue Jul  3 17:06:36 2007
+@@ -25848,7 +25848,7 @@
      fi
  fi
  
 -if test "x$have_qt" == "xyes"; then
 +if test "x$have_qt" = "xyes"; then
-     ac_ext=cc
+     ac_ext=cpp
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
Index: patch-qt_Makefile.in
===================================================================
RCS file: /home/cvs/mports/graphics/poppler/files/patch-qt_Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lgraphics/poppler/files/patch-qt_Makefile.in -Lgraphics/poppler/files/patch-qt_Makefile.in -u -r1.1 -r1.2
--- graphics/poppler/files/patch-qt_Makefile.in
+++ graphics/poppler/files/patch-qt_Makefile.in
@@ -1,39 +1,40 @@
---- qt/Makefile.in.orig	Thu Jan 12 21:37:56 2006
-+++ qt/Makefile.in	Thu Jan 12 21:38:47 2006
-@@ -63,16 +63,14 @@
+--- qt/Makefile.in.orig	Wed Jun 20 07:19:52 2007
++++ qt/Makefile.in	Wed Jun 20 07:30:01 2007
+@@ -63,8 +63,7 @@
  libLTLIBRARIES_INSTALL = $(INSTALL)
  LTLIBRARIES = $(lib_LTLIBRARIES)
  am__DEPENDENCIES_1 =
 -libpoppler_qt_la_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
--	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-+libpoppler_qt_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++libpoppler_qt_la_DEPENDENCIES = 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1)
  am_libpoppler_qt_la_OBJECTS = poppler-document.lo poppler-fontinfo.lo \
- 	poppler-page.lo poppler-page-transition.lo
- libpoppler_qt_la_OBJECTS = $(am_libpoppler_qt_la_OBJECTS)
+ 	poppler-link.lo poppler-page.lo poppler-page-transition.lo
+@@ -72,8 +71,7 @@
  PROGRAMS = $(noinst_PROGRAMS)
  am_test_poppler_qt_OBJECTS = test-poppler-qt.$(OBJEXT)
  test_poppler_qt_OBJECTS = $(am_test_poppler_qt_OBJECTS)
 -test_poppler_qt_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
 -	libpoppler-qt.la $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-+test_poppler_qt_DEPENDENCIES = libpoppler-qt.la $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
++test_poppler_qt_DEPENDENCIES = 	libpoppler-qt.la $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
  DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/poppler
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__depfiles_maybe = depfiles
-@@ -273,7 +271,7 @@
+@@ -286,7 +284,7 @@
  	poppler-private.h
  
  libpoppler_qt_la_LIBADD = \
 -	$(top_builddir)/poppler/libpoppler.la	\
-+	-lpoppler				\
++	-lpoppler -lqt-mt			\
  	$(POPPLER_QT_LIBS)			\
- 	$(FREETYPE_LIBS)
- 
-@@ -281,7 +279,7 @@
+ 	$(FREETYPE_LIBS)			\
+ 	$(FONTCONFIG_LIBS)
+@@ -296,7 +294,7 @@
         test-poppler-qt.cpp
  
  test_poppler_qt_LDADD = \
 -	$(top_builddir)/poppler/libpoppler.la	\
-+	-lpoppler				\
++	-lpoppler -lqt-mt			\
  	libpoppler-qt.la			\
  	$(POPPLER_QT_LIBS)			\
  	$(FREETYPE_LIBS)
Index: patch-Makefile.in
===================================================================
RCS file: /home/cvs/mports/graphics/poppler/files/patch-Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lgraphics/poppler/files/patch-Makefile.in -Lgraphics/poppler/files/patch-Makefile.in -u -r1.1 -r1.2
--- graphics/poppler/files/patch-Makefile.in
+++ graphics/poppler/files/patch-Makefile.in
@@ -1,20 +1,24 @@
---- Makefile.in.orig	Tue May 23 07:59:21 2006
-+++ Makefile.in	Tue May 23 08:00:41 2006
+--- Makefile.in.orig	Thu Sep 21 20:54:29 2006
++++ Makefile.in	Sat Sep 30 10:51:57 2006
 @@ -76,7 +76,7 @@
  DATA = $(pkgconfig_DATA)
  ETAGS = etags
  CTAGS = ctags
 -DIST_SUBDIRS = goo fofi splash poppler utils glib qt test qt4
-+DIST_SUBDIRS = goo fofi splash poppler utils glib qt qt4
++DIST_SUBDIRS = goo fofi splash poppler utils glib qt
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  distdir = $(PACKAGE)-$(VERSION)
  top_distdir = $(distdir)
-@@ -254,7 +254,7 @@
- @BUILD_POPPLER_QT4_TRUE at qt4_subdir = qt4
+@@ -254,10 +254,10 @@
+ @BUILD_POPPLER_GLIB_TRUE at glib_pc_file = poppler-glib.pc
+ @BUILD_POPPLER_QT_TRUE at qt_subdir = qt
+ @BUILD_POPPLER_QT_TRUE at qt_pc_file = poppler-qt.pc
+- at BUILD_POPPLER_QT4_TRUE@qt4_subdir = qt4
++ at BUILD_POPPLER_QT4_TRUE@qt4_subdir =
  @BUILD_POPPLER_QT4_TRUE at qt4_pc_file = poppler-qt4.pc
  @BUILD_UTILS_TRUE at utils_subdir = utils
 -SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) $(qt_subdir) test $(qt4_subdir)
-+SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) $(qt_subdir) $(qt4_subdir)
++SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) $(qt_subdir)
  EXTRA_DIST = \
  	README-XPDF				\
  	poppler.pc.in				\
Index: patch-glib_Makefile.in
===================================================================
RCS file: /home/cvs/mports/graphics/poppler/files/patch-glib_Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lgraphics/poppler/files/patch-glib_Makefile.in -Lgraphics/poppler/files/patch-glib_Makefile.in -u -r1.1 -r1.2
--- graphics/poppler/files/patch-glib_Makefile.in
+++ graphics/poppler/files/patch-glib_Makefile.in
@@ -1,15 +1,14 @@
---- glib/Makefile.in.orig	Tue May 23 08:12:00 2006
-+++ glib/Makefile.in	Tue May 23 08:13:09 2006
-@@ -66,7 +66,7 @@
+--- glib/Makefile.in.orig	2007-09-10 23:46:36.000000000 -0400
++++ glib/Makefile.in	2007-09-10 23:49:39.000000000 -0400
+@@ -66,7 +66,6 @@ am__DEPENDENCIES_1 =
  @BUILD_CAIRO_OUTPUT_TRUE at am__DEPENDENCIES_2 = $(top_builddir)/poppler/libpoppler-cairo.la \
  @BUILD_CAIRO_OUTPUT_TRUE@	$(am__DEPENDENCIES_1)
  libpoppler_glib_la_DEPENDENCIES =  \
 -	$(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) \
-+	$(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_2)
  am__objects_1 = poppler-enums.lo
- am_libpoppler_glib_la_OBJECTS = $(am__objects_1) poppler-action.lo \
-@@ -77,7 +77,7 @@
+@@ -78,7 +77,7 @@ PROGRAMS = $(noinst_PROGRAMS)
  am_test_poppler_glib_OBJECTS = test-poppler-glib.$(OBJEXT)
  test_poppler_glib_OBJECTS = $(am_test_poppler_glib_OBJECTS)
  test_poppler_glib_DEPENDENCIES =  \
@@ -18,7 +17,16 @@
  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
  	$(am__DEPENDENCIES_2)
  DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/poppler
-@@ -310,7 +310,7 @@
+@@ -285,7 +284,7 @@ win32_libs = @win32_libs@
+ @BUILD_CAIRO_OUTPUT_TRUE@	$(top_builddir)/poppler/libpoppler-cairo.la	\
+ @BUILD_CAIRO_OUTPUT_TRUE@	$(CAIRO_LIBS)
+ 
+-SUBDIRS = . reference demo
++SUBDIRS = . reference
+ INCLUDES = \
+ 	-DG_LOG_DOMAIN=\"Poppler\"		\
+ 	-I$(top_srcdir)				\
+@@ -323,7 +322,7 @@ libpoppler_glib_la_SOURCES = \
  	poppler-private.h
  
  libpoppler_glib_la_LIBADD = \
@@ -26,8 +34,8 @@
 +	-lpoppler					\
  	$(POPPLER_GLIB_LIBS)				\
  	$(FREETYPE_LIBS)				\
- 	$(cairo_libs)
-@@ -320,7 +320,7 @@
+ 	$(FONTCONFIG_LIBS)				\
+@@ -334,7 +333,7 @@ test_poppler_glib_SOURCES = \
         test-poppler-glib.c
  
  test_poppler_glib_LDADD = \

More information about the Midnightbsd-cvs mailing list