2 files changed, 35 insertions, 55 deletions

diff --git a/finance/kmymoney-kde4/Makefile b/finance/kmymoney-kde4/Makefile
index 068e3dd850f7..2972453f513a 100644
--- a/finance/kmymoney-kde4/Makefile
+++ b/finance/kmymoney-kde4/Makefile
@@ -11,17 +11,8 @@ COMMENT=	KDE4 personal finance manager
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	boost_graph:${PORTSDIR}/devel/boost-libs \
-		alkimia:${PORTSDIR}/finance/libalkimia
-
-OPTIONS_DEFINE=	NLS CALENDAR KBANKING OFX QUOTES
-OPTIONS_DEFAULT=CALENDAR
-NO_OPTIONS_SORT=yes
-
-CALENDAR_DESC=	Enable Calendar plugin
-KBANKING_DESC=	Enable KBanking plugin
-OFX_DESC=	Enable OFX plugin
-QUOTES_DESC=	Enable online price quotes
+LIB_DEPENDS=	libboost_graph.so:${PORTSDIR}/devel/boost-libs \
+		libalkimia.so:${PORTSDIR}/finance/libalkimia
 
 USE_BZIP2=	yes
 USES=		cmake pkgconfig
@@ -30,55 +21,43 @@ USE_QT4=	gui dbus network phonon sql svg xml \
 USE_KDE4=	kdehier kdeprefix automoc4 kdelibs pimlibs sharedmime
 USE_LDCONFIG=	yes
 
-MAN1=		kmymoney.1
+OPTIONS_DEFINE=		NLS CALENDAR KBANKING OFX QUOTES
+OPTIONS_DEFAULT=	CALENDAR
+OPTIONS_SUB=		yes
+NO_OPTIONS_SORT=	yes
+
+NLS_USES=		gettext
+NLS_CMAKE_ON=		-DENABLE_NLS:BOOL=ON
+NLS_CMAKE_OFF=		-DENABLE_NLS:BOOL=OFF
+
+CALENDAR_DESC=		Enable Calendar plugin
+CALENDAR_LIB_DEPENDS=	libical.so:${PORTSDIR}/devel/libical
+CALENDAR_CMAKE_ON=	-DENABLE_LIBICAL:BOOL=ON
+CALENDAR_CMAKE_OFF=	-DENABLE_LIBICAL:BOOL=OFF
+
+KBANKING_DESC=		Enable KBanking plugin
+KBANKING_LIB_DEPENDS=	libgwengui-qt4.so:${PORTSDIR}/devel/gwenhywfar-qt4 \
+			libaqbanking.so:${PORTSDIR}/finance/aqbanking
+KBANKING_CMAKE_ON=	-DENABLE_KBANKING:BOOL=ON
+KBANKING_CMAKE_OFF=	-DENABLE_KBANKING:BOOL=OFF
+
+OFX_DESC=		Enable OFX plugin
+OFX_LIB_DEPENDS=	libofx.so:${PORTSDIR}/finance/libofx
+OFX_CMAKE_ON=		-DENABLE_LIBOFX:BOOL=ON
+OFX_CMAKE_OFF=		-DENABLE_LIBOFX:BOOL=OFF
+
+QUOTES_DESC=		Enable online price quotes
+QUOTES_USES=		perl5
+QUOTES_RUN_DEPENDS=	p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
+			p5-Finance-Quote>=0:${PORTSDIR}/finance/p5-Finance-Quote \
+			p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
+			p5-XML-Writer>=0:${PORTSDIR}/textproc/p5-XML-Writer \
+			p5-libwww>=0:${PORTSDIR}/www/p5-libwww
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CMAKE_ARGS+=	-DENABLE_NLS:BOOL=OFF
-PLIST_SUB+=	NLS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MCALENDAR}
-LIB_DEPENDS+=	ical:${PORTSDIR}/devel/libical
-CMAKE_ARGS+=	-DENABLE_LIBICAL:BOOL=ON
-PLIST_SUB+=	CALENDAR=""
-.else
-CMAKE_ARGS+=	-DENABLE_LIBICAL:BOOL=OFF
-PLIST_SUB+=	CALENDAR="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MKBANKING}
-LIB_DEPENDS+=	gwengui-qt4:${PORTSDIR}/devel/gwenhywfar-qt4 \
-		aqbanking:${PORTSDIR}/finance/aqbanking
-CMAKE_ARGS+=	-DENABLE_KBANKING:BOOL=ON
-PLIST_SUB+=	KBANKING=""
-.else
-CMAKE_ARGS+=	-DENABLE_KBANKING:BOOL=OFF
-PLIST_SUB+=	KBANKING="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MOFX}
-LIB_DEPENDS+=	ofx:${PORTSDIR}/finance/libofx
-CMAKE_ARGS+=	-DENABLE_LIBOFX:BOOL=ON
-PLIST_SUB+=	OFX=""
-.else
-CMAKE_ARGS+=	-DENABLE_LIBOFX:BOOL=OFF
-PLIST_SUB+=	OFX="@comment "
-.endif
-
 .if ${PORT_OPTIONS:MQUOTES}
-USES+=		perl5
 USE_PERL5=	run
-RUN_DEPENDS+=	p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
-		p5-Finance-Quote>=0:${PORTSDIR}/finance/p5-Finance-Quote \
-		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-		p5-XML-Writer>=0:${PORTSDIR}/textproc/p5-XML-Writer \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
 .endif
 
 .include <bsd.port.mk>
diff --git a/finance/kmymoney-kde4/pkg-plist b/finance/kmymoney-kde4/pkg-plist
index 2c547b7fc5b6..35d4b4d3f9a6 100644
--- a/finance/kmymoney-kde4/pkg-plist
+++ b/finance/kmymoney-kde4/pkg-plist
@@ -90,6 +90,7 @@ lib/libkmm_plugin.so.5.0.1
 lib/libkmm_widgets.so
 lib/libkmm_widgets.so.5
 lib/libkmm_widgets.so.5.0.1
+man/man1/kmymoney.1.gz
 share/applications/kde4/kmymoney.desktop
 share/apps/kmm_csvimport/kmm_csvimport.rc
 %%CALENDAR%%share/apps/kmm_icalendarexport/kmm_icalendarexport.rc