Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 13 Sep 2015 14:03:54 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r396823 - head/deskutils/glabels
Message-ID:  <201509131403.t8DE3sEi083631@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Sun Sep 13 14:03:53 2015
New Revision: 396823
URL: https://svnweb.freebsd.org/changeset/ports/396823

Log:
  Convert EVOLUTION support into proper options

Modified:
  head/deskutils/glabels/Makefile

Modified: head/deskutils/glabels/Makefile
==============================================================================
--- head/deskutils/glabels/Makefile	Sun Sep 13 13:58:14 2015	(r396822)
+++ head/deskutils/glabels/Makefile	Sun Sep 13 14:03:53 2015	(r396823)
@@ -1,16 +1,18 @@
 # Created by: Martin Klaffenboeck <martin.klaffenboeck@gmx.at>
 # $FreeBSD$
-#   $MCom: ports/deskutils/glabels/Makefile,v 1.10 2010/04/03 19:25:49 kwm Exp $
 
 PORTNAME=	glabels
 PORTVERSION=	2.2.8
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	deskutils
 MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Program to create labels and business cards
 
+OPTIONS_DEFINE=	EVOLUTION
+EVOLUTION_DESC=	Support evolution data server
+
 USES=		desktop-file-utils gettext gmake libtool pathfix pkgconfig \
 		shared-mime-info tar:bzip2
 USE_GNOME=	gnomeprefix libgnomeui gnomedocutils intlhack
@@ -22,18 +24,12 @@ CONFIGURE_ARGS=	--disable-update-desktop
 CPPFLAGS+=	-I${LOCALBASE}/include -DGLIB_COMPILATION
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-.include <bsd.port.pre.mk>
-
-.if ${HAVE_GNOME:Mevolutiondataserver}!=""
-USE_GNOME+=		evolutiondataserver
-CONFIGURE_ARGS+=	--with-libebook
-.else
-CONFIGURE_ARGS+=	--without-libebook
-.endif
+EVOLUTION_USE=	GNOME=evolutiondataserver
+EVOLUTION_CONFIGURE_WITH=	libebook
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|malloc\.h|stdlib\.h|g' \
 		${WRKSRC}/iec16022-0.2.1/*.c
 	@${REINPLACE_CMD} 's/_LDADD =/& -lm/' ${WRKSRC}/src/Makefile.in
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509131403.t8DE3sEi083631>