pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

wip/*: make Git configuration simpler



Module Name:	pkgsrc-wip
Committed By:	Roland Illig <rillig%NetBSD.org@localhost>
Pushed By:	rillig
Date:		Sun Feb 25 21:09:20 2018 +0000
Changeset:	277564d1fd2dd0f3e121ab0cb419633d5f926f40

Modified Files:
	FLIF-git/Makefile
	Qweyboard/Makefile
	apel-git/Makefile
	auto-complete-git/Makefile
	boinc-git/Makefile
	bup-git/Makefile
	cli-git/Makefile
	ctags-git/Makefile
	p5-Packager-Utils/Makefile
	py-dropbox/Makefile
	py-percol/Makefile
	re2-git/Makefile
	scummvm-git/Makefile
	sdif-git/DESCR
	sdif-git/Makefile
	simulavr-git/Makefile
	surf2-git/Makefile
	toxcore-git/Makefile
	toxcore-git/distinfo
	toxic-git/Makefile
	zero-epwing-git/Makefile

Log Message:
wip/*: make Git configuration simpler

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

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

diffstat:
 FLIF-git/Makefile          |  6 +-----
 Qweyboard/Makefile         |  6 +-----
 apel-git/Makefile          |  7 ++-----
 auto-complete-git/Makefile |  8 ++------
 boinc-git/Makefile         |  4 +---
 bup-git/Makefile           |  5 +----
 cli-git/Makefile           |  9 +++------
 ctags-git/Makefile         | 14 +-------------
 p5-Packager-Utils/Makefile |  5 ++---
 py-dropbox/Makefile        |  7 +------
 py-percol/Makefile         |  6 +-----
 re2-git/Makefile           | 11 +++--------
 scummvm-git/Makefile       |  8 ++------
 sdif-git/DESCR             | 12 +++++-------
 sdif-git/Makefile          |  6 +-----
 simulavr-git/Makefile      |  6 +-----
 surf2-git/Makefile         | 16 +++++-----------
 toxcore-git/Makefile       |  6 +-----
 toxcore-git/distinfo       |  1 +
 toxic-git/Makefile         |  6 +-----
 zero-epwing-git/Makefile   | 25 +++++++------------------
 21 files changed, 43 insertions(+), 131 deletions(-)

diffs:
diff --git a/FLIF-git/Makefile b/FLIF-git/Makefile
index c4bb5d0438..974925fe13 100644
--- a/FLIF-git/Makefile
+++ b/FLIF-git/Makefile
@@ -2,11 +2,7 @@
 
 DISTNAME=	FLIF-0.3
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_GITHUB:=FLIF-hub/}
-
-GIT_REPOSITORIES=	flif
-GIT_REPO.flif=		git://github.com/FLIF-hub/flif.git
-WRKSRC=			${WRKDIR}/flif
+GIT_REPO=	git://github.com/FLIF-hub/flif.git
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://flif.info/
diff --git a/Qweyboard/Makefile b/Qweyboard/Makefile
index 2a4a6bde78..220ecffa3a 100644
--- a/Qweyboard/Makefile
+++ b/Qweyboard/Makefile
@@ -2,11 +2,7 @@
 
 DISTNAME=	Qweyboard-0.0.0
 CATEGORIES=	inputmethod
-MASTER_SITES=	${MASTER_SITE_GITHUB:=kqr/}
-
-GIT_REPOSITORIES=	qweyboard
-GIT_REPO.qweyboard=	https://github.com/kqr/qweyboard.git
-WRKSRC=			${WRKDIR}/qweyboard
+GIT_REPO=	https://github.com/kqr/qweyboard.git
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/kqr/qweyboard
diff --git a/apel-git/Makefile b/apel-git/Makefile
index 3d0813ffe6..fd3b839126 100644
--- a/apel-git/Makefile
+++ b/apel-git/Makefile
@@ -9,12 +9,9 @@ HOMEPAGE=	http://git.chise.org/elisp/apel/
 COMMENT=	Portable Emacs library
 LICENSE=	gnu-gpl-v2 OR gnu-gpl-v3
 
-GIT_REPOSITORIES=	master
-GIT_REPO.master=	http://git.chise.org/git/elisp/apel.git
-GIT_MODULE.master=	apel
-#_GIT_FLAGS+=		--quiet --depth 1
+GIT_REPO=	http://git.chise.org/git/elisp/apel.git
+#_GIT_FLAGS+=	--quiet --depth 1
 
-WRKSRC=			${WRKDIR}/${PKGBASE}
 INFO_FILES=		yes
 USE_LANGUAGES=		# none
 USE_TOOLS+=		gmake makeinfo
diff --git a/auto-complete-git/Makefile b/auto-complete-git/Makefile
index a7e627d510..9f1e9d42a5 100644
--- a/auto-complete-git/Makefile
+++ b/auto-complete-git/Makefile
@@ -3,6 +3,7 @@
 
 DISTNAME=	auto-complete-0
 CATEGORIES=	editors
+GIT_REPO=	git://github.com/auto-complete/auto-complete.git
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://cx4a.org/software/auto-complete/
@@ -12,12 +13,6 @@ LICENSE=	gnu-gpl-v3
 DEPENDS+=	${EMACS_PKGNAME_PREFIX}fuzzy-el-[0-9]*:../../wip/fuzzy-el-current
 DEPENDS+=	${EMACS_PKGNAME_PREFIX}popup-el-[0-9]*:../../wip/popup-el-current
 
-GIT_REPOSITORIES=	auto-complete
-GIT_REPO.auto-complete=	git://github.com/auto-complete/auto-complete.git
-.include "../../wip/mk/git-package.mk"
-
-WRKSRC=			${WRKDIR}/auto-complete
-
 MESSAGE_SUBST+=		LISPDIR=${EMACS_LISPPREFIX}
 MESSAGE_SUBST+=		PKGBASE=${PKGBASE}
 INSTALLATION_DIRS=	${EMACS_LISPPREFIX}/${PKGBASE}
@@ -35,4 +30,5 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${DESTDIR}${PREFIX}/share/doc/auto-complete
 
 .include "../../editors/emacs/modules.mk"
+.include "../../wip/mk/git-package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/boinc-git/Makefile b/boinc-git/Makefile
index 2db6f43610..a64e75b826 100644
--- a/boinc-git/Makefile
+++ b/boinc-git/Makefile
@@ -4,9 +4,7 @@ DISTNAME=	boinc-7.9.0
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GITHUB:=BOINC/}
 
-GIT_REPOSITORIES=	boinc
-GIT_REPO.boinc=		https://github.com/BOINC/boinc.git
-WRKSRC=			${WRKDIR}/boinc
+GIT_REPO=	https://github.com/BOINC/boinc.git
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://boinc.berkeley.edu/
diff --git a/bup-git/Makefile b/bup-git/Makefile
index e483ba06b6..9b59df4089 100644
--- a/bup-git/Makefile
+++ b/bup-git/Makefile
@@ -21,10 +21,7 @@ BUILD_DEPENDS+=	rdiff-backup-[0-9]*:../../sysutils/rdiff-backup
 
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-fuse-bindings
 
-GIT_REPOSITORIES=	bup
-GIT_REPO.bup=		git://github.com/bup/bup.git
-
-WRKSRC=			${WRKDIR}/bup
+GIT_REPO=	git://github.com/bup/bup.git
 
 TEST_TARGET=	test
 
diff --git a/cli-git/Makefile b/cli-git/Makefile
index ee2b1afb48..d65979273a 100644
--- a/cli-git/Makefile
+++ b/cli-git/Makefile
@@ -1,11 +1,8 @@
 # $NetBSD: Makefile,v 1.3 2015/04/25 10:01:54 krytarowski Exp $
 
-GIT_REPOSITORIES=	cli
-GIT_REPO.cli=		https://github.com/dotnet/cli.git
-
-DISTNAME=	cli
-PKGNAME=	cli-0.0.0
+DISTNAME=	cli-0.0.0
 CATEGORIES=	devel
+GIT_REPO=	https://github.com/dotnet/cli.git
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/dotnet/cli
@@ -19,7 +16,7 @@ USE_TOOLS+=	bash
 REPLACE_BASH+=	build.sh
 
 do-build:
-		${RUN} cd ${WRKSRC} && PYTHON=${PYTHONBIN} ./build.sh
+	${RUN} cd ${WRKSRC} && PYTHON=${PYTHONBIN} ./build.sh
 
 .include "../../textproc/icu/buildlink3.mk"
 .include "../../wip/llvm-git/buildlink3.mk"
diff --git a/ctags-git/Makefile b/ctags-git/Makefile
index 2a840a950b..d9d700d8a2 100644
--- a/ctags-git/Makefile
+++ b/ctags-git/Makefile
@@ -2,29 +2,17 @@
 
 DISTNAME=	ctags-5.8
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GITHUB:=universal-ctags/}
+GIT_REPO=	git://github.com/universal-ctags/ctags
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://ctags.io/
 COMMENT=	Maintained ctags implementation
 LICENSE=	gnu-gpl-v2
 
-GIT_REPOSITORIES=	ctags
-GIT_REPO.ctags=		git://github.com/universal-ctags/ctags
-GIT_MODULE.ctags=	ctags
-
-WRKSRC=			${WRKDIR}/${GIT_MODULE.ctags}
-
 BUILD_DEPENDS+=		${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils
 USE_TOOLS=		aclocal autoreconf autoconf automake autoheader
 USE_TOOLS+=		bash gmake perl
 
-SUBST_CLASSES+=		bash
-SUBST_MESSAGE.bash=	Fixing shellbang references to bash.
-SUBST_STAGE.bash=	post-extract
-SUBST_SED.bash=		-e 's,\#\!/bin/bash,\#\!${BASH},g'
-SUBST_FILES.bash=	misc/optlib2c
-
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	RST2MAN=${PREFIX}/bin/rst2man-${PYVERSSUFFIX}.py
 CONFIGURE_ARGS+=	--enable-macro-patterns
diff --git a/p5-Packager-Utils/Makefile b/p5-Packager-Utils/Makefile
index 85b4a17a3b..ff2e766394 100644
--- a/p5-Packager-Utils/Makefile
+++ b/p5-Packager-Utils/Makefile
@@ -8,8 +8,8 @@ MAINTAINER=	sno%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/rehsack/Packager-Utils
 COMMENT=	Support packagers managing packages and upstream mapping
 
-GIT_REPOSITORIES=		Packager-Utils
-GIT_REPO.Packager-Utils=	https://github.com/rehsack/Packager-Utils.git
+GIT_REPO=	https://github.com/rehsack/Packager-Utils.git
+
 .include "../../wip/mk/git-package.mk"
 
 # fatal: unable to access 'http://github.com/...': SSL certificate problem: unable to get local issuer certificate
@@ -18,7 +18,6 @@ PKGSRC_SETENV=		GIT_SSL_NO_VERIFY=true
 
 INSTALLATION_DIRS=	share/examples/p5-Packager-Utils
 
-WRKSRC=			${WRKDIR}/Packager-Utils
 PERL5_MODULE_TYPE=	MakeMaker
 PERL5_PACKLIST=		auto/Packager/Utils/.packlist
 
diff --git a/py-dropbox/Makefile b/py-dropbox/Makefile
index bded649538..52e3515622 100644
--- a/py-dropbox/Makefile
+++ b/py-dropbox/Makefile
@@ -3,20 +3,15 @@
 DISTNAME=	dropbox-3.38
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	net
-MASTER_SITES=	#
+GIT_REPO=	git://github.com/dropbox/dropbox-sdk-python.git
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/dropbox/dropbox-sdk-python
 COMMENT=	Python SDK for the Dropbox API v2
 LICENSE=	mit
 
-GIT_REPOSITORIES=		dropbox-sdk-python
-GIT_REPO.dropbox-sdk-python=	git://github.com/dropbox/dropbox-sdk-python.git
-
 DEPENDS+=	${PYPKGPREFIX}-urllib3-[0-9]*:../../www/py-urllib3
 
-WRKSRC=		${WRKDIR}/dropbox-sdk-python
-
 .include "../../lang/python/egg.mk"
 .include "../../wip/mk/git-package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-percol/Makefile b/py-percol/Makefile
index 042b9ea232..106d3ee4b5 100644
--- a/py-percol/Makefile
+++ b/py-percol/Makefile
@@ -4,17 +4,13 @@
 DISTNAME=	percol-0.0.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	misc
+GIT_REPO=	git://github.com/mooz/percol.git
 
 MAINTAINER=	pho%cielonegro.org@localhost
 HOMEPAGE=	https://github.com/mooz/percol
 COMMENT=	Filter lines interactively in a pipeline
 LICENSE=	mit
 
-GIT_REPOSITORIES=	mooz
-GIT_REPO.mooz=		git://github.com/mooz/percol.git
-GIT_MODULE.mooz=	percol
-WRKSRC=			${WRKDIR}/percol
-
 SUBST_CLASSES+=		migemo
 SUBST_STAGE.migemo=	pre-build
 SUBST_MESSAGE.migemo=	Replacing path to the migemo dictionary
diff --git a/re2-git/Makefile b/re2-git/Makefile
index e02c38240f..f72d20de7a 100644
--- a/re2-git/Makefile
+++ b/re2-git/Makefile
@@ -1,21 +1,16 @@
 # $NetBSD: Makefile,v 1.3 2012/10/07 14:53:43 asau Exp $
 
 DISTNAME=	re2-0.99
-PKGNAME=	${DISTNAME}
 CATEGORIES=	devel
+GIT_REPO=	git%github.com@localhost:google/re2.git
 
 MAINTAINER=	asau%inbox.ru@localhost
 HOMEPAGE=	https://github.com/google/re2
-COMMENT=	RE2 is a fast, safe, thread-friendly regular expressions library
+COMMENT=	Fast, safe, thread-friendly regular expressions library
 LICENSE=	modified-bsd
 
-WRKSRC=		${WRKDIR}/${PKGBASE}
-
 USE_LANGUAGES=	c c++
-USE_TOOLS=	gmake
-
-GIT_REPOSITORIES=	re2
-GIT_REPO.re2=		git%github.com@localhost:google/re2.git
+USE_TOOLS+=	gmake
 
 .include "../../wip/mk/git-package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/scummvm-git/Makefile b/scummvm-git/Makefile
index f90a6d1511..40939b78a1 100644
--- a/scummvm-git/Makefile
+++ b/scummvm-git/Makefile
@@ -2,6 +2,7 @@
 
 DISTNAME=	scummvm-${SCM_VER}
 CATEGORIES=	games
+GIT_REPO=	git%github.com@localhost:scummvm/scummvm.git
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://scummvm.sourceforge.net/
@@ -15,15 +16,9 @@ USE_LANGUAGES=		c c++
 HAS_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--prefix=${LOCALBASE}
 CONFIGURE_ARGS+=	--mandir=${LOCALBASE}/${PKGMANDIR}
-WRKSRC=			${WRKDIR}/scummvm
 
 .include "options.mk"
 
-GIT_REPOSITORIES=	scummvm
-GIT_REPO.scummvm=	git%github.com@localhost:scummvm/scummvm.git
-
-.include "../../wip/mk/git-package.mk"
-
 .include "../../mk/bsd.prefs.mk"
 
 .if ${MACHINE_ARCH} == i386
@@ -42,4 +37,5 @@ BUILDLINK_API_DEPENDS.zlib+=	zlib>=1.2.0.4
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../wip/mk/git-package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sdif-git/DESCR b/sdif-git/DESCR
index e46887cba0..3d2bbf3ab4 100644
--- a/sdif-git/DESCR
+++ b/sdif-git/DESCR
@@ -1,7 +1,5 @@
-Sdif is inspired by System V sdiff(1) command. The basic
-feature of sdif is making a side-by-side listing of two
-different files. All contents of two files are listed on left
-and right sides. Center column is used to indicate how
-different those lines. No mark means no difference. Added,
-deleted and modified lines are marked with `<' and `>'
-character.
+Sdif is inspired by System V sdiff(1) command. The basic feature of sdif
+is making a side-by-side listing of two different files. All contents of
+two files are listed on left and right sides. Center column is used to
+indicate how different those lines. No mark means no difference. Added,
+deleted and modified lines are marked with `<' and `>' character.
diff --git a/sdif-git/Makefile b/sdif-git/Makefile
index 21073eb5f0..014110661a 100644
--- a/sdif-git/Makefile
+++ b/sdif-git/Makefile
@@ -2,18 +2,14 @@
 
 DISTNAME=	sdif-1.0
 CATEGORIES=	devel
+GIT_REPO=	https://github.com/kaz-utashiro/sdif
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://kaz-utashiro.github.io/sdif/
 COMMENT=	Side-by-side diff viewer (for ANSI color terminal)
 LICENSE=	mit
 
-GIT_REPOSITORIES=	master
-GIT_REPO.master=	https://github.com/kaz-utashiro/sdif
-GIT_MODULE.master=	sdif
-
 DEPENDS+=	p5-Text-Glob-[0-9]*:../../textproc/p5-Text-Glob
-WRKSRC=		${WRKDIR}/${PKGBASE}
 USE_TOOLS+=	perl:run
 USE_LANGUAGES=	# none
 
diff --git a/simulavr-git/Makefile b/simulavr-git/Makefile
index aebae7031f..383b4686e2 100644
--- a/simulavr-git/Makefile
+++ b/simulavr-git/Makefile
@@ -2,7 +2,7 @@
 #
 DISTNAME=		simulavr-1.0.0
 CATEGORIES=		emulators
-MASTER_SITES=		http://download.savannah.gnu.org/releases/simulavr/
+GIT_REPO=		git://git.savannah.nongnu.org/simulavr.git
 
 MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=		http://www.nongnu.org/simulavr/
@@ -12,9 +12,6 @@ LICENSE=		gnu-gpl-v2
 BUILD_DEPENDS+=		doxygen-[0-9]*:../../devel/doxygen
 BUILD_DEPENDS+=		avr-libc-[0-9]*:../../wip/avr-libc
 
-GIT_REPOSITORIES=	master
-GIT_MODULE.master=	simulavr
-GIT_REPO.master=	git://git.savannah.nongnu.org/simulavr.git
 GIT_FLAGS?=		--depth 1
 
 USE_LANGUAGES+=		c c++
@@ -24,7 +21,6 @@ USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 INFO_FILES=		yes
 USE_PKGLOCALEDIR=	yes
-WRKSRC=			${WRKDIR}/${PKGBASE}
 
 CONFIGURE_ARGS+=	--enable-python=python${PYVERSSUFFIX}
 CONFIGURE_ARGS+=	--with-bfd=${PREFIX}/avr
diff --git a/surf2-git/Makefile b/surf2-git/Makefile
index 7adbc443d6..db24fc18b5 100644
--- a/surf2-git/Makefile
+++ b/surf2-git/Makefile
@@ -2,21 +2,17 @@
 
 DISTNAME=	surf2-0.0
 CATEGORIES=	www
-MASTER_SITES=	http://dl.suckless.org/surf/
+GIT_REPO=	http://git.suckless.org/surf
+GIT_BRANCH=	surf-webkit2
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://surf.suckless.org/
-COMMENT=	Surf is a fast and minimalistic web browser based on WebKit/GTK+
+COMMENT=	Fast and minimalistic web browser based on WebKit/GTK+
 LICENSE=	mit
 
-GIT_REPOSITORIES=	surf
-GIT_REPO.surf=		http://git.suckless.org/surf
-GIT_BRANCH.surf=	surf-webkit2
-WRKSRC=			${WRKDIR}/surf
-
+USE_TOOLS+=	pkg-config
 MAKE_JOBS_SAFE=	no
-
-USE_TOOLS+=		pkg-config
+AUTO_MKDIRS=	yes
 
 SUBST_CLASSES+=		configmk
 SUBST_STAGE.configmk=	pre-configure
@@ -29,8 +25,6 @@ SUBST_SED.configmk+=	-e 's,^CFLAGS *= ,CFLAGS += ,'
 SUBST_SED.configmk+=	-e 's,^LDFLAGS *= ,LDFLAGS += ,'
 SUBST_SED.configmk+=	-e 's/cc/${CC:Q}/'
 
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
-
 .include "../../www/webkit-gtk/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
 .include "../../wip/mk/git-package.mk"
diff --git a/toxcore-git/Makefile b/toxcore-git/Makefile
index 56ff4dcd95..ed1a3038d6 100644
--- a/toxcore-git/Makefile
+++ b/toxcore-git/Makefile
@@ -2,11 +2,7 @@
 
 DISTNAME=	toxcore-0.2.0
 CATEGORIES=	chat
-MASTER_SITES=	${MASTER_SITE_GITHUB:=toktok/}
-
-GIT_REPOSITORIES=	c-toxcore
-GIT_REPO.c-toxcore=	http://github.com/toktok/c-toxcore.git
-WRKSRC=			${WRKDIR}/c-toxcore
+GIT_REPO=	https://github.com/toktok/c-toxcore.git
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://tox.chat/
diff --git a/toxcore-git/distinfo b/toxcore-git/distinfo
index 09f4177aa8..ca1b44fd23 100644
--- a/toxcore-git/distinfo
+++ b/toxcore-git/distinfo
@@ -1,2 +1,3 @@
 $NetBSD$
+
 SHA1 (patch-configure.ac) = ca98e454bff6c9ceabdc15bfe216617211e89316
diff --git a/toxic-git/Makefile b/toxic-git/Makefile
index 110617ebc6..cd36fc7c16 100644
--- a/toxic-git/Makefile
+++ b/toxic-git/Makefile
@@ -2,11 +2,7 @@
 
 DISTNAME=	toxic-0.8.0
 CATEGORIES=	chat
-MASTER_SITES=	${MASTER_SITE_GITHUB:=JFreegman/}
-
-GIT_REPOSITORIES=	toxic
-GIT_REPO.toxic=		https://github.com/JFreegman/toxic.git
-WRKSRC=			${WRKDIR}/toxic
+GIT_REPO=	https://github.com/JFreegman/toxic.git
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://wiki.tox.chat/clients/toxic
diff --git a/zero-epwing-git/Makefile b/zero-epwing-git/Makefile
index 7dc71a0f83..80d13b7f3c 100644
--- a/zero-epwing-git/Makefile
+++ b/zero-epwing-git/Makefile
@@ -1,10 +1,8 @@
 # $NetBSD$
 
-PKGNAME=		zero-epwing-0.1
-CATEGORIES=		textproc
-
-GIT_REPOSITORIES=	zero-epwing
-GIT_REPO.zero-epwing=	git://github.com/FooSoft/zero-epwing.git
+PKGNAME=	zero-epwing-0.1
+CATEGORIES=	textproc
+GIT_REPO=	git://github.com/FooSoft/zero-epwing.git
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/FooSoft/zero-epwing
@@ -16,8 +14,6 @@ USE_LANGUAGES=	c c++
 
 USE_TOOLS+=	gmake perl # required for the bundled libeb
 
-WRKSRC=		${WRKDIR}/zero-epwing
-
 INSTALLATION_DIRS+=	bin
 INSTALLATION_DIRS+=	share/doc/${PKGBASE}
 
@@ -34,22 +30,15 @@ CFLAGS+=	-std=gnu99
 # ...unless everyone wants a libeb-but-only-for-zero-epwing pkg in pkgsrc.
 
 do-configure:
-	set -e ; cd ${WRKSRC}/eb; \
+	${RUN} cd ${WRKSRC}/eb; \
 	./configure --disable-shared --disable-ebnet --disable-nls
 
-	set -e ; cd ${WRKSRC}; \
+	${RUN} cd ${WRKSRC}; \
 	${PKGSRC_SETENV} ${_CONFIGURE_CMAKE_ENV} \
 		cmake ${CMAKE_ARGS} ${CMAKE_ARG_PATH}
 
-do-build:
-	set -e ; cd ${WRKSRC}/eb \
-	&& ${MAKE_PROGRAM}
-
-	set -e ; cd ${WRKSRC} \
-	&& env ${MAKE_ENV} \
-		${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS} \
-		-f ${MAKE_FILE} \
-		${BUILD_TARGET}
+pre-build:
+	${RUN} cd ${WRKSRC}/eb && ${MAKE_PROGRAM}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/zero-epwing ${DESTDIR}${PREFIX}/bin


Home | Main Index | Thread Index | Old Index