wip/mk/git-package.mk cleanups
Richard Hansen <[email protected]> Thu, 01 May 2014 15:34:56 -0400
| Newsgroups | gmane.os.netbsd.devel.packages,gmane.os.netbsd.devel.pkgsrc.wip.general |
|---|---|
| Message-ID | <[email protected]> |
This is a multi-part message in MIME format.
--------------050107010300010505070507
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Hi all,
Attached are some fixes/cleanups to wip/mk/git-package.mk. I'd
appreciate it if someone would review them before I commit them to the
pkgsrc-wip repository (please cc me in any replies).
The main user-visible change is that it is no longer necessary to set
WRKSRC or GIT_MODULE.foo except in unusual circumstances (e.g., cloning
two repositories). Simple packages only need to do this:
GIT_REPOSITORIES= foo
GIT_REPO.foo= url://to/repo.git
and it will work regardless of the name of the repository in the Git
URL, the value chosen for ${GIT_REPOSITORIES}, or the value of ${PKGNAME}.
Patches #1 through #7 clean up git-package.mk itself, and patch #8
cleans up the packages that use git-package.mk. I have not tried
building all of the packages affected by patch #8; some of them fail to
build even without these patches applied.
I did not touch the GIT_TAG or CHECKOUT_DATE mechanisms; those are still
broken (they do nothing).
Thanks,
Richard
--------------050107010300010505070507
Content-Type: text/x-diff;
name="0001-document-the-GIT_MODULE.-id-public-variable.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename*0="0001-document-the-GIT_MODULE.-id-public-variable.patch"
>From b620c95f1e3145a29ceef10eee288c9c753ab8c8 Mon Sep 17 00:00:00 2001
From: Richard Hansen <[email protected]>
Date: Thu, 27 Feb 2014 15:38:11 -0500
Subject: [PATCH 1/8] document the GIT_MODULE.${id} public variable
---
mk/git-package.mk | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/mk/git-package.mk b/mk/git-package.mk
index 137b0cf..35cc115 100644
--- a/mk/git-package.mk
+++ b/mk/git-package.mk
@@ -18,6 +18,13 @@
# GIT_TAG.${id}
# Overridable GIT tag for a repository.
#
+# GIT_MODULE.${id}
+# Name of the subdirectory in ${WRKDIR} containing the
+# cloned repository. This is also used to name the
+# clone cache tarball stored in ${DISTDIR}.
+#
+# Defaults to ${id}.
+#
.if !defined(_PKG_MK_GIT_PACKAGE_MK)
_PKG_MK_GIT_PACKAGE_MK= # defined
@@ -75,6 +82,7 @@ _GIT_DISTDIR= ${DISTDIR}/git-packages
# Generation of repository-specific variables
#
+# the name of the git repository as created by 'git clone'
.for repo in ${GIT_REPOSITORIES}
GIT_MODULE.${repo}?= ${repo}
--
1.9.2
--------------050107010300010505070507
Content-Type: text/x-diff;
name="0002-always-git-clone-into-GIT_MODULE.-_repo_.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="0002-always-git-clone-into-GIT_MODULE.-_repo_.patch"
>From b9a33f38316b96954adc62a5501eb8beb46b8db6 Mon Sep 17 00:00:00 2001
From: Richard Hansen <[email protected]>
Date: Thu, 27 Feb 2014 15:39:13 -0500
Subject: [PATCH 2/8] always 'git clone' into ${GIT_MODULE.${_repo_}}
Before, it was cloning into whatever directory 'git clone' wanted to
use and assumed that the resulting directory name matched
${GIT_MODULE.${_repo_}}. Now 'git clone' is forced to clone into
${GIT_MODULE.${_repo_}} so that they are guaranteed to match.
---
mk/git-package.mk | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/mk/git-package.mk b/mk/git-package.mk
index 35cc115..2853d09 100644
--- a/mk/git-package.mk
+++ b/mk/git-package.mk
@@ -131,7 +131,8 @@ do-git-extract:
${SETENV} ${_GIT_ENV} \
${_GIT_CMD} clone \
${_GIT_FLAGS} \
- ${GIT_REPO.${_repo_}:Q}; \
+ ${GIT_REPO.${_repo_}:Q} \
+ ${GIT_MODULE.${_repo_}:Q}; \
${_GIT_CREATE_CACHE.${_repo_}}
.endfor
--
1.9.2
--------------050107010300010505070507
Content-Type: text/x-diff;
name="0003-point-WRKSRC-to-the-Git-clone-if-it-doesn-t-exist-by.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename*0="0003-point-WRKSRC-to-the-Git-clone-if-it-doesn-t-exist-by.pa";
filename*1="tch"
>From 3a28d736a53791cb079cdd9d65bf2bb9fe5cb87a Mon Sep 17 00:00:00 2001
From: Richard Hansen <[email protected]>
Date: Thu, 27 Feb 2014 18:34:25 -0500
Subject: [PATCH 3/8] point ${WRKSRC} to the Git clone if it doesn't exist by
post-extract
Packages that use git-package.mk typically only have source files from
a single Git clone; they do not usually clone multiple repositories or
fetch a tarball in addition to cloning. To simplify package
development in this common case without breaking more elaborate cases,
create ${WRKSRC} as a symlink pointing to the first Git clone if
${WRKSRC} doesn't exist by the time post-extract is run.
With this change, simple Git packages no longer need to do
'WRKSRC=${WRKDIR}/${GIT_MODULE.foo}'.
---
mk/git-package.mk | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/mk/git-package.mk b/mk/git-package.mk
index 2853d09..b1dc47a 100644
--- a/mk/git-package.mk
+++ b/mk/git-package.mk
@@ -25,6 +25,10 @@
#
# Defaults to ${id}.
#
+# If ${WRKSRC} doesn't exist by the time post-extract is
+# run, ${WRKSRC} will be created as a symlink pointing
+# to ${GIT_MODULE.${GIT_REPOSITORIES:[1]}}.
+#
.if !defined(_PKG_MK_GIT_PACKAGE_MK)
_PKG_MK_GIT_PACKAGE_MK= # defined
@@ -136,4 +140,15 @@ do-git-extract:
${_GIT_CREATE_CACHE.${_repo_}}
.endfor
+post-extract: do-git-post-extract
+.PHONY: do-git-post-extract
+do-git-post-extract:
+.if ${GIT_REPOSITORIES:[\#]} > 0
+ ${RUN} \
+ if [ ! -e ${WRKSRC:Q} ] && [ ! -h ${WRKSRC:Q} ]; then \
+ ${LN} -s ${GIT_MODULE.${GIT_REPOSITORIES:[1]}:Q} \
+ ${WRKSRC:Q}; \
+ fi;
+.endif
+
.endif
--
1.9.2
--------------050107010300010505070507
Content-Type: text/x-diff;
name="0004-move-_GIT_EXTRACT_CACHED-and-_GIT_CREATE_CACHE-into-.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename*0="0004-move-_GIT_EXTRACT_CACHED-and-_GIT_CREATE_CACHE-into-.pa";
filename*1="tch"
>From 4032682ed5916d61cb8a230735c781c933a9e20e Mon Sep 17 00:00:00 2001
From: Richard Hansen <[email protected]>
Date: Thu, 27 Feb 2014 18:15:30 -0500
Subject: [PATCH 4/8] move _GIT_EXTRACT_CACHED and _GIT_CREATE_CACHE into
do-git-extract
Move the code contained in the make variables
_GIT_EXTRACT_CACHED.${_repo_} and _GIT_CREATE_CACHE.${_repo_} to the
do-git-extract target. This will make it easier to make modifications
to the target's commands.
---
mk/git-package.mk | 26 +++++++++-----------------
1 file changed, 9 insertions(+), 17 deletions(-)
diff --git a/mk/git-package.mk b/mk/git-package.mk
index b1dc47a..0878237 100644
--- a/mk/git-package.mk
+++ b/mk/git-package.mk
@@ -105,23 +105,9 @@ _GIT_TAG_FLAG.${repo}= '-D${_GIT_TODAY} 00:00 +0000'
_GIT_TAG.${repo}= ${_GIT_TODAY:Q}
. endif
-# Cache support:
-# cache file name
+# cache file name
_GIT_DISTFILE.${repo}= ${PKGBASE}-${GIT_MODULE.${repo}}-${_GIT_TAG.${repo}}.tar.gz
-# command to extract cache file
-_GIT_EXTRACT_CACHED.${repo}= \
- if [ -f ${_GIT_DISTDIR}/${_GIT_DISTFILE.${repo}:Q} ]; then \
- ${STEP_MSG} "Extracting cached GIT archive "${_GIT_DISTFILE.${repo}:Q}"."; \
- gzip -d -c ${_GIT_DISTDIR}/${_GIT_DISTFILE.${repo}:Q} | pax -r; \
- exit 0; \
- fi
-
-# create cache archive
-_GIT_CREATE_CACHE.${repo}= \
- ${STEP_MSG} "Creating cached GIT archive "${_GIT_DISTFILE.${repo}:Q}"."; \
- ${MKDIR} ${_GIT_DISTDIR:Q}; \
- pax -w ${GIT_MODULE.${repo}:Q} | gzip > ${_GIT_DISTDIR}/${_GIT_DISTFILE.${repo}:Q}
.endfor
pre-extract: do-git-extract
@@ -131,13 +117,19 @@ do-git-extract:
.for _repo_ in ${GIT_REPOSITORIES}
${RUN} cd ${WRKDIR}; \
if [ ! -d ${_GIT_DISTDIR:Q} ]; then mkdir -p ${_GIT_DISTDIR:Q}; fi; \
- ${_GIT_EXTRACT_CACHED.${_repo_}}; \
+ if [ -f ${_GIT_DISTDIR}/${_GIT_DISTFILE.${_repo_}:Q} ]; then \
+ ${STEP_MSG} "Extracting cached GIT archive "${_GIT_DISTFILE.${_repo_}:Q}"."; \
+ gzip -d -c ${_GIT_DISTDIR}/${_GIT_DISTFILE.${_repo_}:Q} | pax -r; \
+ exit 0; \
+ fi; \
${SETENV} ${_GIT_ENV} \
${_GIT_CMD} clone \
${_GIT_FLAGS} \
${GIT_REPO.${_repo_}:Q} \
${GIT_MODULE.${_repo_}:Q}; \
- ${_GIT_CREATE_CACHE.${_repo_}}
+ ${STEP_MSG} "Creating cached GIT archive "${_GIT_DISTFILE.${_repo_}:Q}"."; \
+ ${MKDIR} ${_GIT_DISTDIR:Q}; \
+ pax -w ${GIT_MODULE.${_repo_}:Q} | gzip > ${_GIT_DISTDIR}/${_GIT_DISTFILE.${_repo_}:Q};
.endfor
post-extract: do-git-post-extract
--
1.9.2
--------------050107010300010505070507
Content-Type: text/x-diff;
name="0005-remove-a-redundant-mkdir-p.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="0005-remove-a-redundant-mkdir-p.patch"
>From 539baa68ab86fa44fcd4b6d61290555748b356a3 Mon Sep 17 00:00:00 2001
From: Richard Hansen <[email protected]>
Date: Thu, 27 Feb 2014 18:22:57 -0500
Subject: [PATCH 5/8] remove a redundant 'mkdir -p'
---
mk/git-package.mk | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/mk/git-package.mk b/mk/git-package.mk
index 0878237..294e7f9 100644
--- a/mk/git-package.mk
+++ b/mk/git-package.mk
@@ -116,7 +116,7 @@ pre-extract: do-git-extract
do-git-extract:
.for _repo_ in ${GIT_REPOSITORIES}
${RUN} cd ${WRKDIR}; \
- if [ ! -d ${_GIT_DISTDIR:Q} ]; then mkdir -p ${_GIT_DISTDIR:Q}; fi; \
+ ${MKDIR} ${_GIT_DISTDIR:Q}; \
if [ -f ${_GIT_DISTDIR}/${_GIT_DISTFILE.${_repo_}:Q} ]; then \
${STEP_MSG} "Extracting cached GIT archive "${_GIT_DISTFILE.${_repo_}:Q}"."; \
gzip -d -c ${_GIT_DISTDIR}/${_GIT_DISTFILE.${_repo_}:Q} | pax -r; \
@@ -128,7 +128,6 @@ do-git-extract:
${GIT_REPO.${_repo_}:Q} \
${GIT_MODULE.${_repo_}:Q}; \
${STEP_MSG} "Creating cached GIT archive "${_GIT_DISTFILE.${_repo_}:Q}"."; \
- ${MKDIR} ${_GIT_DISTDIR:Q}; \
pax -w ${GIT_MODULE.${_repo_}:Q} | gzip > ${_GIT_DISTDIR}/${_GIT_DISTFILE.${_repo_}:Q};
.endfor
--
1.9.2
--------------050107010300010505070507
Content-Type: text/x-diff;
name="0006-use-variables-to-shorten-long-lines.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="0006-use-variables-to-shorten-long-lines.patch"
>From 50d85d9ba384fa3c5121a66bc9155e4e2d3295ec Mon Sep 17 00:00:00 2001
From: Richard Hansen <[email protected]>
Date: Thu, 27 Feb 2014 18:28:52 -0500
Subject: [PATCH 6/8] use variables to shorten long lines
---
mk/git-package.mk | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/mk/git-package.mk b/mk/git-package.mk
index 294e7f9..cf95f64 100644
--- a/mk/git-package.mk
+++ b/mk/git-package.mk
@@ -116,10 +116,12 @@ pre-extract: do-git-extract
do-git-extract:
.for _repo_ in ${GIT_REPOSITORIES}
${RUN} cd ${WRKDIR}; \
+ tarball=${_GIT_DISTFILE.${_repo_}:Q}; \
+ fulltarball=${_GIT_DISTDIR:Q}/$$tarball; \
${MKDIR} ${_GIT_DISTDIR:Q}; \
- if [ -f ${_GIT_DISTDIR}/${_GIT_DISTFILE.${_repo_}:Q} ]; then \
- ${STEP_MSG} "Extracting cached GIT archive "${_GIT_DISTFILE.${_repo_}:Q}"."; \
- gzip -d -c ${_GIT_DISTDIR}/${_GIT_DISTFILE.${_repo_}:Q} | pax -r; \
+ if [ -f "$$fulltarball" ]; then \
+ ${STEP_MSG} "Extracting cached GIT archive $$tarball."; \
+ gzip -d -c "$$fulltarball" | pax -r; \
exit 0; \
fi; \
${SETENV} ${_GIT_ENV} \
@@ -127,8 +129,8 @@ do-git-extract:
${_GIT_FLAGS} \
${GIT_REPO.${_repo_}:Q} \
${GIT_MODULE.${_repo_}:Q}; \
- ${STEP_MSG} "Creating cached GIT archive "${_GIT_DISTFILE.${_repo_}:Q}"."; \
- pax -w ${GIT_MODULE.${_repo_}:Q} | gzip > ${_GIT_DISTDIR}/${_GIT_DISTFILE.${_repo_}:Q};
+ ${STEP_MSG} "Creating cached GIT archive $$tarball."; \
+ pax -w ${GIT_MODULE.${_repo_}:Q} | gzip >$$fulltarball;
.endfor
post-extract: do-git-post-extract
--
1.9.2
--------------050107010300010505070507
Content-Type: text/x-diff;
name="0007-use-git-clone-s-rules-to-derive-default-for-GIT_MODU.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename*0="0007-use-git-clone-s-rules-to-derive-default-for-GIT_MODU.pa";
filename*1="tch"
>From e32f0a3df56f083d97c225dd7a9a817ba8ff8960 Mon Sep 17 00:00:00 2001
From: Richard Hansen <[email protected]>
Date: Thu, 27 Feb 2014 15:42:56 -0500
Subject: [PATCH 7/8] use git clone's rules to derive default for
GIT_MODULE.${id}
Before, GIT_MODULE.${id} defaulted to ${id}. Change the default to
the same string that 'git clone' would choose for naming the directory
to clone into. This results in more user-friendly cache tarball
names.
---
mk/git-package.mk | 24 ++++++++++++++++++++++--
1 file changed, 22 insertions(+), 2 deletions(-)
diff --git a/mk/git-package.mk b/mk/git-package.mk
index cf95f64..9647fc6 100644
--- a/mk/git-package.mk
+++ b/mk/git-package.mk
@@ -23,7 +23,8 @@
# cloned repository. This is also used to name the
# clone cache tarball stored in ${DISTDIR}.
#
-# Defaults to ${id}.
+# Defaults to the "humanish" part of ${GIT_REPO.${id}},
+# similar to the default that 'git clone' uses.
#
# If ${WRKSRC} doesn't exist by the time post-extract is
# run, ${WRKSRC} will be created as a symlink pointing
@@ -88,7 +89,26 @@ _GIT_DISTDIR= ${DISTDIR}/git-packages
# the name of the git repository as created by 'git clone'
.for repo in ${GIT_REPOSITORIES}
-GIT_MODULE.${repo}?= ${repo}
+# follow the same algorithm that 'git clone' does when "humanizing"
+# the clone URL. first, start with the URL
+_GIT_MODULE_D_0.${repo}= ${GIT_REPO.${repo}}
+# next remove trailing whitespaces and slashes
+_GIT_MODULE_D_1.${repo}= ${_GIT_MODULE_D_0.${repo}:C;[/[:space:]]*$;;W}
+# next remove trailing /.git
+_GIT_MODULE_D_2.${repo}= ${_GIT_MODULE_D_1.${repo}:S;/.git$;;W}
+# next find everything after the last : or /
+_GIT_MODULE_D_3.${repo}= ${_GIT_MODULE_D_2.${repo}:C;.*[/:];;W}
+# next remove trailing .git
+_GIT_MODULE_D_4.${repo}= ${_GIT_MODULE_D_3.${repo}:S/.git$//W}
+# next convert each whitespace or control char into an ascii space
+_GIT_MODULE_D_5.${repo}= ${_GIT_MODULE_D_4.${repo}:C/[[:space:][:cntrl:]]/ /gW}
+# next remove leading whitespace
+_GIT_MODULE_D_6.${repo}= ${_GIT_MODULE_D_5.${repo}:C/^ *//W}
+# next compress multiple spaces in a row into a single space
+_GIT_MODULE_D_7.${repo}= ${_GIT_MODULE_D_6.${repo}:C/ +/ /gW}
+# next remove trailing whitespace
+_GIT_MODULE_DEFAULT.${repo}= ${_GIT_MODULE_D_7.${repo}:S/ $//W}
+GIT_MODULE.${repo}?= ${_GIT_MODULE_DEFAULT.${repo}}
# determine appropriate checkout date or tag
. if defined(GIT_TAG.${repo})
--
1.9.2
--------------050107010300010505070507
Content-Type: text/x-diff;
name="0008-remove-variable-assignments-that-are-no-longer-neces.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename*0="0008-remove-variable-assignments-that-are-no-longer-neces.pa";
filename*1="tch"
>From bb71d3a20ca3bb33b2e385698364c543d8bc9588 Mon Sep 17 00:00:00 2001
From: Richard Hansen <[email protected]>
Date: Fri, 28 Feb 2014 13:28:43 -0500
Subject: [PATCH 8/8] remove variable assignments that are no longer necessary
git-package.mk now has sensible default values for its variables.
Remove the now-unnecessary variable assignments that were made to
accommodate git-package.mk's previous behavior.
---
am-utils-git/Makefile | 1 -
apel-git/Makefile | 2 --
auto-complete-current/Makefile | 2 --
bup-git/Makefile | 2 --
calypso/Makefile | 2 --
cinelerra-cv/Makefile | 2 --
darcs-to-git/Makefile | 2 --
davical-current/Makefile | 2 --
debugger-git/Makefile | 1 -
distbb-current/Makefile | 2 --
dragbox/Makefile | 1 -
emacs-current-nox11/Makefile | 4 ----
emacs-current/Makefile | 3 ---
emacs-ditz/Makefile | 2 --
ffmpeg-current/Makefile | 2 --
fuse-google-drive/Makefile | 2 --
fuzzy-el-current/Makefile | 2 --
git-modes-git/Makefile | 3 ---
gmrender-resurrect-git/Makefile | 1 -
gtk-gnutella-current/Makefile | 2 --
khal-git/Makefile | 1 -
lgogdownloader-git/Makefile | 1 -
lilypond-git/Makefile | 2 --
lmdbg-current/Makefile | 2 --
magit-git/Makefile | 2 --
maxima/Makefile | 2 --
mk-configure/Makefile | 1 -
navi2ch-current/Makefile | 2 --
necpp-git/Makefile | 1 -
nih-current/Makefile | 1 -
objfw-git/Makefile | 1 -
org-caldav-git/Makefile | 1 -
p5-Packager-Utils/Makefile | 1 -
pan2-git/Makefile | 4 ----
php-libawl-git/Makefile | 3 ---
pkg_summary-utils/Makefile | 2 --
popup-el-current/Makefile | 2 --
prpltwtr/Makefile | 1 -
pwnat/Makefile | 2 --
py-percol/Makefile | 2 --
ruby-ditz/Makefile | 10 +++-------
sbcl/Makefile | 3 ---
sdif-git/Makefile | 2 --
simulavr-git/Makefile | 2 --
tamago-anthy/Makefile | 2 --
tc-git/Makefile | 1 -
twittering-mode/Makefile | 2 --
uhd-git/Makefile | 1 -
wl-current/Makefile | 2 --
xf86-video-nv-current/Makefile | 2 --
yaml-mode/Makefile | 2 --
51 files changed, 3 insertions(+), 100 deletions(-)
diff --git a/am-utils-git/Makefile b/am-utils-git/Makefile
index 55f8fda..a22525a 100644
--- a/am-utils-git/Makefile
+++ b/am-utils-git/Makefile
@@ -12,7 +12,6 @@ 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
diff --git a/apel-git/Makefile b/apel-git/Makefile
index 346393c..41f3c16 100644
--- a/apel-git/Makefile
+++ b/apel-git/Makefile
@@ -11,10 +11,8 @@ 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
-WRKSRC= ${WRKDIR}/${PKGBASE}
INFO_FILES= yes
USE_LANGUAGES= # none
USE_TOOLS+= gmake makeinfo
diff --git a/auto-complete-current/Makefile b/auto-complete-current/Makefile
index 1dbad28..0f5af35 100644
--- a/auto-complete-current/Makefile
+++ b/auto-complete-current/Makefile
@@ -16,8 +16,6 @@ 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:Q}
MESSAGE_SUBST+= PKGBASE=${PKGBASE:Q}
INSTALLATION_DIRS= ${EMACS_LISPPREFIX}/${PKGBASE}
diff --git a/bup-git/Makefile b/bup-git/Makefile
index c492dea..ebc209c 100644
--- a/bup-git/Makefile
+++ b/bup-git/Makefile
@@ -23,8 +23,6 @@ PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-fuse-bindings
GIT_REPOSITORIES= bup
GIT_REPO.bup= git://github.com/bup/bup.git
-WRKSRC= ${WRKDIR}/bup
-
TEST_TARGET= test
MAKE_FLAGS+= PREFIX=${PREFIX}
diff --git a/calypso/Makefile b/calypso/Makefile
index 3c809d8..868d4d6 100644
--- a/calypso/Makefile
+++ b/calypso/Makefile
@@ -14,8 +14,6 @@ DEPENDS+= git-base-[0-9]*:../../devel/git-base
GIT_REPOSITORIES= calypso
GIT_REPO.calypso= git://keithp.com/git/calypso.git
-WRKSRC= ${WRKDIR}/calypso
-
PYDISTUTILSPKG= yes
INSTALLATION_DIRS= share/examples/calypso
diff --git a/cinelerra-cv/Makefile b/cinelerra-cv/Makefile
index f736767..70aea07 100644
--- a/cinelerra-cv/Makefile
+++ b/cinelerra-cv/Makefile
@@ -11,11 +11,9 @@ LICENSE= gnu-gpl-v2
GIT_REPOSITORIES= master
GIT_REPO.master= git://git.cinelerra.org/j6t/cinelerra.git
-GIT_MODULE= cinelerra
.include "../../wip/mk/git-package.mk"
_GIT_FLAGS= # The repository is very large. We don't want git to be quiet.
-WRKSRC= ${WRKDIR}/cinelerra
GNU_CONFIGURE= yes
USE_TOOLS+= automake gmake msgmerge pkg-config xgettext
USE_LIBTOOL= yes
diff --git a/darcs-to-git/Makefile b/darcs-to-git/Makefile
index c563ae6..cf95808 100644
--- a/darcs-to-git/Makefile
+++ b/darcs-to-git/Makefile
@@ -10,9 +10,7 @@ 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-current/Makefile b/davical-current/Makefile
index 5992e46..9e8c6d9 100644
--- a/davical-current/Makefile
+++ b/davical-current/Makefile
@@ -15,7 +15,6 @@ LICENSE= gnu-gpl-v2 AND gnu-gpl-v3
GIT_REPOSITORIES= master
GIT_REPO.master= git://repo.or.cz/${PKGBASE}.git
-GIT_MODULE.master= ${PKGBASE}
DAVICALDIR= ${PREFIX}/share/davical
EGDIR= ${PREFIX}/share/examples/davical
@@ -28,7 +27,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/debugger-git/Makefile b/debugger-git/Makefile
index ce1bada..e48105e 100644
--- a/debugger-git/Makefile
+++ b/debugger-git/Makefile
@@ -13,7 +13,6 @@ DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
GIT_REPOSITORIES= debugger
GIT_REPO.debugger= git://github.com/path64/debugger.git
-WRKSRC= ${WRKDIR}/debugger
USE_CMAKE= yes
USE_LANGUAGES= c c++
diff --git a/distbb-current/Makefile b/distbb-current/Makefile
index 63bd6d4..4216db0 100644
--- a/distbb-current/Makefile
+++ b/distbb-current/Makefile
@@ -21,8 +21,6 @@ DEPENDS+= digest-[0-9]*:../../pkgtools/digest
BUILD_DEPENDS+= mk-configure>=0.21:../../devel/mk-configure
-WRKSRC= ${WRKDIR}/distbb
-
USE_LANGUAGES= # none
REPLACE_SH+= distbb.in distbb_diff.in slave.in stage_*.in
diff --git a/dragbox/Makefile b/dragbox/Makefile
index 22e945f..e8dd007 100644
--- a/dragbox/Makefile
+++ b/dragbox/Makefile
@@ -13,7 +13,6 @@ LICENSE= gnu-gpl-v2
GIT_REPOSITORIES= dragbox
GIT_REPO.dragbox= git://repo.or.cz/dragbox.git
-WRKSRC= ${WRKDIR}/${DISTNAME:S|-${PKGVERSION_NOREV}||:Q}
GNU_CONFIGURE= yes
USE_TOOLS+= gmake
USE_TOOLS+= autoconf
diff --git a/emacs-current-nox11/Makefile b/emacs-current-nox11/Makefile
index b013e5a..00c7745 100644
--- a/emacs-current-nox11/Makefile
+++ b/emacs-current-nox11/Makefile
@@ -22,8 +22,6 @@ 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
@@ -36,8 +34,6 @@ DESCR_SRC= ${PKGDIR}/../emacs-current/DESCR
#ESSAGE_SRC= ${PKGDIR}/../emacs-current/MESSAGE
PLIST_SRC= ${PKGDIR}/../emacs-current/PLIST
-WRKSRC= ${WRKDIR}/emacs
-
CONFIGURE_ARGS+= --without-x # nox11
CONFIGURE_ARGS+= --srcdir=${WRKSRC:Q}
CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q}
diff --git a/emacs-current/Makefile b/emacs-current/Makefile
index 34b86c2..92e4f85 100644
--- a/emacs-current/Makefile
+++ b/emacs-current/Makefile
@@ -21,7 +21,6 @@ CONFLICTS+= emacs-nox11-[0-9]*
BUILD_TARGET= bootstrap
GIT_REPOSITORIES= master
-GIT_MODULE.master= emacs
GIT_REPO.master= git://repo.or.cz/emacs.git
_GIT_FLAGS?= --depth 1
@@ -30,8 +29,6 @@ INFO_FILES= yes
REPLACE_PERL= lib-src/grep-changelog
CHECK_INTERPRETER_SKIP= bin/grep-changelog
-WRKSRC= ${WRKDIR}/emacs
-
CONFIGURE_ARGS+= --srcdir=${WRKSRC:Q}
CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q}
CONFIGURE_ENV+= GAMEOWN=${GAMEOWN:Q}
diff --git a/emacs-ditz/Makefile b/emacs-ditz/Makefile
index b6f7136..2f7c79f 100644
--- a/emacs-ditz/Makefile
+++ b/emacs-ditz/Makefile
@@ -11,9 +11,7 @@ LICENSE= gnu-gpl-v3
GIT_REPOSITORIES= master
GIT_REPO.master= git://github.com/kentaro/${PKGBASE}.git
-GIT_MODULE.master= ${PKGBASE}
-WRKSRC= ${WRKDIR}/${PKGBASE}
USE_LANGUAGES= # none
do-build:
diff --git a/ffmpeg-current/Makefile b/ffmpeg-current/Makefile
index 37ac8e4..cced9fb 100644
--- a/ffmpeg-current/Makefile
+++ b/ffmpeg-current/Makefile
@@ -7,9 +7,7 @@ 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
diff --git a/fuse-google-drive/Makefile b/fuse-google-drive/Makefile
index 76e7c3f..731664a 100644
--- a/fuse-google-drive/Makefile
+++ b/fuse-google-drive/Makefile
@@ -19,8 +19,6 @@ GNU_CONFIGURE= yes
USE_TOOLS+= aclocal automake autoreconf gmake pkg-config
USE_LIBTOOL= yes
-WRKSRC= ${WRKDIR}/${PKGBASE}
-
pre-configure:
set -e; cd ${WRKSRC}; \
autoreconf -vif
diff --git a/fuzzy-el-current/Makefile b/fuzzy-el-current/Makefile
index 8356c6a..06de8c6 100644
--- a/fuzzy-el-current/Makefile
+++ b/fuzzy-el-current/Makefile
@@ -12,8 +12,6 @@ GIT_REPOSITORIES= fuzzy-el
GIT_REPO.fuzzy-el= git://github.com/auto-complete/fuzzy-el.git
.include "../../wip/mk/git-package.mk"
-WRKSRC= ${WRKDIR}/fuzzy-el
-
INSTALLATION_DIRS= ${EMACS_LISPPREFIX}/${PKGBASE}
do-build:
diff --git a/git-modes-git/Makefile b/git-modes-git/Makefile
index 8bb8c6f..72924c1 100644
--- a/git-modes-git/Makefile
+++ b/git-modes-git/Makefile
@@ -5,14 +5,11 @@ LICENSE= gnu-gpl-v3
GIT_REPOSITORIES= master
GIT_REPO.master= https://github.com/magit/git-modes.git
-GIT_MODULE.master= git-modes
MAINTAINER= [email protected]
HOMEPAGE= https://github.com/magit/git-modes
COMMENT= Git-modes submodule for magit.el
-WRKSRC= ${WRKDIR}/git-modes
-
USE_TOOLS+= gmake
BUILD_TARGET= lisp
diff --git a/gmrender-resurrect-git/Makefile b/gmrender-resurrect-git/Makefile
index 77bafcc..c6c8712 100644
--- a/gmrender-resurrect-git/Makefile
+++ b/gmrender-resurrect-git/Makefile
@@ -25,7 +25,6 @@ DEPENDS+= gst-plugins1-soup-[0-9]*:../../net/gst-plugins1-soup
DEPENDS+= gst-plugins1-ugly-[0-9]*:../../multimedia/gst-plugins1-ugly
DEPENDS+= gst-plugins1-vorbis-[0-9]*:../../audio/gst-plugins1-vorbis
-WRKSRC= ${WRKDIR}/gmrender-resurrect
GNU_CONFIGURE= YES
USE_TOOLS+= autoconf automake autoreconf pkg-config
diff --git a/gtk-gnutella-current/Makefile b/gtk-gnutella-current/Makefile
index 6faa06c..78ce1f3 100644
--- a/gtk-gnutella-current/Makefile
+++ b/gtk-gnutella-current/Makefile
@@ -30,8 +30,6 @@ CONFLICTS= gtk-gnutella-*
GIT_REPOSITORIES= master
GIT_REPO.master= http://github.com/gtk-gnutella/gtk-gnutella.git
-WRKSRC= ${WRKDIR}/gtk-gnutella
-
NO_CHECKSUM= yes
USE_BUILTIN.gettext= no
diff --git a/khal-git/Makefile b/khal-git/Makefile
index d08b0c2..6aee539 100644
--- a/khal-git/Makefile
+++ b/khal-git/Makefile
@@ -28,7 +28,6 @@ DEPENDS+= ${PYPKGPREFIX}-setproctitle-[0-9]*:../../sysutils/py-setproctitle
PYTHON_VERSIONED_DEPENDENCIES= dateutil
-WRKSRC= ${WRKDIR}/khal
INSTALLATION_DIRS= share/doc/khal
REPLACE_PYTHON+= khal/*/*.py
REPLACE_PYTHON+= khal/*.py
diff --git a/lgogdownloader-git/Makefile b/lgogdownloader-git/Makefile
index 9aa2d31..e814411 100644
--- a/lgogdownloader-git/Makefile
+++ b/lgogdownloader-git/Makefile
@@ -14,7 +14,6 @@ BUILD_DEPENDS+= help2man-[0-9]*:../../converters/help2man
GIT_REPOSITORIES= lgogdownloader
GIT_REPO.lgogdownloader= git://github.com/Sude-/lgogdownloader.git
-WRKSRC= ${WRKDIR}/lgogdownloader
USE_LANGUAGES= c++
USE_TOOLS+= gmake gunzip
LDFLAGS+= ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.boost-libs}/lib
diff --git a/lilypond-git/Makefile b/lilypond-git/Makefile
index 7954cbf..cc544df 100644
--- a/lilypond-git/Makefile
+++ b/lilypond-git/Makefile
@@ -41,8 +41,6 @@ USE_TOOLS+= autoconf automake autoreconf bison flex gmake gs:run makeinfo perl
USE_TOOLS+= texi2html zip
MAKE_FILE= GNUmakefile
-WRKSRC= ${WRKDIR}/lilypond
-
.include "../../mk/bsd.prefs.mk"
TEXINFO_REQD= 4.11
diff --git a/lmdbg-current/Makefile b/lmdbg-current/Makefile
index ff661d7..9443ad9 100644
--- a/lmdbg-current/Makefile
+++ b/lmdbg-current/Makefile
@@ -20,8 +20,6 @@ DEPENDS+= pipestatus-[0-9]*:../../devel/pipestatus
DEPENDS+= runawk>=1.3.1:../../lang/runawk
#DEPENDS+= gdb-[0-9]*:../../devel/gdb
-WRKSRC= ${WRKDIR}/lmdbg
-
ONLY_FOR_COMPILER= gcc icc clang
NOT_FOR_PLATFORM= Darwin-*-*
diff --git a/magit-git/Makefile b/magit-git/Makefile
index 7277422..a5a3c9d 100644
--- a/magit-git/Makefile
+++ b/magit-git/Makefile
@@ -10,9 +10,7 @@ LICENSE= gnu-gpl-v3
GIT_REPOSITORIES= master
GIT_REPO.master= https://github.com/magit/magit.git
-GIT_MODULE.master= magit
-WRKSRC= ${WRKDIR}/${PKGBASE}
NO_CONFIGURE= yes
USE_LANGUAGES= # none
USE_TOOLS+= gmake makeinfo
diff --git a/maxima/Makefile b/maxima/Makefile
index 70ae343..63c448e 100644
--- a/maxima/Makefile
+++ b/maxima/Makefile
@@ -31,8 +31,6 @@ PKGNAME= maxima-5.99
GIT_REPOSITORIES= maxima
GIT_REPO.maxima= git://maxima.git.sourceforge.net/gitroot/maxima/maxima
-WRKSRC= ${WRKDIR}/maxima
-
USE_TOOLS+= aclocal automake autoconf
CONFIGURE_ENV+= VERSION=$(PKGVERSION_NOREV) ac_cv_prog_git_found=false
diff --git a/mk-configure/Makefile b/mk-configure/Makefile
index c51e9aa..056c82c 100644
--- a/mk-configure/Makefile
+++ b/mk-configure/Makefile
@@ -22,7 +22,6 @@ USE_LANGUAGES= c
BUILD_TARGET= all all-doc
INSTALL_TARGET= install install-doc
-WRKSRC= ${WRKDIR}/mk-configure
MAKE_PROGRAM= ${PREFIX}/bin/bmake
MAKE_ENV+= MANDIR=${PREFIX}/${PKGMANDIR} \
diff --git a/navi2ch-current/Makefile b/navi2ch-current/Makefile
index 1300e51..61ef6e5 100644
--- a/navi2ch-current/Makefile
+++ b/navi2ch-current/Makefile
@@ -3,7 +3,6 @@
DISTNAME= navi2ch-2.0.0
PKGNAME= ${EMACS_PKGNAME_PREFIX}navi2ch-current-2.0.0
CATEGORIES= chat
-WRKSRC= ${WRKDIR}/navi2ch
CONFLICTS+= navi2ch-[0-9]*
@@ -14,7 +13,6 @@ LICENSE= gnu-gpl-v2
GIT_REPOSITORIES= master
GIT_REPO.master= git://navi2ch.git.sourceforge.net/gitroot/navi2ch/navi2ch
-GIT_MODULE.master= navi2ch
GNU_CONFIGURE= yes
USE_TOOLS+= gmake
diff --git a/necpp-git/Makefile b/necpp-git/Makefile
index bf25e7a..6056e57 100644
--- a/necpp-git/Makefile
+++ b/necpp-git/Makefile
@@ -11,7 +11,6 @@ LICENSE= gnu-gpl-v2
GIT_REPOSITORIES= necpp
GIT_REPO.necpp= git://github.com/tmolteno/necpp.git
-WRKSRC= ${WRKDIR}/necpp
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --without-lapack
diff --git a/nih-current/Makefile b/nih-current/Makefile
index a68c5a7..88cf20c 100644
--- a/nih-current/Makefile
+++ b/nih-current/Makefile
@@ -26,7 +26,6 @@ SUPERSEDES= pkgnih-[0-9]*
BUILD_TARGET= all all-doc
INSTALL_TARGET= install install-doc
-WRKSRC= ${WRKDIR}/pkgnih
EGDIR= ${PREFIX}/share/examples/nih
CONF_FILES= ${EGDIR}/nih.conf \
diff --git a/objfw-git/Makefile b/objfw-git/Makefile
index b0310f0..088c3ee 100644
--- a/objfw-git/Makefile
+++ b/objfw-git/Makefile
@@ -13,7 +13,6 @@ GIT_REPOSITORIES= objfw
# Use GitHub mirror because pkgsrc git refuses to clone from https
GIT_REPO.objfw= git://github.com/Midar/objfw.git
-WRKSRC= ${WRKDIR}/objfw
USE_TOOLS= aclocal automake
GNU_CONFIGURE= yes
USE_LANGUAGES= objc
diff --git a/org-caldav-git/Makefile b/org-caldav-git/Makefile
index 95f93b9..f2107ac 100644
--- a/org-caldav-git/Makefile
+++ b/org-caldav-git/Makefile
@@ -11,7 +11,6 @@ COMMENT= Caldav sync for Emacs Orgmode
GIT_REPOSITORIES= org-caldav
GIT_REPO.org-caldav= git://github.com/dengste/org-caldav.git
-WRKSRC= ${WRKDIR}/org-caldav
EGG_NAME= ${DISTNAME}.dev
INSTALLATION_DIRS= share/doc/org-caldav
INSTALLATION_DIRS+= ${EMACS_LISPPREFIX}/${PKGBASE}
diff --git a/p5-Packager-Utils/Makefile b/p5-Packager-Utils/Makefile
index afb6418..1ee10e5 100644
--- a/p5-Packager-Utils/Makefile
+++ b/p5-Packager-Utils/Makefile
@@ -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= Module::Build
PERL5_PACKLIST= auto/Packager/Utils/.packlist
diff --git a/pan2-git/Makefile b/pan2-git/Makefile
index 998809d..e56c1e8 100644
--- a/pan2-git/Makefile
+++ b/pan2-git/Makefile
@@ -14,12 +14,8 @@ LICENSE= gnu-gpl-v2
# http://lists.gnu.org/archive/html/pan-users/ .
GIT_REPOSITORIES= gnome
GIT_REPO.gnome= git://git.gnome.org/pan2
-GIT_MODULE.gnome= pan2
GIT_REPO.aexoden= git://github.com/aexoden/pan2.git
-GIT_MODULE.aexoden= pan2
GIT_REPO.khaley= git://github.com/lostcoder/pan2.git
-GIT_MODULE.khaley= pan2
-WRKSRC= ${WRKDIR}/pan2
CONFIGURE_SCRIPT= autogen.sh
GNU_CONFIGURE= YES
diff --git a/php-libawl-git/Makefile b/php-libawl-git/Makefile
index e13b7c8..442fed8 100644
--- a/php-libawl-git/Makefile
+++ b/php-libawl-git/Makefile
@@ -15,9 +15,6 @@ LICENSE= gnu-gpl-v2
GIT_REPOSITORIES= awl
GIT_REPO.awl= git://repo.or.cz/awl.git
-GIT_MODULE.awl= awl
-
-WRKSRC= ${WRKDIR}/awl
.include "../../lang/php/phpversion.mk"
diff --git a/pkg_summary-utils/Makefile b/pkg_summary-utils/Makefile
index f3e9401..31797ba 100644
--- a/pkg_summary-utils/Makefile
+++ b/pkg_summary-utils/Makefile
@@ -41,8 +41,6 @@ USE_TOOLS+= gzip:run
PKG_INSTALLATION_TYPES= overwrite pkgviews
-WRKSRC= ${WRKDIR}/pkg_summary-utils
-
EGDIR= ${PREFIX}/share/examples/pkg_summary-utils
CONF_FILES= ${EGDIR}/pkg_digger.conf ${PKG_SYSCONFDIR}/pkg_digger.conf
diff --git a/popup-el-current/Makefile b/popup-el-current/Makefile
index 10b9f92..02531fc 100644
--- a/popup-el-current/Makefile
+++ b/popup-el-current/Makefile
@@ -13,8 +13,6 @@ GIT_REPOSITORIES= popup-el
GIT_REPO.popup-el= git://github.com/auto-complete/popup-el.git
.include "../../wip/mk/git-package.mk"
-WRKSRC= ${WRKDIR}/popup-el
-
INSTALLATION_DIRS= ${EMACS_LISPPREFIX}/${PKGBASE}
do-build:
diff --git a/prpltwtr/Makefile b/prpltwtr/Makefile
index d537845..9e81bde 100644
--- a/prpltwtr/Makefile
+++ b/prpltwtr/Makefile
@@ -13,7 +13,6 @@ LICENSE= gnu-gpl-v2
GIT_REPOSITORIES= prpltwtr
GIT_REPO.prpltwtr= git://github.com/mikeage/prpltwtr.git
-WRKSRC= ${WRKDIR}/prpltwtr
USE_TOOLS+= autoconf
USE_TOOLS+= automake
HAS_CONFIGURE= yes
diff --git a/pwnat/Makefile b/pwnat/Makefile
index 2ba22ea..964dd99 100644
--- a/pwnat/Makefile
+++ b/pwnat/Makefile
@@ -12,8 +12,6 @@ BUILD_DEPENDS+= ${PYPKGPREFIX}-docutils-[0-9]*:../../textproc/py-docutils
GIT_REPOSITORIES= samyk
GIT_REPO.samyk= git://github.com/samyk/${PKGBASE}.git
-GIT_MODULE.samyk= ${PKGBASE}
-WRKSRC= ${WRKDIR}/${PKGBASE}
USE_TOOLS= gmake
NO_CONFIGURE= YES
diff --git a/py-percol/Makefile b/py-percol/Makefile
index 2414f99..f552e38 100644
--- a/py-percol/Makefile
+++ b/py-percol/Makefile
@@ -12,8 +12,6 @@ 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
diff --git a/ruby-ditz/Makefile b/ruby-ditz/Makefile
index 1a94bac..6c88d88 100644
--- a/ruby-ditz/Makefile
+++ b/ruby-ditz/Makefile
@@ -11,15 +11,11 @@ LICENSE= gnu-gpl-v3
.include "../../lang/ruby/rubyversion.mk"
+GIT_REPOSITORIES= ditz
.if ${RUBY_VER} == "193"
-GIT_REPOSITORIES= ruby19
-GIT_REPO.ruby19= git://github.com/chriskempson/Ditz-for-Ruby-1.9.2.git
-GIT_MODULE.ruby19= Ditz-for-Ruby-1.9.2
-WRKSRC= ${WRKDIR}/${GIT_MODULE.ruby19}
+GIT_REPO.ditz= git://github.com/chriskempson/Ditz-for-Ruby-1.9.2.git
.else
-GIT_REPOSITORIES= mainline
-GIT_REPO.mainline= git://gitorious.org/ditz/mainline.git
-WRKSRC= ${WRKDIR}/${GIT_MODULE.mainline}
+GIT_REPO.ditz= git://gitorious.org/ditz/mainline.git
.endif
GEM_SPECFILE= ${WRKSRC}/ditz.gemspec
diff --git a/sbcl/Makefile b/sbcl/Makefile
index 696483e..287e6d2 100644
--- a/sbcl/Makefile
+++ b/sbcl/Makefile
@@ -20,8 +20,6 @@ COMMENT= SBCL, a Common Lisp implementation
USE_TOOLS+= gmake gtar:run patch
PKG_INSTALLATION_TYPES= overwrite pkgviews
-WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-
.include "../../mk/bsd.prefs.mk"
#
@@ -95,7 +93,6 @@ PLIST_SUBST+= SUFX64=
GIT_REPOSITORIES= sbcl
GIT_REPO.sbcl= git://git.code.sf.net/p/sbcl/sbcl
-WRKSRC= ${WRKDIR}/sbcl
DISTNAME=
PKGNAME= sbcl-1.99
diff --git a/sdif-git/Makefile b/sdif-git/Makefile
index 2b11627..c916b6c 100644
--- a/sdif-git/Makefile
+++ b/sdif-git/Makefile
@@ -10,10 +10,8 @@ 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 a07209c..d56f8a6 100644
--- a/simulavr-git/Makefile
+++ b/simulavr-git/Makefile
@@ -13,7 +13,6 @@ 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
@@ -24,7 +23,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/tamago-anthy/Makefile b/tamago-anthy/Makefile
index cc50628..2085578 100644
--- a/tamago-anthy/Makefile
+++ b/tamago-anthy/Makefile
@@ -30,14 +30,12 @@ INFO_FILES= yes
DEPENDS+= anthy-[0-9]*:../../inputmethod/anthy
GIT_REPOSITORIES= master
-GIT_MODULE.master= egg
GIT_REPO.master= git://git.debian.org/git/pkg-anthy/egg.git
# http://mail-index.netbsd.org/pkgsrc-wip-discuss/2014/01/20/msg002556.html
# By unknown reason, tamago repository does not accept --depth=1, see TODO
_GIT_FLAGS= # empty
GNU_CONFIGURE= yes
-WRKSRC= ${WRKDIR}/egg
.include "../../editors/emacs/modules.mk"
diff --git a/tc-git/Makefile b/tc-git/Makefile
index f20d2a1..fa97aee 100644
--- a/tc-git/Makefile
+++ b/tc-git/Makefile
@@ -10,7 +10,6 @@ COMMENT= 2-stroke non associative direct input for Kanji
# tc is in GPL2, kw is unknown for the moment
LICENSE= gnu-gpl-v2
-WRKSRC= ${WRKDIR}/tc
INSTALLATION_DIRS= ${EMACS_INFOPREFIX} \
${EMACS_LISPPREFIX}/${DISTNAME} \
share/examples/tc
diff --git a/twittering-mode/Makefile b/twittering-mode/Makefile
index dda2e5f..ba76214 100644
--- a/twittering-mode/Makefile
+++ b/twittering-mode/Makefile
@@ -12,10 +12,8 @@ LICENSE= gnu-gpl-v2
GIT_REPOSITORIES= master
GIT_REPO.master= https://github.com/hayamiz/twittering-mode.git
-GIT_MODULE.master= twittering-mode
PKGSRC_SETENV= GIT_SSL_NO_VERIFY=true
-WRKSRC= ${WRKDIR}/twittering-mode
NO_BUILD= yes
USE_LANGUAGES= # none
diff --git a/uhd-git/Makefile b/uhd-git/Makefile
index bb3a297..f7783db 100644
--- a/uhd-git/Makefile
+++ b/uhd-git/Makefile
@@ -10,7 +10,6 @@ LICENSE= gnu-gpl-v2
GIT_REPOSITORIES= master
GIT_REPO.master= git://github.com/EttusResearch/uhd.git
-GIT_MODULE.master= uhd
USE_LANGUAGES= c c++
USE_TOOLS= cmake
diff --git a/wl-current/Makefile b/wl-current/Makefile
index 94469b5..01446f7 100644
--- a/wl-current/Makefile
+++ b/wl-current/Makefile
@@ -11,7 +11,6 @@ LICENSE= gnu-gpl-v2
MAINTAINER= [email protected]
HOMEPAGE= http://www.gohome.org/wl/
COMMENT= Mail/news management system with IMAP4rev1 support for Emacs
-WRKSRC= ${WRKDIR}/wanderlust
USE_TOOLS= patch
BUILD_TARGET= all info
@@ -41,7 +40,6 @@ EMACS_BUILDLINK= # empty
GIT_REPOSITORIES= master
GIT_REPO.master= git://github.com/wanderlust/wanderlust.git
-GIT_MODULE.master= wanderlust
_GIT_FLAGS?= --depth 1
diff --git a/xf86-video-nv-current/Makefile b/xf86-video-nv-current/Makefile
index 13741cf..b20c78f 100644
--- a/xf86-video-nv-current/Makefile
+++ b/xf86-video-nv-current/Makefile
@@ -19,8 +19,6 @@ USE_LIBTOOL= YES
GNU_CONFIGURE= YES
USE_TOOLS+= pkg-config autoconf autoreconf automake
-WRKSRC= ${WRKDIR}/xf86-video-nv
-
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "SunOS"
diff --git a/yaml-mode/Makefile b/yaml-mode/Makefile
index a5eee3d..b9446a3 100644
--- a/yaml-mode/Makefile
+++ b/yaml-mode/Makefile
@@ -11,12 +11,10 @@ LICENSE= gnu-gpl-v2
GIT_REPOSITORIES= master
GIT_REPO.master= git://github.com/yoshiki/${PKGBASE}.git
-GIT_MODULE.master= ${PKGBASE}
INSTALLATION_DIRS+= ${EMACS_LISPPREFIX}
INSTALLATION_DIRS+= share/doc/${PKGBASE}
-WRKSRC= ${WRKDIR}/${PKGBASE}
USE_LANGUAGES= # none
NO_CONFIGURE= YES
--
1.9.2
--------------050107010300010505070507--