Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 19 Dec 2017 16:03:32 +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: r456731 - head/devel/libopensync
Message-ID:  <201712191603.vBJG3WA8088616@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Tue Dec 19 16:03:32 2017
New Revision: 456731
URL: https://svnweb.freebsd.org/changeset/ports/456731

Log:
  Switch from swig 1.3 t swig 3.0
  Use a simpler mechanism to get the installed swig path
  Add license

Modified:
  head/devel/libopensync/Makefile

Modified: head/devel/libopensync/Makefile
==============================================================================
--- head/devel/libopensync/Makefile	Tue Dec 19 15:53:19 2017	(r456730)
+++ head/devel/libopensync/Makefile	Tue Dec 19 16:03:32 2017	(r456731)
@@ -11,7 +11,9 @@ MASTER_SITES=	http://www.opensync.org/download/release
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	PIM data synchronization framework
 
-BUILD_DEPENDS=	swig1.3:devel/swig13
+LICENSE=	LGPL21
+
+BUILD_DEPENDS=	swig3.0:devel/swig30
 LIB_DEPENDS=	libexslt.so:textproc/libxslt
 
 CONFLICTS=	libopensync-0.22*
@@ -20,19 +22,16 @@ USES=		cmake pkgconfig python tar:bzip2 sqlite:3
 CMAKE_ARGS+=	-Wno-dev
 USE_GNOME=	glib20 libxml2
 USE_LDCONFIG=	yes
-CMAKE_ARGS+=	-DPYTHON_INCLUDE_PATH:PATH=${PYTHON_INCLUDEDIR}
+CMAKE_ARGS+=	-DPYTHON_INCLUDE_PATH:PATH=${PYTHON_INCLUDEDIR} \
+		-DSWIG_DIR=`swig3.0 -swiglib` \
+		-DSWIG_EXECUTABLE:FILEPATH=${LOCALBASE}/bin/swig3.0
 
 OPTIONS_DEFINE=	DOCS
 
-SWIG_VER=	$$(cd ${PORTSDIR}/devel/swig13 && ${MAKE} -V PORTVERSION)
-SWIG_DATADIR=	$$(cd ${PORTSDIR}/devel/swig13 && ${MAKE} -V DATADIR)
-
 post-patch:
 	@${REINPLACE_CMD} -e "s|\$${LIBDATA_INSTALL_DIR}/pkgconfig|${PREFIX}/libdata/pkgconfig|" \
 		-e "s|FIND_PACKAGE( SWIG|FIND_PACKAGE( SWIG REQUIRED|" \
 		-e "/FIND_PACKAGE( Check )/d" ${WRKSRC}/CMakeLists.txt
-	@${REINPLACE_CMD} -e "s|/usr/local/share/swig1.3|${SWIG_DATADIR}/${SWIG_VER}|g" \
-		${WRKSRC}/cmake/modules/FindSWIG.cmake
 	@${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \
 		${WRKSRC}/opensync/common/opensync_list.c
 



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