CVS commit: pkgsrc/net/synergy

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Mon Sep 18 13:44:14 UTC 2017

Modified Files:
        pkgsrc/net/synergy: Makefile

Log Message:
synergy: don't run cmake twice


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 pkgsrc/net/synergy/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/synergy/Makefile
diff -u pkgsrc/net/synergy/Makefile:1.44 pkgsrc/net/synergy/Makefile:1.45
--- pkgsrc/net/synergy/Makefile:1.44    Thu Aug 24 20:03:36 2017
+++ pkgsrc/net/synergy/Makefile Mon Sep 18 13:44:14 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2017/08/24 20:03:36 adam Exp $
+# $NetBSD: Makefile,v 1.45 2017/09/18 13:44:14 tnn Exp $
 
 DISTNAME=              synergy-1.8.8
 PKGREVISION=           1
@@ -15,7 +15,8 @@ USE_LANGUAGES=                c c++11
 USE_TOOLS+=            unzip
 # Main configuration is CMake, but subdirectories are GNU configure.
 # We need to set GNU_CONFIGURE=yes for config.{guess,sub} overrides to kick in.
-# Fortunately for us, cmake seems to take precedence in infrastructure.
+# We override the do-configure target to prevent pkgsrc from running both
+# configuration mechanisms.
 USE_CMAKE=             yes
 GNU_CONFIGURE=         yes
 
@@ -43,6 +44,9 @@ post-extract:
        ${MKDIR} ${WRKSRC}/ext/gtest-1.6.0
        cd ${WRKSRC}/ext/gtest-1.6.0 && unzip -aqo ../gtest-1.6.0.zip
 
+.PHONY: do-configure
+do-configure: do-configure-cmake
+
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1 share/examples/${PKGBASE}
 
 do-install: