summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authorkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2010-07-07 21:03:19 +0800
committerkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2010-07-07 21:03:19 +0800
commitfe7d389208aef5db19259c314ec32a5ec21ed7e0 (patch)
tree76cdcd857aed30d4546e12f99c3771688e8ea976 /graphics
parent98963313d919be955763a7e7f6a7a2c003e8d0e3 (diff)
downloadmarcuscom-ports-fe7d389208aef5db19259c314ec32a5ec21ed7e0.tar.gz
marcuscom-ports-fe7d389208aef5db19259c314ec32a5ec21ed7e0.tar.zst
marcuscom-ports-fe7d389208aef5db19259c314ec32a5ec21ed7e0.zip
Was too fast in the previous commit.
Fix the slave ports, correct some patches. Also poppler lib got bumped. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14302 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'graphics')
-rw-r--r--graphics/poppler-gtk/Makefile23
-rw-r--r--graphics/poppler-gtk/pkg-plist40
-rw-r--r--graphics/poppler-qt/Makefile19
-rw-r--r--graphics/poppler-qt/pkg-plist9
-rw-r--r--graphics/poppler-qt4/Makefile19
-rw-r--r--graphics/poppler-qt4/pkg-plist13
-rw-r--r--graphics/poppler-utils/Makefile19
-rw-r--r--graphics/poppler-utils/pkg-plist8
-rw-r--r--graphics/poppler/Makefile4
-rw-r--r--graphics/poppler/files/patch-glib_Makefile.in28
10 files changed, 169 insertions, 13 deletions
diff --git a/graphics/poppler-gtk/Makefile b/graphics/poppler-gtk/Makefile
new file mode 100644
index 000000000..1ebdddf7a
--- /dev/null
+++ b/graphics/poppler-gtk/Makefile
@@ -0,0 +1,23 @@
+# New ports collection makefile for: poppler-gtk
+# Date created: 2006-01-12
+# Whom: Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/graphics/poppler-gtk/Makefile,v 1.18 2010/03/14 22:08:42 kwm Exp $
+#
+
+PORTREVISION= 0
+PKGNAMESUFFIX= -gtk
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= Gtk bindings to poppler
+
+MASTERDIR= ${.CURDIR}/../../graphics/poppler
+SLAVEPORT= gtk
+PLIST= ${.CURDIR}/pkg-plist
+
+pre-build:
+ cd ${WRKSRC}/poppler && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
+ Makefile ${MAKE_ARGS} libpoppler-cairo.la
+
+.include "${MASTERDIR}/Makefile"
diff --git a/graphics/poppler-gtk/pkg-plist b/graphics/poppler-gtk/pkg-plist
new file mode 100644
index 000000000..239a7305d
--- /dev/null
+++ b/graphics/poppler-gtk/pkg-plist
@@ -0,0 +1,40 @@
+include/poppler/glib/poppler-action.h
+include/poppler/glib/poppler-annot.h
+include/poppler/glib/poppler-attachment.h
+include/poppler/glib/poppler-date.h
+include/poppler/glib/poppler-document.h
+include/poppler/glib/poppler-enums.h
+include/poppler/glib/poppler-features.h
+include/poppler/glib/poppler-form-field.h
+include/poppler/glib/poppler-layer.h
+include/poppler/glib/poppler-media.h
+include/poppler/glib/poppler-movie.h
+include/poppler/glib/poppler-page.h
+include/poppler/glib/poppler.h
+lib/libpoppler-glib.a
+lib/libpoppler-glib.la
+lib/libpoppler-glib.so
+lib/libpoppler-glib.so.5
+libdata/pkgconfig/poppler-glib.pc
+%%DOCSDIR%%/poppler/ch01.html
+%%DOCSDIR%%/poppler/home.png
+%%DOCSDIR%%/poppler/index.html
+%%DOCSDIR%%/poppler/index.sgml
+%%DOCSDIR%%/poppler/left.png
+%%DOCSDIR%%/poppler/poppler-poppler-action.html
+%%DOCSDIR%%/poppler/poppler-poppler-annot.html
+%%DOCSDIR%%/poppler/poppler-poppler-document.html
+%%DOCSDIR%%/poppler/poppler-poppler-enums.html
+%%DOCSDIR%%/poppler/poppler-poppler-features.html
+%%DOCSDIR%%/poppler/poppler-poppler-form-field.html
+%%DOCSDIR%%/poppler/poppler-poppler-layer.html
+%%DOCSDIR%%/poppler/poppler-poppler-page.html
+%%DOCSDIR%%/poppler/poppler-poppler.html
+%%DOCSDIR%%/poppler/poppler.devhelp
+%%DOCSDIR%%/poppler/poppler.devhelp2
+%%DOCSDIR%%/poppler/right.png
+%%DOCSDIR%%/poppler/style.css
+%%DOCSDIR%%/poppler/up.png
+@dirrmtry %%DOCSDIR%%/poppler
+@dirrmtry %%DOCSDIR%%
+@dirrm include/poppler/glib
diff --git a/graphics/poppler-qt/Makefile b/graphics/poppler-qt/Makefile
new file mode 100644
index 000000000..228a53271
--- /dev/null
+++ b/graphics/poppler-qt/Makefile
@@ -0,0 +1,19 @@
+# New ports collection makefile for: poppler-qt
+# Date created: 2006-01-12
+# Whom: Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/graphics/poppler-qt/Makefile,v 1.11 2010/03/14 22:08:43 kwm Exp $
+#
+
+PORTREVISION= 0
+PKGNAMESUFFIX= -qt
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= Qt bindings to poppler
+
+MASTERDIR= ${.CURDIR}/../../graphics/poppler
+SLAVEPORT= qt
+PLIST= ${.CURDIR}/pkg-plist
+
+.include "${MASTERDIR}/Makefile"
diff --git a/graphics/poppler-qt/pkg-plist b/graphics/poppler-qt/pkg-plist
new file mode 100644
index 000000000..77f6db2e2
--- /dev/null
+++ b/graphics/poppler-qt/pkg-plist
@@ -0,0 +1,9 @@
+include/poppler/qt3/poppler-link-qt3.h
+include/poppler/qt3/poppler-page-transition.h
+include/poppler/qt3/poppler-qt.h
+lib/libpoppler-qt.a
+lib/libpoppler-qt.la
+lib/libpoppler-qt.so
+lib/libpoppler-qt.so.2
+libdata/pkgconfig/poppler-qt.pc
+@dirrm include/poppler/qt3
diff --git a/graphics/poppler-qt4/Makefile b/graphics/poppler-qt4/Makefile
new file mode 100644
index 000000000..d64da7bb3
--- /dev/null
+++ b/graphics/poppler-qt4/Makefile
@@ -0,0 +1,19 @@
+# New ports collection makefile for: poppler-qt4
+# Date created: June 26, 2007
+# Whom: Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/graphics/poppler-qt4/Makefile,v 1.13 2010/03/14 22:08:43 kwm Exp $
+#
+
+PORTREVISION= 0
+PKGNAMESUFFIX= -qt4
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= Qt4 bindings to poppler
+
+MASTERDIR= ${.CURDIR}/../../graphics/poppler
+SLAVEPORT= qt4
+PLIST= ${.CURDIR}/pkg-plist
+
+.include "${MASTERDIR}/Makefile"
diff --git a/graphics/poppler-qt4/pkg-plist b/graphics/poppler-qt4/pkg-plist
new file mode 100644
index 000000000..d49be2071
--- /dev/null
+++ b/graphics/poppler-qt4/pkg-plist
@@ -0,0 +1,13 @@
+include/poppler/qt4/poppler-annotation.h
+include/poppler/qt4/poppler-export.h
+include/poppler/qt4/poppler-form.h
+include/poppler/qt4/poppler-link.h
+include/poppler/qt4/poppler-optcontent.h
+include/poppler/qt4/poppler-page-transition.h
+include/poppler/qt4/poppler-qt4.h
+lib/libpoppler-qt4.a
+lib/libpoppler-qt4.la
+lib/libpoppler-qt4.so
+lib/libpoppler-qt4.so.3
+libdata/pkgconfig/poppler-qt4.pc
+@dirrm include/poppler/qt4
diff --git a/graphics/poppler-utils/Makefile b/graphics/poppler-utils/Makefile
new file mode 100644
index 000000000..d054ca843
--- /dev/null
+++ b/graphics/poppler-utils/Makefile
@@ -0,0 +1,19 @@
+# New ports collection makefile for: poppler-utils
+# Date created: 2006-05-01
+# Whom: Michael Nottebrock <lofi@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/graphics/poppler-utils/Makefile,v 1.3 2009/08/27 14:48:12 kwm Exp $
+#
+
+PORTREVISION= 0
+PKGNAMESUFFIX= -utils
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= Poppler's xpdf-workalike command line utilities
+
+MASTERDIR= ${.CURDIR}/../../graphics/poppler
+SLAVEPORT= utils
+PLIST= ${.CURDIR}/pkg-plist
+
+.include "${MASTERDIR}/Makefile"
diff --git a/graphics/poppler-utils/pkg-plist b/graphics/poppler-utils/pkg-plist
new file mode 100644
index 000000000..0b49f0caa
--- /dev/null
+++ b/graphics/poppler-utils/pkg-plist
@@ -0,0 +1,8 @@
+bin/pdffonts
+bin/pdfimages
+bin/pdfinfo
+bin/pdftoabw
+bin/pdftohtml
+bin/pdftoppm
+bin/pdftops
+bin/pdftotext
diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile
index fddbb9f79..906740f8f 100644
--- a/graphics/poppler/Makefile
+++ b/graphics/poppler/Makefile
@@ -3,7 +3,7 @@
# Whom: marcus@FreeBSD.org
#
# $FreeBSD$
-# $MCom: ports/graphics/poppler/Makefile,v 1.58 2010/03/14 22:08:42 kwm Exp $
+# $MCom: ports/graphics/poppler/Makefile,v 1.60 2010/07/07 12:25:48 kwm Exp $
#
PORTNAME= poppler
@@ -40,7 +40,7 @@ OPTIONS= CAIRO "Enable cairo output backend" on \
.include <bsd.port.pre.mk>
.if defined(SLAVEPORT)
-LIB_DEPENDS+= poppler.5:${PORTSDIR}/graphics/poppler
+LIB_DEPENDS+= poppler.6:${PORTSDIR}/graphics/poppler
.if ${SLAVEPORT}=="gtk"
CONFIGURE_ARGS+=--enable-poppler-glib
diff --git a/graphics/poppler/files/patch-glib_Makefile.in b/graphics/poppler/files/patch-glib_Makefile.in
index c3c88818f..25915a70e 100644
--- a/graphics/poppler/files/patch-glib_Makefile.in
+++ b/graphics/poppler/files/patch-glib_Makefile.in
@@ -1,15 +1,14 @@
---- glib/Makefile.in.orig 2010-07-07 14:12:26.000000000 +0200
-+++ glib/Makefile.in 2010-07-07 14:14:09.000000000 +0200
-@@ -81,8 +81,6 @@
+--- glib//Makefile.in.orig 2010-07-07 14:30:15.000000000 +0200
++++ glib/Makefile.in 2010-07-07 14:33:14.000000000 +0200
+@@ -81,7 +81,6 @@
LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 =
libpoppler_glib_la_DEPENDENCIES = \
- $(top_builddir)/poppler/libpoppler.la \
-- $(top_builddir)/poppler/libpoppler-cairo.la \
+ $(top_builddir)/poppler/libpoppler-cairo.la \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- am__objects_1 = poppler-enums.lo
-@@ -104,8 +102,7 @@
+@@ -104,8 +103,7 @@
@BUILD_WITH_GDK_TRUE@ test-poppler-glib.$(OBJEXT)
test_poppler_glib_OBJECTS = $(am_test_poppler_glib_OBJECTS)
@BUILD_WITH_GDK_TRUE@test_poppler_glib_DEPENDENCIES = \
@@ -19,18 +18,25 @@
@BUILD_WITH_GDK_TRUE@ $(am__DEPENDENCIES_1) \
@BUILD_WITH_GDK_TRUE@ $(am__DEPENDENCIES_1)
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler
-@@ -436,8 +433,8 @@
+@@ -383,7 +381,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ win32_libs = @win32_libs@
+-SUBDIRS = . reference demo
++SUBDIRS = . reference
+ INCLUDES = \
+ -DG_LOG_DOMAIN=\"Poppler\" \
+ -I$(top_srcdir) \
+@@ -436,7 +434,7 @@
poppler-private.h
libpoppler_glib_la_LIBADD = \
- $(top_builddir)/poppler/libpoppler.la \
-- $(top_builddir)/poppler/libpoppler-cairo.la \
+ -lpoppler \
-+ -lpoppler-cairo \
+ $(top_builddir)/poppler/libpoppler-cairo.la \
$(POPPLER_GLIB_LIBS) \
$(GDK_LIBS) \
- $(FREETYPE_LIBS) \
-@@ -448,7 +445,7 @@
+@@ -448,7 +446,7 @@
@BUILD_WITH_GDK_TRUE@ test-poppler-glib.cc
@BUILD_WITH_GDK_TRUE@test_poppler_glib_LDADD = \