syncserver-dependencies: rename from sync-server-dependencies

[Thomas Klausner <tk%giga.or.at@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Tue Nov 19 11:19:04 2019 +0100
Changeset:	6972fce031df4a741229e89c3204fd28643e0122

Modified Files:
	Makefile
Added Files:
	syncserver-dependencies/DESCR
	syncserver-dependencies/Makefile
	syncserver-dependencies/options.mk
Removed Files:
	sync-server-dependencies/DESCR
	sync-server-dependencies/Makefile
	sync-server-dependencies/options.mk

Log Message:
syncserver-dependencies: rename from sync-server-dependencies

Fix dependencies: uses py-sqlite3 nowadays
Remove mercurial dependency, it's now a git repository
and I don't want the dependency just for the checkout,
it's not needed at runtime.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6972fce031df4a741229e89c3204fd28643e0122

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

diffstat:
 Makefile                            |  3 ++-
 sync-server-dependencies/DESCR      |  1 -
 sync-server-dependencies/Makefile   | 26 --------------------------
 sync-server-dependencies/options.mk | 12 ------------
 syncserver-dependencies/DESCR       |  1 +
 syncserver-dependencies/Makefile    | 25 +++++++++++++++++++++++++
 syncserver-dependencies/options.mk  | 12 ++++++++++++
 7 files changed, 40 insertions(+), 40 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index fb57eea27b..8cedc4ab13 100644
--- a/Makefile
+++ b/Makefile
@@ -4635,9 +4635,9 @@ SUBDIR+=	symon
 SUBDIR+=	sympol
 SUBDIR+=	sympow
 SUBDIR+=	syn68k
-SUBDIR+=	sync-server-dependencies
 SUBDIR+=	synce-dynamite
 SUBDIR+=	synce-orange
+SUBDIR+=	syncserver-dependencies
 SUBDIR+=	syncthing-discosrv
 SUBDIR+=	syncthing-inotify
 SUBDIR+=	syncthing-relaysrv
@@ -5022,6 +5022,7 @@ SUBDIR+=	xfs
 SUBDIR+=	xine-plugin
 SUBDIR+=	xinetd
 SUBDIR+=	xinput_calibrator
+SUBDIR+=	xinvaders3d
 SUBDIR+=	xmail
 SUBDIR+=	xmakemol
 SUBDIR+=	xmds
diff --git a/sync-server-dependencies/DESCR b/sync-server-dependencies/DESCR
deleted file mode 100644
index e11c57fae6..0000000000
--- a/sync-server-dependencies/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Meta package for dependencies needed by the Firefox Sync Server.
diff --git a/sync-server-dependencies/Makefile b/sync-server-dependencies/Makefile
deleted file mode 100644
index e66c717ba8..0000000000
--- a/sync-server-dependencies/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD$
-
-DISTNAME=	sync-server-dependencies-1.1
-PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=	misc
-MASTER_SITES=	#
-
-MAINTAINER=	wiz%NetBSD.org@localhost
-HOMEPAGE=	http://docs.services.mozilla.com/howtos/run-sync.html
-COMMENT=	Meta Package for Firefox Sync Server's dependencies
-LICENSE=	public-domain
-
-USE_TOOLS+=	gmake:run
-
-DEPENDS+=	${PYPKGPREFIX}-sqlite2-[0-9]*:../../databases/py-sqlite2
-DEPENDS+=	${PYPKGPREFIX}-virtualenv-[0-9]*:../../devel/py-virtualenv
-DEPENDS+=	mercurial-[0-9]*:../../devel/mercurial
-DEPENDS+=	sqlite3-[0-9]*:../../databases/sqlite3
-
-META_PACKAGE=	yes
-PYTHON_VERSIONS_ACCEPTED=	27 # only supports 2.7
-
-.include "options.mk"
-
-.include "../../lang/python/application.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sync-server-dependencies/options.mk b/sync-server-dependencies/options.mk
deleted file mode 100644
index 8485b395d8..0000000000
--- a/sync-server-dependencies/options.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: options.mk,v 1.2 2015/01/25 20:05:54 thomasklausner Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.sync-server-dependencies
-PKG_SUPPORTED_OPTIONS=	apache
-PKG_SUGGESTED_OPTIONS=	apache
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mapache)
-DEPENDS+=	${PYPKGPREFIX}-${APACHE_PKG_PREFIX}-mod_wsgi-[0-9]*:../../www/py-mod_wsgi
-.include "../../mk/apache.mk"
-.endif
diff --git a/syncserver-dependencies/DESCR b/syncserver-dependencies/DESCR
new file mode 100644
index 0000000000..e11c57fae6
--- /dev/null
+++ b/syncserver-dependencies/DESCR
@@ -0,0 +1 @@
+Meta package for dependencies needed by the Firefox Sync Server.
diff --git a/syncserver-dependencies/Makefile b/syncserver-dependencies/Makefile
new file mode 100644
index 0000000000..ac22333cc4
--- /dev/null
+++ b/syncserver-dependencies/Makefile
@@ -0,0 +1,25 @@
+# $NetBSD$
+
+DISTNAME=	syncserver-dependencies-1.2
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+CATEGORIES=	misc
+MASTER_SITES=	#
+
+MAINTAINER=	wiz%NetBSD.org@localhost
+HOMEPAGE=	http://docs.services.mozilla.com/howtos/run-sync.html
+COMMENT=	Meta Package for Firefox Sync Server's dependencies
+LICENSE=	public-domain
+
+USE_TOOLS+=	gmake:run
+
+DEPENDS+=	${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
+DEPENDS+=	${PYPKGPREFIX}-virtualenv-[0-9]*:../../devel/py-virtualenv
+DEPENDS+=	sqlite3-[0-9]*:../../databases/sqlite3
+
+META_PACKAGE=	yes
+PYTHON_VERSIONS_ACCEPTED=	27 # only supports 2.7
+
+.include "options.mk"
+
+.include "../../lang/python/application.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/syncserver-dependencies/options.mk b/syncserver-dependencies/options.mk
new file mode 100644
index 0000000000..8485b395d8
--- /dev/null
+++ b/syncserver-dependencies/options.mk
@@ -0,0 +1,12 @@
+# $NetBSD: options.mk,v 1.2 2015/01/25 20:05:54 thomasklausner Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.sync-server-dependencies
+PKG_SUPPORTED_OPTIONS=	apache
+PKG_SUGGESTED_OPTIONS=	apache
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mapache)
+DEPENDS+=	${PYPKGPREFIX}-${APACHE_PKG_PREFIX}-mod_wsgi-[0-9]*:../../www/py-mod_wsgi
+.include "../../mk/apache.mk"
+.endif