summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authorkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2010-08-14 22:52:24 +0800
committerkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2010-08-14 22:52:24 +0800
commite493cc4d5f48398fd6534b3dbc1659b65e95d1e2 (patch)
tree90c2e4194a2e848eaa97d110d81406e95f6c6104 /graphics
parent228d850a79a5a37d78c3c01baa793e0148ca6189 (diff)
downloadmarcuscom-ports-e493cc4d5f48398fd6534b3dbc1659b65e95d1e2.tar
marcuscom-ports-e493cc4d5f48398fd6534b3dbc1659b65e95d1e2.tar.gz
marcuscom-ports-e493cc4d5f48398fd6534b3dbc1659b65e95d1e2.tar.bz2
marcuscom-ports-e493cc4d5f48398fd6534b3dbc1659b65e95d1e2.tar.lz
marcuscom-ports-e493cc4d5f48398fd6534b3dbc1659b65e95d1e2.tar.xz
marcuscom-ports-e493cc4d5f48398fd6534b3dbc1659b65e95d1e2.tar.zst
marcuscom-ports-e493cc4d5f48398fd6534b3dbc1659b65e95d1e2.zip
Update to 0.14.2.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14403 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'graphics')
-rw-r--r--graphics/poppler/Makefile8
-rw-r--r--graphics/poppler/distinfo6
-rw-r--r--graphics/poppler/files/patch-glib_Makefile.in16
3 files changed, 16 insertions, 14 deletions
diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile
index af5af66ca..7af1997c0 100644
--- a/graphics/poppler/Makefile
+++ b/graphics/poppler/Makefile
@@ -3,11 +3,11 @@
# Whom: marcus@FreeBSD.org
#
# $FreeBSD$
-# $MCom: ports/graphics/poppler/Makefile,v 1.61 2010/07/07 13:03:18 kwm Exp $
+# $MCom: ports/graphics/poppler/Makefile,v 1.62 2010/07/12 06:33:13 kwm Exp $
#
PORTNAME= poppler
-PORTVERSION= 0.14.1
+PORTVERSION= 0.14.2
PORTREVISION?= 0
CATEGORIES= graphics print
MASTER_SITES= http://poppler.freedesktop.org/
@@ -112,11 +112,13 @@ LIB_DEPENDS+= openjpeg.2:${PORTSDIR}/graphics/openjpeg
.endif
post-patch:
+ @${REINPLACE_CMD} -e 's|7:0:0|6:0:0|' ${WRKSRC}/poppler/Makefile.in
+
.if defined(SLAVEPORT) && ${SLAVEPORT}=="qt"
@${REINPLACE_CMD} -e 's|/usr/local/qt/include|${LOCALBASE}/include|; \
+ s|$$QTDIR|${QT_PREFIX}|; \
s|/usr/local/qt/lib|${LOCALBASE}/lib|' \
${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's|$$QTDIR|${QT_PREFIX}|' ${WRKSRC}/configure
.endif
.if defined(SLAVEPORT) && ${SLAVEPORT}=="qt4"
@${REINPLACE_CMD} -e 's|MOCQT4=`.*|MOCQT4="${LOCALBASE}/bin/moc-qt4"|' \
diff --git a/graphics/poppler/distinfo b/graphics/poppler/distinfo
index 2539d2a5c..bf03924a9 100644
--- a/graphics/poppler/distinfo
+++ b/graphics/poppler/distinfo
@@ -1,3 +1,3 @@
-MD5 (poppler-0.14.1.tar.gz) = 1d27cb8a09aaa373660fd608b258022a
-SHA256 (poppler-0.14.1.tar.gz) = efe59b33585791ef6714fa33a6d62b8746d6352c4f57a093f03364b0979bfa3e
-SIZE (poppler-0.14.1.tar.gz) = 1782771
+MD5 (poppler-0.14.2.tar.gz) = f050ade7438aa45e50f94b3f86848d28
+SHA256 (poppler-0.14.2.tar.gz) = 6fb0c80f4079bd70f7d5d36058b66614649420942759c40c0b82ded33ae683c9
+SIZE (poppler-0.14.2.tar.gz) = 1791177
diff --git a/graphics/poppler/files/patch-glib_Makefile.in b/graphics/poppler/files/patch-glib_Makefile.in
index 25915a70e..4afb4b2aa 100644
--- a/graphics/poppler/files/patch-glib_Makefile.in
+++ b/graphics/poppler/files/patch-glib_Makefile.in
@@ -1,6 +1,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 @@
+--- glib/Makefile.in.orig 2010-08-14 16:50:48.000000000 +0200
++++ glib/Makefile.in 2010-08-14 16:50:48.000000000 +0200
+@@ -82,7 +82,6 @@
LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 =
libpoppler_glib_la_DEPENDENCIES = \
@@ -8,7 +8,7 @@
$(top_builddir)/poppler/libpoppler-cairo.la \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-@@ -104,8 +103,7 @@
+@@ -105,8 +104,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 = \
@@ -18,16 +18,16 @@
@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
-@@ -383,7 +381,7 @@
- top_builddir = @top_builddir@
+@@ -386,7 +384,7 @@
top_srcdir = @top_srcdir@
win32_libs = @win32_libs@
+ AM_LDFLAGS = @auto_import_flags@
-SUBDIRS = . reference demo
+SUBDIRS = . reference
INCLUDES = \
-DG_LOG_DOMAIN=\"Poppler\" \
-I$(top_srcdir) \
-@@ -436,7 +434,7 @@
+@@ -439,7 +437,7 @@
poppler-private.h
libpoppler_glib_la_LIBADD = \
@@ -36,7 +36,7 @@
$(top_builddir)/poppler/libpoppler-cairo.la \
$(POPPLER_GLIB_LIBS) \
$(GDK_LIBS) \
-@@ -448,7 +446,7 @@
+@@ -451,7 +449,7 @@
@BUILD_WITH_GDK_TRUE@ test-poppler-glib.cc
@BUILD_WITH_GDK_TRUE@test_poppler_glib_LDADD = \