3 files changed, 37 insertions, 17 deletions

diff --git a/x11/eaglemode/Makefile b/x11/eaglemode/Makefile
index 0c1f9d7686b5..7a1bcf9f1989 100644
--- a/x11/eaglemode/Makefile
+++ b/x11/eaglemode/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for:	eaglemode
-# Date created:		29 Apr 2008
-# Whom:			Dmitry Marakasov <amdmi3@amdmi3.ru>
-#
+# Created by: Dmitry Marakasov <amdmi3@amdmi3.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	eaglemode
-PORTVERSION=	0.82.0
-PORTREVISION=	3
+PORTVERSION=	0.84.0
 CATEGORIES=	x11
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -20,7 +15,7 @@ LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
 		freetype.9:${PORTSDIR}/print/freetype2
 
 USE_BZIP2=	yes
-USE_PERL5_BUILD=	yes
+USE_PERL5_BUILD=yes
 USE_XORG=	x11 xext xxf86vm
 SUB_FILES=	eaglemode.sh
 
@@ -31,12 +26,14 @@ BUILD_ARGS+=	${lib}-inc-dir="${LOCALBASE}/include" \
 		${lib}-lib-dir="${LOCALBASE}/lib"
 .endfor
 
-OPTIONS=	XINE "Video playback support through libxine" off \
-		RSVG "SVG support throute librsvg" on
+OPTIONS_DEFINE=	XINE RSVG PDF
+OPTIONS_DEFAULT=RSVG PDF
+RSVG_DESC=	SVG support through librsvg
+PDF_DESC=	PDF support through poppler-glib
 
 .include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_XINE)
+.if ${PORT_OPTIONS:MXINE}
 LIB_DEPENDS+=	xine.2:${PORTSDIR}/multimedia/libxine
 BUILD_ARGS+=	xine-inc-dir="${LOCALBASE}/include" \
 		xine-lib-dir="${LOCALBASE}/lib"
@@ -46,22 +43,33 @@ BROKEN=		does not build with libxine 1.2.x
 PLIST_SUB+=	EMAV="@comment "
 .endif
 
-.if !defined(WITHOUT_RSVG)
+.if ${PORT_OPTIONS:MRSVG}
 USE_GNOME+=	librsvg2
 PLIST_SUB+=	EMSVG=""
 .else
 PLIST_SUB+=	EMSVG="@comment "
 .endif
 
+.if ${PORT_OPTIONS:MPDF}
+LIB_DEPENDS+=	poppler-glib:${PORTSDIR}/graphics/poppler-glib
+USE_GNOME+=	gtk20
+PLIST_SUB+=	EMPDF=""
+.else
+PLIST_SUB+=	EMPDF="@comment "
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|gcc|${CC}|; s|"-O2"|"${CFLAGS}"|' \
 		${WRKSRC}/makers/unicc/plugins/unicc_gnu.pm
-.if defined(WITHOUT_XINE)
+.if ! ${PORT_OPTIONS:MXINE}
 	@${RM} -f ${WRKSRC}/makers/emAv.maker.pm
 .endif
-.if defined(WITHOUT_RSVG)
+.if ! ${PORT_OPTIONS:MRSVG}
 	@${RM} -f ${WRKSRC}/makers/emSvg.maker.pm
 .endif
+.if ! ${PORT_OPTIONS:MPDF}
+	@${RM} -f ${WRKSRC}/makers/emPdf.maker.pm
+.endif
 
 do-build:
 	cd ${WRKSRC} && ${PERL} make.pl build ${BUILD_ARGS}
