On 5/1/06, Michael Nottebrock <[EMAIL PROTECTED]> wrote:
I have an idea, why not just leave kdegraphics depending on xpdf
and we can go ahead and commit poppler-utils and bump PORTREVISION
on poppler so kde and gnome will get along again. This way nobody on
the kde side will have to rebuild anything.
Michael
Michael Nottebrock schrieb:
> Michael Nottebrock schrieb:
>> michael johnson schrieb:
>>
>>> kdegraphics depends on xpdf and gnome depends on poppler.
>>> and xpdf and poppler conflict. However, kdegraphics could
>>> depend on poppler, it is a dropin replacement for xpdf. =)
>> That's doable, I'll get right on it.
>
> Actually, I think it would be best to split the poppler port up one more
> time and create an extra port for the command line utilities, that way
> the conflict with xpdf can be resolved completely. Should I work on that?
Here's a poppler-utils port and the necessary diff to graphics/poppler.
I've fired up a test build of kdegraphics against poppler now and will
probably have confirmation on things working or not by tomorrow.
I have an idea, why not just leave kdegraphics depending on xpdf
and we can go ahead and commit poppler-utils and bump PORTREVISION
on poppler so kde and gnome will get along again. This way nobody on
the kde side will have to rebuild anything.
Michael
Cheers,
--
,_, | Michael Nottebrock | [EMAIL PROTECTED]
(/^ ^\) | FreeBSD - The Power to Serve | http://www.freebsd.org
\u/ | K Desktop Environment on FreeBSD | http://freebsd.kde.org
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/graphics/poppler/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- Makefile 30 Apr 2006 00:46:55 -0000 1.15
+++ Makefile 1 May 2006 19:40:38 -0000
@@ -8,7 +8,7 @@
PORTNAME= poppler
PORTVERSION= 0.5.1
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= graphics print
MASTER_SITES= http://poppler.freedesktop.org/
@@ -17,7 +17,6 @@
LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo
-CONFLICTS= xpdf-[0-9]*
USE_GMAKE= yes
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
@@ -45,12 +44,17 @@
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"
+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
.endif
.else
CONFIGURE_ARGS+=--disable-poppler-glib --disable-poppler-qt \
- --disable-poppler-qt4
-MAN1= pdffonts.1 pdfimages.1 pdfinfo.1 \
- pdftohtml.1 pdftops.1 pdftotext.1 pdftoppm.1
+ --disable-poppler-qt4 --disable-utils
.endif
post-patch:
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/graphics/poppler/pkg-plist,v
retrieving revision 1.6
diff -u -r1.6 pkg-plist
--- pkg-plist 30 Apr 2006 00:46:55 -0000 1.6
+++ pkg-plist 1 May 2006 19:40:38 -0000
@@ -1,10 +1,3 @@
-bin/pdffonts
-bin/pdfimages
-bin/pdfinfo
-bin/pdftohtml
-bin/pdftoppm
-bin/pdftops
-bin/pdftotext
include/poppler/Annot.h
include/poppler/Array.h
include/poppler/BaseFile.h
@@ -49,8 +42,8 @@
include/poppler/Stream-CCITT.h
include/poppler/Stream.h
include/poppler/TextOutputDev.h
-include/poppler/UTF8.h
include/poppler/UGooString.h
+include/poppler/UTF8.h
include/poppler/UnicodeMap.h
include/poppler/UnicodeMapTables.h
include/poppler/UnicodeTypeTable.h
Index: files/patch-utils_Makefile.in
===================================================================
RCS file: files/patch-utils_Makefile.in
diff -N files/patch-utils_Makefile.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-utils_Makefile.in 1 May 2006 19:40:38 -0000
@@ -0,0 +1,61 @@
+--- utils/Makefile.in.orig Mon May 1 21:28:04 2006
++++ utils/Makefile.in Mon May 1 21:28:59 2006
+@@ -61,42 +61,35 @@
+ 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)
+ 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)
+ 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)
+ 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)
+ am__pdftoppm_SOURCES_DIST = pdftoppm.cc parseargs.c parseargs.h
+ @[EMAIL PROTECTED] = pdftoppm.$(OBJEXT) \
+ @BUILD_SPLASH_OUTPUT_TRUE@ $(am__objects_1)
+ pdftoppm_OBJECTS = $(am_pdftoppm_OBJECTS)
+ pdftoppm_LDADD = $(LDADD)
+-pdftoppm_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
+- $(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)
+ 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)
+ 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 @@
+ $(UTILS_CFLAGS)
+
+ LDADD = \
+- $(top_builddir)/poppler/libpoppler.la \
++ -lpoppler \
+ $(UTILS_LIBS)
+
+
_______________________________________________ kde-freebsd mailing list [email protected] http://freebsd.kde.org/mailman/listinfo/kde-freebsd
