wip/*: migrate some of the packages to GIT_EXTRACTDIR

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: wip/*: migrate some of the packages to GIT_EXTRACTDIR
From: Roland Illig <rillig%NetBSD.org@localhost>
Date: Sat, 03 Mar 2018 18:55:07 +0000
Module Name:	pkgsrc-wip
Committed By:	Roland Illig <rillig%NetBSD.org@localhost>
Pushed By:	rillig
Date:		Sat Mar 3 18:55:07 2018 +0000
Changeset:	17b70d6e10cffdd4aa617c1e575132a865a39235

Modified Files:
	am-utils-git/Makefile
	darcs-to-git/Makefile
	davical-git/Makefile
	elscreen-git/DESCR
	elscreen-git/Makefile
	emacs-nox11-git/Makefile
	ffmpeg-git/Makefile
	git-modes-git/Makefile
	gr-fcdproplus-git/Makefile
	irssi-otr/Makefile
	libvterm/Makefile

Log Message:
wip/*: migrate some of the packages to GIT_EXTRACTDIR

GIT_MODULE is obsolete.

Since most of these packages don't build anyway, there is no effective
way of testing whether this change damages anything.

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

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

diffstat:
 am-utils-git/Makefile      |  7 ++-----
 darcs-to-git/Makefile      |  6 +-----
 davical-git/Makefile       | 14 ++++----------
 elscreen-git/DESCR         |  2 +-
 elscreen-git/Makefile      |  8 ++------
 emacs-nox11-git/Makefile   |  8 +-------
 ffmpeg-git/Makefile        |  8 ++------
 git-modes-git/Makefile     | 20 +++++++-------------
 gr-fcdproplus-git/Makefile | 11 +++--------
 irssi-otr/Makefile         | 22 +++++++---------------
 libvterm/Makefile          |  7 +------
 11 files changed, 31 insertions(+), 82 deletions(-)

diffs:
diff --git a/am-utils-git/Makefile b/am-utils-git/Makefile
index 6808992ff9..310bc10442 100644
--- a/am-utils-git/Makefile
+++ b/am-utils-git/Makefile
@@ -3,16 +3,13 @@
 
 DISTNAME=	am-utils-6.2
 CATEGORIES=	sysutils
-#MASTER_SITES=	ftp://ftp.am-utils.org/pub/am-utils/
+GIT_REPO=	git://git.fsl.cs.sunysb.edu/am-utils-6.2.git
 
 MAINTAINER=		hauke%NetBSD.org@localhost
 HOMEPAGE=		http://www.am-utils.org/
 COMMENT=		Berkeley automounter suite of utilities
 LICENSE=		original-bsd
 
-GIT_REPOSITORIES=	am-utils
-GIT_REPO.am-utils=	git://git.fsl.cs.sunysb.edu/am-utils-6.2.git
-GIT_MODULE.am-utils=	am-utils-6.2
 
 USE_TOOLS+=		yacc lex perl:run automake gettext-m4
 GNU_CONFIGURE=		yes
@@ -37,7 +34,7 @@ EXTRA_DOC_FILES=	COPYING FAQ ChangeLog BUGS AUTHORS \
 EXAMPLE_CONF_FILES=	amd.conf lostaltmail.conf
 
 pre-configure:
-	( cd  ${WRKSRC} && ${SH} bootstrap )
+	cd ${WRKSRC} && ${SH} bootstrap
 
 post-install:
 .for i in ${EXTRA_DOC_FILES}
diff --git a/darcs-to-git/Makefile b/darcs-to-git/Makefile
index 76a111fd0c..9b2a8428a3 100644
--- a/darcs-to-git/Makefile
+++ b/darcs-to-git/Makefile
@@ -2,17 +2,13 @@
 
 DISTNAME=	darcs-to-git-0.1
 CATEGORIES=	devel
+GIT_REPO=	git://github.com/purcell/${PKGBASE}.git
 
 MAINTAINER=	pho%cielonegro.org@localhost
 HOMEPAGE=	https://github.com/purcell/${PKGBASE}
 COMMENT=	Convert a Darcs repository into a Git repository
 LICENSE=	mit
 
-GIT_REPOSITORIES=	master
-GIT_REPO.master=	git://github.com/purcell/${PKGBASE}.git
-GIT_MODULE.master=	darcs-to-git
-
-WRKSRC=		${WRKDIR}/${PKGBASE}
 NO_BUILD=	yes
 USE_LANGUAGES=	# none
 
diff --git a/davical-git/Makefile b/davical-git/Makefile
index f722793edf..3a2faeae11 100644
--- a/davical-git/Makefile
+++ b/davical-git/Makefile
@@ -1,11 +1,9 @@
 # $NetBSD: Makefile,v 1.4 2014/04/10 15:41:17 hfath Exp $
 #
 
-DISTNAME=		davical-${DAVICAL_VERSION}
-DAVICAL_VERSION=	1.1.4
-PKGREVISION=		${_GIT_PKGVERSION:S/.//g}
-CATEGORIES=		www
-MASTER_SITES=		http://debian.mcmillan.net.nz/packages/davical/
+DISTNAME=	davical-1.1.4
+CATEGORIES=	www
+GIT_REPO=	https://gitlab.com/davical-project/davical.git
 
 MAINTAINER=	hauke%NetBSD.org@localhost
 HOMEPAGE=	https://www.davical.org/
@@ -13,11 +11,8 @@ COMMENT=	Simple CalDAV server using a PostgreSQL backend
 
 LICENSE=	gnu-gpl-v2 AND gnu-gpl-v3
 
-GIT_REPOSITORIES=	master
-GIT_REPO.master=	https://gitlab.com/davical-project/davical.git
-GIT_MODULE.master=	davical
 # for "SSL certificate problem: unable to get local issuer certificate"
-GIT_ENV.master+=	GIT_SSL_NO_VERIFY=true
+#GIT_ENV.master+=	GIT_SSL_NO_VERIFY=true
 
 DAVICALDIR=	${PREFIX}/share/davical
 EGDIR=		${PREFIX}/share/examples/davical
@@ -30,7 +25,6 @@ DAVICAL_USER?=	${PGUSER}
 DAVICAL_GROUP?=	${PGGROUP}
 
 USE_TOOLS=	gmake pax msgfmt perl:build
-WRKSRC=		${WRKDIR}/${PKGBASE}
 
 PAXDIRS=	htdocs inc dba po scripts
 
diff --git a/elscreen-git/DESCR b/elscreen-git/DESCR
index b394042c0a..ef1b82638a 100644
--- a/elscreen-git/DESCR
+++ b/elscreen-git/DESCR
@@ -1,4 +1,4 @@
-ElScreen is a window manager in Emacs.  It's role is very similar to that
+ElScreen is a window manager in Emacs.  Its role is very similar to that
 of GNU Screen in terminal emulators.  This is useful if you use Emacs Lisp
 applications which have multiple windows.
 
diff --git a/elscreen-git/Makefile b/elscreen-git/Makefile
index 340db6324d..085283073a 100644
--- a/elscreen-git/Makefile
+++ b/elscreen-git/Makefile
@@ -3,19 +3,15 @@
 DISTNAME=	elscreen-current-0
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 CATEGORIES=	misc
-
-CONFLICTS+=	elscreen-[0-9]*
+GIT_REPO=	git://github.com/knu/elscreen.git
 
 MAINTAINER=	pho%cielonegro.org@localhost
 HOMEPAGE=	https://github.com/knu/elscreen
 COMMENT=	Window manager within Emacs
 LICENSE=	gnu-gpl-v2
 
-GIT_REPOSITORIES=	knu
-GIT_REPO.knu=		git://github.com/knu/elscreen.git
-GIT_MODULE.knu=		elscreen
+CONFLICTS+=	elscreen-[0-9]*
 
-WRKSRC=		${WRKDIR}/elscreen
 USE_LANGUAGES=	# none
 
 do-build:
diff --git a/emacs-nox11-git/Makefile b/emacs-nox11-git/Makefile
index bf0ac4f4ee..fe80e9b761 100644
--- a/emacs-nox11-git/Makefile
+++ b/emacs-nox11-git/Makefile
@@ -3,7 +3,7 @@
 DISTNAME=	emacs-nox11-24.0.90
 PKGREVISION=	${_GIT_PKGVERSION:S/.//g}
 CATEGORIES=	editors
-MASTER_SITES=	#
+GIT_REPO=	git://repo.or.cz/emacs.git
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://www.gnu.org/software/emacs/emacs.html
@@ -18,12 +18,6 @@ CONFLICTS=	emacs-[0-9]*
 
 BUILD_TARGET=	bootstrap
 
-GIT_REPOSITORIES=	master
-GIT_REPO.master=	git://repo.or.cz/emacs.git
-_GIT_FLAGS?=		--depth 1
-GIT_MODULE=		emacs
-GIT_MODULE.master=	emacs
-
 GNU_CONFIGURE=		yes
 INFO_FILES=		yes
 REPLACE_PERL=		lib-src/grep-changelog
diff --git a/ffmpeg-git/Makefile b/ffmpeg-git/Makefile
index cca84ef74a..f1c3ad5796 100644
--- a/ffmpeg-git/Makefile
+++ b/ffmpeg-git/Makefile
@@ -1,16 +1,12 @@
 # $NetBSD: Makefile,v 1.2 2013/05/10 16:51:09 shattered Exp $
 
 DISTNAME=	ffmpeg-${PKGREVISION}
+GIT_REPO=	git://source.ffmpeg.org/ffmpeg.git
+
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://ffmpeg.mplayerhq.hu/
 COMMENT=	Decoding, encoding and streaming software
 
-GIT_REPOSITORIES=	master
-GIT_REPO.master=	git://source.ffmpeg.org/ffmpeg.git
-GIT_MODULE.master=	ffmpeg
-# _GIT_FLAGS?=		--depth 1
-WRKSRC=			${WRKDIR}/ffmpeg
-
 CONFIGURE_ARGS+=	--enable-avfilter
 #CONFIGURE_ARGS+=	--enable-avfilter-lavf
 CONFIGURE_ARGS+=	--enable-postproc
diff --git a/git-modes-git/Makefile b/git-modes-git/Makefile
index a0ed1694ad..20610997ae 100644
--- a/git-modes-git/Makefile
+++ b/git-modes-git/Makefile
@@ -1,28 +1,22 @@
 # $NetBSD: Makefile,v 1.3 2014/10/07 23:48:17 makoto Exp $
+
 DISTNAME=	git-modes-git-0.1
 CATEGORIES=	devel
-LICENSE=	gnu-gpl-v3
-
-GIT_REPOSITORIES=	master
-GIT_REPO.master=	https://github.com/magit/git-modes.git
-GIT_MODULE.master=	git-modes
-GIT_ENV.master+=	GIT_SSL_NO_VERIFY=true
+GIT_REPO=	https://github.com/magit/git-modes.git
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/magit/git-modes
 COMMENT=	Git-modes submodule for magit.el
-
-WRKSRC=		${WRKDIR}/git-modes
+LICENSE=	gnu-gpl-v3
 
 USE_TOOLS+=	gmake
 
-BUILD_TARGET=		lisp
-INSTALLATION_DIRS=	${DESTDIR}${PREFIX}/share/emacs/site-lisp/git-modes
-AUTO_MKDIRS=		yes
+BUILD_TARGET=	lisp
+AUTO_MKDIRS=	yes
 
 do-install:
-		${INSTALL_DATA_DIR}	${INSTALLATION_DIRS}
-		${INSTALL_DATA} ${WRKSRC}/*.el  ${WRKSRC}/*.elc ${INSTALLATION_DIRS}
+	cd ${WRKSRC} && ${INSTALL_DATA} *.el *.elc \
+		${DESTDIR}${PREFIX}/share/emacs/site-lisp/git-modes
 
 .include "../../wip/emacs-git/modules.mk"
 .include "../../wip/mk/git-package.mk"
diff --git a/gr-fcdproplus-git/Makefile b/gr-fcdproplus-git/Makefile
index ccf6a74ba1..5a1ffe1186 100644
--- a/gr-fcdproplus-git/Makefile
+++ b/gr-fcdproplus-git/Makefile
@@ -2,22 +2,17 @@
 
 DISTNAME=		gr-fcdproplus-3.7
 CATEGORIES=		ham
+GIT_REPO=		https://github.com/dl1ksv/gr-fcdproplus
 
 MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=		https://github.com/dl1ksv/gr-fcdproplus
 COMMENT=		Addon for funcube dongle pro+ to GNU Radio
 LICENSE=		gnu-gpl-v2
 
-GIT_REPOSITORIES=	master
-GIT_REPO.master=	https://github.com/dl1ksv/gr-fcdproplus
-GIT_MODULE.master=	gr-fcdproplus
-GIT_ENV.master+=	GIT_SSL_NO_VERIFY=true
-
 USE_LANGUAGES=		c c++
-USE_TOOLS=		cmake
+USE_TOOLS+=		cmake
 USE_CMAKE=		yes
 
-WRKSRC=			${WRKDIR}/gr-fcdproplus
 CXXFLAGS+=		-I${PREFIX}/include/libusb-1.0
 
 # Suppress warning for developer
@@ -33,7 +28,7 @@ SUBST_MESSAGE.libusb=	Fix for "libusb.h not found"
 
 .include	"../../wip/mk/git-package.mk"
 # you need place after above line for now.
-_GIT_FLAGS=		# set empty, --depth 1 seems harmfull
+#_GIT_FLAGS=		# set empty, --depth 1 seems harmfull
 
 .include	"../../devel/boost-headers/buildlink3.mk"
 .include	"../../devel/boost-libs/buildlink3.mk"
diff --git a/irssi-otr/Makefile b/irssi-otr/Makefile
index d3123bfe54..08f8fffc51 100644
--- a/irssi-otr/Makefile
+++ b/irssi-otr/Makefile
@@ -3,26 +3,20 @@
 DISTNAME=		irssi-otr-1.01
 PKGREVISION=		1
 CATEGORIES=		chat
+GIT_REPO=		git://github.com/cryptodotis/irssi-otr.git
+# v1.01 is not tagged; use a version slightly after that.
+#GIT_REVISION.github=	4ad3b7b6c85be0154ab3694fe9831796db20c4fe
+# libotr >= 4.1.0 in configure.ac and spec file; Jan 12, 2015
+GIT_REVISION=		f75eb260c168b708873f2770d95b9a1b66144edd
 
 MAINTAINER=		rhialto%falu.nl@localhost
 HOMEPAGE=		https://github.com/cryptodotis/irssi-otr
 COMMENT=		Libotr (https://otr.cypherpunks.ca) support for Irssi
 LICENSE=		gnu-gpl-v2
 
-GIT_REPOSITORIES=	github
-GIT_REPO.github=	git://github.com/cryptodotis/irssi-otr.git
-GIT_MODULE.github=	irssi-otr
-# v1.01 is not tagged; use a version slightly after that.
-#GIT_REVISION.github=	4ad3b7b6c85be0154ab3694fe9831796db20c4fe
-# libotr >= 4.1.0 in configure.ac and spec file; Jan 12, 2015
-GIT_REVISION.github=	f75eb260c168b708873f2770d95b9a1b66144edd
-
-WRKSRC=			${WRKDIR}/${PKGBASE}
+DEPENDS+=		irssi>=0.8.15:../../chat/irssi
 
-USE_TOOLS+=		pkg-config
-USE_TOOLS+=		gmake
-USE_TOOLS+=		automake
-USE_TOOLS+=		autoconf
+USE_TOOLS+=		autoconf automake gmake pkg-config
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
 
@@ -30,8 +24,6 @@ CONFIGURE_ARGS+=	--prefix=${BUILDLINK_PREFIX.irssi}
 CONFIGURE_ARGS+=	--with-irssi-headers=${BUILDLINK_PREFIX.irssi}
 CONFIGURE_ARGS+=	--with-irssi-module-dir=${BUILDLINK_PREFIX.irssi}/lib/irssi/modules
 
-DEPENDS+=		irssi>=0.8.15:../../chat/irssi
-
 # Since there is no chat/irssi/buildlink3.mk, we have to base our
 # BUILDLINK_PREFIX.irssi on something else.
 BUILDLINK_PREFIX.irssi=	${PREFIX}
diff --git a/libvterm/Makefile b/libvterm/Makefile
index 938f309708..83cd4b8fb1 100644
--- a/libvterm/Makefile
+++ b/libvterm/Makefile
@@ -2,17 +2,12 @@
 
 PKGNAME=	libvterm-0.0.0
 CATEGORIES=	devel
-MASTER_SITES=	https://github.com/neovim/livterm/archive/
+GIT_REPO=	git://github.com/neovim/libvterm.git
 
 HOMEPAGE=	http://www.leonerd.org.uk/code/libvterm/
 COMMENT=	Abstract VT220/Xterm/ECMA-48 emulation library
 LICENSE=	mit
 
-GIT_REPOSITORIES=	libvterm
-GIT_REPO.libvterm=	git://github.com/neovim/libvterm.git
-GIT_MODULE.libvterm=	libvterm
-WRKSRC=			${WRKDIR}/${GIT_MODULE.libvterm}
-
 USE_LANGUAGES=	c
 USE_TOOLS+=	pkg-config gmake perl
 USE_LIBTOOL=	yes
Prev by Date: mk/*-package.mk: test packages needing multiple repositories
Next by Date: wip/*: fix pkglint warnings about alignment and PLIST
Previous by Thread: mk/*-package.mk: test packages needing multiple repositories
Next by Thread: wip/*: fix pkglint warnings about alignment and PLIST
Indexes:
Home | Main Index | Thread Index | Old Index