diff --git a/x11/eaglemode/distinfo b/x11/eaglemode/distinfo
index 0300d1f753bb..d13f50626782 100644
--- a/x11/eaglemode/distinfo
+++ b/x11/eaglemode/distinfo
@@ -1,2 +1,2 @@
-SHA256 (eaglemode-0.82.0.tar.bz2) = 0be3e8acac7bacaa51e37070583252091275e0c3cb71225d8722217d666b5370
-SIZE (eaglemode-0.82.0.tar.bz2) = 4744838
+SHA256 (eaglemode-0.84.0.tar.bz2) = 9a816d0f6699889e356715696cd3d31ea899801d6e6892e58187029902594058
+SIZE (eaglemode-0.84.0.tar.bz2) = 4837950
diff --git a/x11/eaglemode/pkg-plist b/x11/eaglemode/pkg-plist
index d76e105a669f..66b517109f81 100644
--- a/x11/eaglemode/pkg-plist
+++ b/x11/eaglemode/pkg-plist
@@ -27,6 +27,7 @@ lib/eaglemode/doc/html/ChangeLog.html
 lib/eaglemode/doc/html/CppApiRef/emCore_emATMatrix_h.html
 lib/eaglemode/doc/html/CppApiRef/emCore_emArray_h.html
 lib/eaglemode/doc/html/CppApiRef/emCore_emAvlTree_h.html
+lib/eaglemode/doc/html/CppApiRef/emCore_emClipRects_h.html
 lib/eaglemode/doc/html/CppApiRef/emCore_emClipboard_h.html
 lib/eaglemode/doc/html/CppApiRef/emCore_emColor_h.html
 lib/eaglemode/doc/html/CppApiRef/emCore_emConfigModel_h.html
@@ -69,6 +70,7 @@ lib/eaglemode/doc/html/CppApiRef/emCore_emTmpFile_h.html
 lib/eaglemode/doc/html/CppApiRef/emCore_emToolkit_h.html
 lib/eaglemode/doc/html/CppApiRef/emCore_emVarModel_h.html
 lib/eaglemode/doc/html/CppApiRef/emCore_emVarSigModel_h.html
+lib/eaglemode/doc/html/CppApiRef/emCore_emViewInputFilter_h.html
 lib/eaglemode/doc/html/CppApiRef/emCore_emView_h.html
 lib/eaglemode/doc/html/CppApiRef/emCore_emWindow_h.html
 lib/eaglemode/doc/html/CppApiRef/index-noframes.html
@@ -129,6 +131,7 @@ lib/eaglemode/etc/emCore/FpPlugins/emJpeg.emFpPlugin
 lib/eaglemode/etc/emCore/FpPlugins/emMines.emFpPlugin
 lib/eaglemode/etc/emCore/FpPlugins/emNetwalk.emFpPlugin
 lib/eaglemode/etc/emCore/FpPlugins/emPcx.emFpPlugin
+lib/eaglemode/etc/emCore/FpPlugins/emPdf.emFpPlugin
 lib/eaglemode/etc/emCore/FpPlugins/emPng.emFpPlugin
 lib/eaglemode/etc/emCore/FpPlugins/emPnm.emFpPlugin
 lib/eaglemode/etc/emCore/FpPlugins/emPs.emFpPlugin
@@ -149,7 +152,6 @@ lib/eaglemode/etc/emCore/FpPlugins/emTmpConv_fig.emFpPlugin
 lib/eaglemode/etc/emCore/FpPlugins/emTmpConv_g3.emFpPlugin
 lib/eaglemode/etc/emCore/FpPlugins/emTmpConv_html.emFpPlugin
 lib/eaglemode/etc/emCore/FpPlugins/emTmpConv_iso.emFpPlugin
-lib/eaglemode/etc/emCore/FpPlugins/emTmpConv_pdf.emFpPlugin
 lib/eaglemode/etc/emCore/FpPlugins/emTmpConv_pov.emFpPlugin
 lib/eaglemode/etc/emCore/FpPlugins/emTmpConv_rpm.emFpPlugin
 lib/eaglemode/etc/emCore/FpPlugins/emTmpConv_sk.emFpPlugin
@@ -323,6 +325,7 @@ lib/eaglemode/include/emClock/emWorldClockPanel.h
 lib/eaglemode/include/emCore/emATMatrix.h
 lib/eaglemode/include/emCore/emArray.h
 lib/eaglemode/include/emCore/emAvlTree.h
