svn commit: r517333 - head/devel/cutter

Dmitry Marakasov amdmi3 at FreeBSD.org
Tue Nov 12 13:43:12 UTC 2019


Author: amdmi3
Date: Tue Nov 12 13:43:11 2019
New Revision: 517333
URL: https://svnweb.freebsd.org/changeset/ports/517333

Log:
  - Switch to USES=localbase
  - Switch to options helpers and OPTIONS_SUB, simplifying the port
  
  PR:		241896
  Submitted by:	amdmi3
  Approved by:	romain (maintainer)

Modified:
  head/devel/cutter/Makefile

Modified: head/devel/cutter/Makefile
==============================================================================
--- head/devel/cutter/Makefile	Tue Nov 12 13:29:17 2019	(r517332)
+++ head/devel/cutter/Makefile	Tue Nov 12 13:43:11 2019	(r517333)
@@ -18,52 +18,31 @@ LIB_DEPENDS=	libcairo.so:graphics/cairo \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 
-CPPFLAGS+=	"-I${LOCALBASE}/include"
 CONFIGURE_ARGS=	--disable-gtk-doc-html --with-html-dir=${PREFIX}/share/doc \
 		--disable-gstreamer
 GNU_CONFIGURE=	yes
-USES=		gettext gnome gmake libtool pathfix pkgconfig
+USES=		gettext gnome gmake libtool localbase pathfix pkgconfig
 USE_GNOME=	intlhack gdkpixbuf2 glib20 gtk20
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
 OPTIONS_DEFINE=	GOFFICE SOUP LCOV NLS
+OPTIONS_SUB=	yes
 GOFFICE_DESC=	GOffice support
 SOUP_DESC=	libsoup support
 LCOV_DESC=	Force dependency on lcov
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MGOFFICE}
-CONFIGURE_ARGS+=--enable-goffice
+GOFFICE_CONFIGURE_ENABLE=goffice
 # the 0.8 is part of the library name don't remove it.
-LIB_DEPENDS+=	libgoffice-0.8.so:devel/goffice
-PLIST_SUB+=	GOFFICE=""
-.else
-CONFIGURE_ARGS+=--disable-goffice
-PLIST_SUB+=	GOFFICE="@comment "
-.endif
+GOFFICE_LIB_DEPENDS=	libgoffice-0.8.so:devel/goffice
 
-.if ${PORT_OPTIONS:MLCOV}
-RUN_DEPENDS+=	lcov:devel/lcov
-.endif
+LCOV_RUN_DEPENDS=	lcov:devel/lcov
 
-.if ${PORT_OPTIONS:MSOUP}
-CONFIGURE_ARGS+=--enable-libsoup
-LIB_DEPENDS+=	libsoup-2.4.so:devel/libsoup
-PLIST_SUB+=	SOUP=""
-.else
-CONFIGURE_ARGS+=--disable-libsoup
-PLIST_SUB+=	SOUP="@comment "
-.endif
+SOUP_CONFIGURE_ENABLE=	libsoup
+SOUP_LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+NLS_USES=		gettext
+NLS_CONFIGURE_ENABLE=	nls
 
 .include <bsd.port.mk>


More information about the svn-ports-all mailing list