+lib/eaglemode/include/emCore/emClipRects.h
 lib/eaglemode/include/emCore/emClipboard.h
 lib/eaglemode/include/emCore/emColor.h
 lib/eaglemode/include/emCore/emConfigModel.h
@@ -367,6 +370,7 @@ lib/eaglemode/include/emCore/emToolkit.h
 lib/eaglemode/include/emCore/emVarModel.h
 lib/eaglemode/include/emCore/emVarSigModel.h
 lib/eaglemode/include/emCore/emView.h
+lib/eaglemode/include/emCore/emViewInputFilter.h
 lib/eaglemode/include/emCore/emWindow.h
 lib/eaglemode/include/emFileMan/emDirEntry.h
 lib/eaglemode/include/emFileMan/emDirEntryAltPanel.h
@@ -403,6 +407,10 @@ lib/eaglemode/include/emNetwalk/emNetwalkControlPanel.h
 lib/eaglemode/include/emNetwalk/emNetwalkModel.h
 lib/eaglemode/include/emNetwalk/emNetwalkPanel.h
 lib/eaglemode/include/emPcx/emPcxImageFileModel.h
+lib/eaglemode/include/emPdf/emPdfFileModel.h
+lib/eaglemode/include/emPdf/emPdfFilePanel.h
+lib/eaglemode/include/emPdf/emPdfPagePanel.h
+lib/eaglemode/include/emPdf/emPdfServerModel.h
 lib/eaglemode/include/emPng/emPngImageFileModel.h
 lib/eaglemode/include/emPnm/emPnmImageFileModel.h
 lib/eaglemode/include/emPs/emPsDocument.h
@@ -443,6 +451,7 @@ lib/eaglemode/include/emXbm/emXbmImageFileModel.h
 lib/eaglemode/include/emXpm/emXpmImageFileModel.h
 %%EMAV%%lib/eaglemode/lib/emAv/emAvServerProc_xine
 lib/eaglemode/lib/emClock/emTimeZonesProc
+%%EMPDF%%lib/eaglemode/lib/emPdf/emPdfServerProc
 %%EMSVG%%lib/eaglemode/lib/emSvg/emSvgServerProc
 lib/eaglemode/lib/emTmpConv/emTmpConvProc
 lib/eaglemode/lib/libSilChess.so
@@ -458,6 +467,7 @@ lib/eaglemode/lib/libemJpeg.so
 lib/eaglemode/lib/libemMines.so
 lib/eaglemode/lib/libemNetwalk.so
 lib/eaglemode/lib/libemPcx.so
+%%EMPDF%%lib/eaglemode/lib/libemPdf.so
 lib/eaglemode/lib/libemPng.so
 lib/eaglemode/lib/libemPnm.so
 lib/eaglemode/lib/libemPs.so
@@ -564,6 +574,7 @@ lib/eaglemode/res/icons/em-error-unknown-icon.tga
 @dirrm lib/eaglemode/res
 @dirrm lib/eaglemode/lib/emTmpConv
 %%EMSVG%%@dirrm lib/eaglemode/lib/emSvg
+%%EMPDF%%@dirrm lib/eaglemode/lib/emPdf
 @dirrm lib/eaglemode/lib/emClock
 %%EMAV%%@dirrm lib/eaglemode/lib/emAv
 @dirrm lib/eaglemode/lib
@@ -583,6 +594,7 @@ lib/eaglemode/res/icons/em-error-unknown-icon.tga
 @dirrm lib/eaglemode/include/emPs
 @dirrm lib/eaglemode/include/emPnm
 @dirrm lib/eaglemode/include/emPng
+@dirrm lib/eaglemode/include/emPdf
 @dirrm lib/eaglemode/include/emPcx
 @dirrm lib/eaglemode/include/emNetwalk
 @dirrm lib/eaglemode/include/emMines