pkgsrc-WIP-changes archive

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

svn-package.mk: Replace with svn-package2.mk



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sat Sep 24 19:24:18 2016 +0200
Changeset:	85081bac4c23ff3e38a18533b6c2cfff105f2d01

Modified Files:
	despotify-svn/Makefile
	flam3-svn/Makefile
	fricas-svn/Makefile
	mk/svn-package.mk
	mpg123-svn/Makefile
	openaxiom-svn/Makefile
	p5-xmlsig-svn/Makefile
	pilemc-svn/Makefile
	trac-plugins-GraphViz-svn/Makefile
	trac-plugins-MasterTickets-svn/Makefile
	trac-plugins-RoadmapHours-svn/Makefile
	trac-plugins-SensitiveTickets-svn/Makefile
	trac-plugins-TimingAndEstimation-svn/Makefile
	trac-plugins-spamfilter-svn/Makefile
	virtualbox-svn/Makefile
Removed Files:
	mk/svn-package2.mk

Log Message:
svn-package.mk: Replace with svn-package2.mk

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

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

diffstat:
 despotify-svn/Makefile                        |   2 +-
 flam3-svn/Makefile                            |   2 +-
 fricas-svn/Makefile                           |   2 +-
 mk/svn-package.mk                             | 195 ++++++++------------------
 mk/svn-package2.mk                            | 137 ------------------
 mpg123-svn/Makefile                           |   2 +-
 openaxiom-svn/Makefile                        |   2 +-
 p5-xmlsig-svn/Makefile                        |   2 +-
 pilemc-svn/Makefile                           |   2 +-
 trac-plugins-GraphViz-svn/Makefile            |   2 +-
 trac-plugins-MasterTickets-svn/Makefile       |   2 +-
 trac-plugins-RoadmapHours-svn/Makefile        |   2 +-
 trac-plugins-SensitiveTickets-svn/Makefile    |   2 +-
 trac-plugins-TimingAndEstimation-svn/Makefile |   2 +-
 trac-plugins-spamfilter-svn/Makefile          |   2 +-
 virtualbox-svn/Makefile                       |   2 +-
 16 files changed, 73 insertions(+), 287 deletions(-)

diffs:
diff --git a/despotify-svn/Makefile b/despotify-svn/Makefile
index 8d8a600..0c4f79a 100644
--- a/despotify-svn/Makefile
+++ b/despotify-svn/Makefile
@@ -26,7 +26,7 @@ SVN_REPO.despotify=	http://svn.code.sf.net/p/despotify/code
 PTHREAD_AUTO_VARS=	yes
 .include "../../mk/pthread.buildlink3.mk"
 
-.include "../../wip/mk/svn-package2.mk"
+.include "../../wip/mk/svn-package.mk"
 .include "../../audio/libao/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../devel/ncursesw/buildlink3.mk"
diff --git a/flam3-svn/Makefile b/flam3-svn/Makefile
index 1132974..d48b9f6 100644
--- a/flam3-svn/Makefile
+++ b/flam3-svn/Makefile
@@ -21,5 +21,5 @@ WRKSRC=			${WRKDIR}/flam3/src
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-.include "../../wip/mk/svn-package2.mk"
+.include "../../wip/mk/svn-package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fricas-svn/Makefile b/fricas-svn/Makefile
index 4d67590..994c490 100644
--- a/fricas-svn/Makefile
+++ b/fricas-svn/Makefile
@@ -45,6 +45,6 @@ SVN_REPO.fricas=	http://fricas.svn.sourceforge.net/svnroot/fricas/trunk
 
 WRKSRC=			${WRKDIR}/fricas
 
-.include "../mk/svn-package2.mk"
+.include "../mk/svn-package.mk"
 .endif
 .include "../../mk/bsd.pkg.mk"
diff --git a/mk/svn-package.mk b/mk/svn-package.mk
index ab8079d..73cc9dd 100644
--- a/mk/svn-package.mk
+++ b/mk/svn-package.mk
@@ -1,105 +1,42 @@
-# $Id: svn-package.mk,v 1.18 2013/03/29 20:43:05 asau Exp $
-
-# This file provides simple access to Subversion repositories, so that packages
-# can be created from Subversion instead of from released tarballs.
-#
-# === User-settable variables ===
-#
-# CHECKOUT_DATE
-#	Date to check out in ISO format (YYYY-MM-DD).
-#
-# === Package-settable variables ===
+# This file provides simple access to svn repositories, so that packages
+# can be created from svn instead of from released tarballs.
 #
 # A package using this file shall define the following variables:
 #
-# SVN_REPOSITORIES
-#	A list of unique identifiers. For each of those identifiers, the
-#	following variables define the details of how to access the
-#	Subversion repository.
-#
-#	SVN_ROOT must be defined.
+#	SVN_REPOSITORIES
+#		A list of unique identifiers /id/ for which appropriate
+#		SVN_REPO must be defined.
 #
-# SVN_ROOT.${id}
-#	The SVNROOT for the SVN repository, including anonsvn password,
-#	if applicable.
+#	SVN_REPO.${id}
+#		The svn repository
 #
-# SVN_MODULE.${id}
-#	The SVN module to check out.
+#	SVN_MODULE.${id}
+#		The svn module to check out.
 #
-#	Default value: ${id}
-#
-# SVN_DISTBASE.${id}
-#	The prefix for cached archive file name.
-#
-#	Default value: ${PKGBASE}-${SVN_MODULE.${repo}}
+#               Default value: ${id}
 #
 # It may define the following variables:
 #
-# SVN_CERTS
-#	Files holding SSL certificates of the svn servers.
-#
-# SVN_TAG.${id}
-#	Overridable SVN tag for a repository.
-#
-#	Default: ${SVN_TAG} (today at midnight)
-#
-# SVN_TAG
-#	The default SVN tag that is checked out. May be overridden by
-#	SVN_TAG.${id}.
-#
-#	Default value: today at midnight.
-#
-# === Variables defined here ===
-#
-# This file defines the following variables:
-#
-# SVN_ROOT_SOURCEFORGE
-#	Common SVN repository locations for use in the SVN_ROOT
-#	variables.
-#
-# It also provides default values for the following variables, differing
-# from the system-wide defaults:
-#
-# DISTFILES
-#	Is set to an empty list, since that is the right choice for most
-#	of the Subversion packages.
-#
+#	SVN_BRANCH.${id}
+#		The branch to check out.
 #
-# PKGREVISION
-#	If PKGREVISION is not set, set it to today's date.  This is
-#	useful for packages that automatically grab the latest code
-#	from subversion every time they are built.
-#	TODO: Reconsider this, and instead use the subversion revision
-#	number in the package version somehow.
-#
-# Keywords: subversion
+#	SVN_REVISION.${id}
+#		The revision to check out.
 #
+#	SVN_ENV.${id}
+#		The environment for svn
 
 .if !defined(_PKG_MK_SVN_PACKAGE_MK)
 _PKG_MK_SVN_PACKAGE_MK=	# defined
 
-BUILD_DEPENDS+=		subversion-base>=1.0:../../devel/subversion-base
+BUILD_DEPENDS+=		subversion-base-[0-9]*:../../devel/subversion-base
 
 #
 # defaults for user-visible input variables
 #
 
 DISTFILES?=		# empty
-# Enforce PKGREVISION unless SVN_TAG is set
-.if empty(SVN_TAG)
-. if defined(CHECKOUT_DATE)
-PKGREVISION?=		$(CHECKOUT_DATE:S/-//g)
-. else
-PKGREVISION?=		$(_SVN_PKGVERSION:S/.//g)
-. endif
-.endif
-
-#
-# definition of user-visible output variables
-#
-
-# commonly used repositories
-SVN_ROOT_SOURCEFORGE=	https://svn.sourceforge.net/svnroot
+PKGREVISION?=		${_SVN_PKGVERSION:S/.//g}
 
 #
 # End of the interface part. Start of the implementation part.
@@ -114,9 +51,9 @@ PKG_FAIL_REASON+=	"[svn-package.mk] SVN_REPOSITORIES must be set."
 SVN_REPOSITORIES?=	# none
 .endif
 
-.for repo in ${SVN_REPOSITORIES}
-.  if !defined(SVN_ROOT.${repo})
-PKG_FAIL_REASON+=	"[svn-package.mk] SVN_ROOT."${repo:Q}" must be set."
+.for _repo_ in ${SVN_REPOSITORIES}
+.  if !defined(SVN_REPO.${_repo_})
+PKG_FAIL_REASON+=	"[svn-package.mk] SVN_REPO."${_repo_:Q}" must be set."
 .  endif
 .endfor
 
@@ -126,89 +63,75 @@ PKG_FAIL_REASON+=	"[svn-package.mk] SVN_ROOT."${repo:Q}" must be set."
 
 USE_TOOLS+=		date pax
 
-_SVN_RSH=		ssh
 _SVN_CMD=		svn
-_SVN_ENV=		# empty
-_SVN_ENV+=		SVN_RSH=${_SVN_RSH:Q}
-_SVN_FLAGS=		-q
-_SVN_CHECKOUT_FLAGS=	--config-dir=${_SVN_CONFIG_DIR} --non-interactive
 _SVN_CONFIG_DIR=	${WRKDIR}/.subversion
-_SVN_TODAY_CMD=		${DATE} -u +'%Y-%m-%d'
-_SVN_TODAY=		${_SVN_TODAY_CMD:sh}
+_SVN_CHECKOUT_FLAGS=	--config-dir=${_SVN_CONFIG_DIR} --non-interactive
 _SVN_PKGVERSION_CMD=	${DATE} -u +'%Y.%m.%d'
 _SVN_PKGVERSION=	${_SVN_PKGVERSION_CMD:sh}
 _SVN_DISTDIR=		${DISTDIR}/svn-packages
 
 #
 # Generation of repository-specific variables
-#
 
-# determine appropriate checkout date or tag
+
 .for repo in ${SVN_REPOSITORIES}
 SVN_MODULE.${repo}?=	${repo}
-.  if defined(SVN_TAG.${repo})
-_SVN_TAG_FLAG.${repo}=	-r${SVN_TAG.${repo}}
-_SVN_TAG.${repo}=	${SVN_TAG.${repo}}
-.  elif defined(SVN_TAG)
-_SVN_TAG_FLAG.${repo}=	-r${SVN_TAG}
-_SVN_TAG.${repo}=	${SVN_TAG}
-.  elif defined(CHECKOUT_DATE)
-_SVN_TAG_FLAG.${repo}=	-r{${CHECKOUT_DATE}}
-_SVN_TAG.${repo}=	${CHECKOUT_DATE}
+_SVN_ENV.${repo}=	${SVN_ENV.${repo}}
+
+# determine appropriate checkout option
+.  if defined(SVN_REVISION.${repo})
+_SVN_FLAG.${repo}=	-r ${SVN_REVISION.${repo}}
 .  else
-_SVN_TAG_FLAG.${repo}=	-r{${_SVN_TODAY} 00:00 +0000}
-_SVN_TAG.${repo}=	trunk
+_SVN_FLAG.${repo}=	-r HEAD
 .  endif
 
 # Cache support:
-.  if !defined(NO_SVN_CACHE.${repo}) \
-   || defined(NO_SVN_CACHE.${repo}) && empty(NO_SVN_CACHE.${repo}:M[Yy][Ee][Ss])
 #   cache file name
-.  if !defined(SVN_DISTBASE.${repo})
-SVN_DISTBASE.${repo}=	${PKGBASE}-${SVN_MODULE.${repo}}
-.  endif
-_SVN_DISTFILE.${repo}=	${SVN_DISTBASE.${repo}}-${_SVN_TAG.${repo}}.tar.gz
+_SVN_DISTFILE.${repo}=	${PKGBASE}-${SVN_MODULE.${repo}}-svnarchive.tar.gz
 
 #   command to extract cache file
 _SVN_EXTRACT_CACHED.${repo}=	\
 	if [ -f ${_SVN_DISTDIR}/${_SVN_DISTFILE.${repo}:Q} ]; then		\
-	  ${STEP_MSG} "Extracting cached Subversion archive "${_SVN_DISTFILE.${repo}:Q}"."; \
+	  ${STEP_MSG} "Extracting cached SVN archive "${_SVN_DISTFILE.${repo}:Q}"."; \
 	  gzip -d -c ${_SVN_DISTDIR}/${_SVN_DISTFILE.${repo}:Q} | pax -r;	\
-	  exit 0;							\
 	fi
 
 #   create cache archive
 _SVN_CREATE_CACHE.${repo}=	\
-	${STEP_MSG} "Creating cached Subversion archive "${_SVN_DISTFILE.${repo}:Q}"."; \
-	${MKDIR} ${_SVN_DISTDIR:Q};							\
-	pax -w ${SVN_MODULE.${repo}:Q} | gzip > ${_SVN_DISTDIR}/${_SVN_DISTFILE.${repo}:Q}
-.  else
-# I have to set them to noop:
-_SVN_DISTFILE.${repo}=		:
-_SVN_EXTRACT_CACHED.${repo}=	:
-_SVN_CREATE_CACHE.${repo}=	:
-.  endif
+	${STEP_MSG} "Creating cached SVN archive "${_SVN_DISTFILE.${repo}:Q}"."; \
+	${MKDIR} ${_SVN_DISTDIR:Q};					\
+	pax -w ${SVN_MODULE.${repo}:Q} | gzip > ${_SVN_DISTDIR}/${_SVN_DISTFILE.${repo}:Q}.tmp;	\
+	${MV} '${_SVN_DISTDIR}/${_SVN_DISTFILE.${repo}:Q}.tmp' '${_SVN_DISTDIR}/${_SVN_DISTFILE.${repo}:Q}'
+
+#   fetch svn repo or update cached one
+_SVN_FETCH_REPO.${repo}=	\
+	if [ ! -d ${SVN_MODULE.${repo}:Q} ]; then				\
+	  ${STEP_MSG} "Cloning SVN repository "${SVN_MODULE.${repo}:Q}".";	\
+	  ${SETENV} ${_SVN_ENV.${repo}} ${_SVN_CMD}				\
+	    checkout ${_SVN_FLAG.${repo}} ${SVN_CHECKOUT_FLAGS}			\
+	    ${SVN_REPO.${repo}:Q} ${SVN_MODULE.${repo}:Q};			\
+	else									\
+	  ${STEP_MSG} "Updating SVN repository "${_SVN_FLAG.${repo}:Q}".";	\
+	  ${SETENV} ${_SVN_ENV.${repo}} ${_SVN_CMD}				\
+	    update ${_SVN_FLAG.${repo}} ${SVN_CHECKOUT_FLAGS}			\
+	    ${SVN_MODULE.${repo}:Q};						\
+	fi
 .endfor
 
 pre-extract: do-svn-extract
 
-do-svn-extract: .PHONY
-.if defined(SVN_CERTS) && !empty(SVN_CERTS)
+.PHONY: do-svn-extract
+do-svn-extract:
+.for _repo_ in ${SVN_REPOSITORIES}
+.if defined(SVN_CERTS.${_repo_}) && !empty(SVN_CERTS.${_repo_})
 	${RUN}${MKDIR} -p ${_SVN_CONFIG_DIR}/auth/svn.ssl.server
-	${RUN}${CP} ${SVN_CERTS} ${_SVN_CONFIG_DIR}/auth/svn.ssl.server
+	${RUN}${CP} ${SVN_CERTS.${_repo_}} ${_SVN_CONFIG_DIR}/auth/svn.ssl.server
 .endif
-.for repo in ${SVN_REPOSITORIES}
-	${RUN} cd ${WRKDIR};						\
-	if [ ! -d ${_SVN_DISTDIR} ]; then mkdir -p ${_SVN_DISTDIR:Q}; fi;	\
-	${_SVN_EXTRACT_CACHED.${repo}};					\
-	${STEP_MSG} "Downloading "${SVN_MODULE.${repo}:Q}" from "${SVN_ROOT.${repo}:Q}"."; \
-	${SETENV} ${_SVN_ENV}						\
-		${_SVN_CMD} checkout ${_SVN_CHECKOUT_FLAGS}		\
-			${_SVN_TAG_FLAG.${repo}:Q}			\
-			${_SVN_FLAGS}		 			\
-			${SVN_ROOT.${repo}:Q}				\
-			${SVN_MODULE.${repo}:Q};			\
-	${_SVN_CREATE_CACHE.${repo}}
+	${RUN} cd ${WRKDIR};							\
+	if [ ! -d ${_SVN_DISTDIR:Q} ]; then mkdir -p ${_SVN_DISTDIR:Q}; fi;	\
+	${_SVN_EXTRACT_CACHED.${_repo_}};					\
+	${_SVN_FETCH_REPO.${_repo_}};						\
+	${_SVN_CREATE_CACHE.${_repo_}};
 .endfor
 
 .endif
diff --git a/mk/svn-package2.mk b/mk/svn-package2.mk
deleted file mode 100644
index ab53ba3..0000000
--- a/mk/svn-package2.mk
+++ /dev/null
@@ -1,137 +0,0 @@
-# This file provides simple access to svn repositories, so that packages
-# can be created from svn instead of from released tarballs.
-#
-# A package using this file shall define the following variables:
-#
-#	SVN_REPOSITORIES
-#		A list of unique identifiers /id/ for which appropriate
-#		SVN_REPO must be defined.
-#
-#	SVN_REPO.${id}
-#		The svn repository
-#
-#	SVN_MODULE.${id}
-#		The svn module to check out.
-#
-#               Default value: ${id}
-#
-# It may define the following variables:
-#
-#	SVN_BRANCH.${id}
-#		The branch to check out.
-#
-#	SVN_REVISION.${id}
-#		The revision to check out.
-#
-#	SVN_ENV.${id}
-#		The environment for svn
-
-.if !defined(_PKG_MK_SVN_PACKAGE_MK)
-_PKG_MK_SVN_PACKAGE_MK=	# defined
-
-BUILD_DEPENDS+=		subversion-base-[0-9]*:../../devel/subversion-base
-
-#
-# defaults for user-visible input variables
-#
-
-DISTFILES?=		# empty
-PKGREVISION?=		${_SVN_PKGVERSION:S/.//g}
-
-#
-# End of the interface part. Start of the implementation part.
-#
-
-#
-# Input validation
-#
-
-.if !defined(SVN_REPOSITORIES)
-PKG_FAIL_REASON+=	"[svn-package2.mk] SVN_REPOSITORIES must be set."
-SVN_REPOSITORIES?=	# none
-.endif
-
-.for _repo_ in ${SVN_REPOSITORIES}
-.  if !defined(SVN_REPO.${_repo_})
-PKG_FAIL_REASON+=	"[svn-package2.mk] SVN_REPO."${_repo_:Q}" must be set."
-.  endif
-.endfor
-
-#
-# Internal variables
-#
-
-USE_TOOLS+=		date pax
-
-_SVN_CMD=		svn
-_SVN_CONFIG_DIR=	${WRKDIR}/.subversion
-_SVN_CHECKOUT_FLAGS=	--config-dir=${_SVN_CONFIG_DIR} --non-interactive
-_SVN_PKGVERSION_CMD=	${DATE} -u +'%Y.%m.%d'
-_SVN_PKGVERSION=	${_SVN_PKGVERSION_CMD:sh}
-_SVN_DISTDIR=		${DISTDIR}/svn-packages
-
-#
-# Generation of repository-specific variables
-
-
-.for repo in ${SVN_REPOSITORIES}
-SVN_MODULE.${repo}?=	${repo}
-_SVN_ENV.${repo}=	${SVN_ENV.${repo}}
-
-# determine appropriate checkout option
-.  if defined(SVN_REVISION.${repo})
-_SVN_FLAG.${repo}=	-r ${SVN_REVISION.${repo}}
-.  else
-_SVN_FLAG.${repo}=	-r HEAD
-.  endif
-
-# Cache support:
-#   cache file name
-_SVN_DISTFILE.${repo}=	${PKGBASE}-${SVN_MODULE.${repo}}-svnarchive.tar.gz
-
-#   command to extract cache file
-_SVN_EXTRACT_CACHED.${repo}=	\
-	if [ -f ${_SVN_DISTDIR}/${_SVN_DISTFILE.${repo}:Q} ]; then		\
-	  ${STEP_MSG} "Extracting cached SVN archive "${_SVN_DISTFILE.${repo}:Q}"."; \
-	  gzip -d -c ${_SVN_DISTDIR}/${_SVN_DISTFILE.${repo}:Q} | pax -r;	\
-	fi
-
-#   create cache archive
-_SVN_CREATE_CACHE.${repo}=	\
-	${STEP_MSG} "Creating cached SVN archive "${_SVN_DISTFILE.${repo}:Q}"."; \
-	${MKDIR} ${_SVN_DISTDIR:Q};					\
-	pax -w ${SVN_MODULE.${repo}:Q} | gzip > ${_SVN_DISTDIR}/${_SVN_DISTFILE.${repo}:Q}.tmp;	\
-	${MV} '${_SVN_DISTDIR}/${_SVN_DISTFILE.${repo}:Q}.tmp' '${_SVN_DISTDIR}/${_SVN_DISTFILE.${repo}:Q}'
-
-#   fetch svn repo or update cached one
-_SVN_FETCH_REPO.${repo}=	\
-	if [ ! -d ${SVN_MODULE.${repo}:Q} ]; then				\
-	  ${STEP_MSG} "Cloning SVN repository "${SVN_MODULE.${repo}:Q}".";	\
-	  ${SETENV} ${_SVN_ENV.${repo}} ${_SVN_CMD}				\
-	    checkout ${_SVN_FLAG.${repo}} ${SVN_CHECKOUT_FLAGS}			\
-	    ${SVN_REPO.${repo}:Q} ${SVN_MODULE.${repo}:Q};			\
-	else									\
-	  ${STEP_MSG} "Updating SVN repository "${_SVN_FLAG.${repo}:Q}".";	\
-	  ${SETENV} ${_SVN_ENV.${repo}} ${_SVN_CMD}				\
-	    update ${_SVN_FLAG.${repo}} ${SVN_CHECKOUT_FLAGS}			\
-	    ${SVN_MODULE.${repo}:Q};						\
-	fi
-.endfor
-
-pre-extract: do-svn-extract
-
-.PHONY: do-svn-extract
-do-svn-extract:
-.for _repo_ in ${SVN_REPOSITORIES}
-.if defined(SVN_CERTS.${_repo_}) && !empty(SVN_CERTS.${_repo_})
-	${RUN}${MKDIR} -p ${_SVN_CONFIG_DIR}/auth/svn.ssl.server
-	${RUN}${CP} ${SVN_CERTS.${_repo_}} ${_SVN_CONFIG_DIR}/auth/svn.ssl.server
-.endif
-	${RUN} cd ${WRKDIR};							\
-	if [ ! -d ${_SVN_DISTDIR:Q} ]; then mkdir -p ${_SVN_DISTDIR:Q}; fi;	\
-	${_SVN_EXTRACT_CACHED.${_repo_}};					\
-	${_SVN_FETCH_REPO.${_repo_}};						\
-	${_SVN_CREATE_CACHE.${_repo_}};
-.endfor
-
-.endif
diff --git a/mpg123-svn/Makefile b/mpg123-svn/Makefile
index ed2ddd9..358956a 100644
--- a/mpg123-svn/Makefile
+++ b/mpg123-svn/Makefile
@@ -46,7 +46,7 @@ SVN_REPO.mpg123=	svn://orgis.org/mpg123/trunk
 pre-configure:
 	cd ${WRKSRC} && autoreconf -iv
 
-.include "../../wip/mk/svn-package2.mk"
+.include "../../wip/mk/svn-package.mk"
 .include "../../mk/bsd.fast.prefs.mk"
 
 #YESTERDAY!=	expr `date +%s` - 86399
diff --git a/openaxiom-svn/Makefile b/openaxiom-svn/Makefile
index 712f18b..f04131b 100644
--- a/openaxiom-svn/Makefile
+++ b/openaxiom-svn/Makefile
@@ -59,5 +59,5 @@ WRKSRC=			${WRKDIR}/open-axiom
 
 PKGNAME=		openaxiom-1.99	# VCS-based
 
-.include "../mk/svn-package2.mk"
+.include "../mk/svn-package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/p5-xmlsig-svn/Makefile b/p5-xmlsig-svn/Makefile
index 4507f15..bdf4634 100644
--- a/p5-xmlsig-svn/Makefile
+++ b/p5-xmlsig-svn/Makefile
@@ -35,5 +35,5 @@ pre-configure:
 .include "../../security/xmlsec1/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
-.include "../../wip/mk/svn-package2.mk"
+.include "../../wip/mk/svn-package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/pilemc-svn/Makefile b/pilemc-svn/Makefile
index 59d452c..455738b 100644
--- a/pilemc-svn/Makefile
+++ b/pilemc-svn/Makefile
@@ -23,5 +23,5 @@ pre-configure:
 
 .include "../../math/gsl/buildlink3.mk"
 .include "../../wip/hepmc/buildlink3.mk"
-.include "../../wip/mk/svn-package2.mk"
+.include "../../wip/mk/svn-package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/trac-plugins-GraphViz-svn/Makefile b/trac-plugins-GraphViz-svn/Makefile
index b9a0aa0..d5b3eef 100644
--- a/trac-plugins-GraphViz-svn/Makefile
+++ b/trac-plugins-GraphViz-svn/Makefile
@@ -35,5 +35,5 @@ post-extract:
 
 .include "../../graphics/graphviz/buildlink3.mk"
 .include "../../lang/python/egg.mk"
-.include "../../wip/mk/svn-package2.mk"
+.include "../../wip/mk/svn-package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/trac-plugins-MasterTickets-svn/Makefile b/trac-plugins-MasterTickets-svn/Makefile
index c8d15c9..b201e9b 100644
--- a/trac-plugins-MasterTickets-svn/Makefile
+++ b/trac-plugins-MasterTickets-svn/Makefile
@@ -40,5 +40,5 @@ WRKSRC=		${WRKDIR}/mastertickets
 # \todo Make this optional.
 .include "../../graphics/graphviz/buildlink3.mk"
 .include "../../lang/python/egg.mk"
-.include "../../wip/mk/svn-package2.mk"
+.include "../../wip/mk/svn-package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/trac-plugins-RoadmapHours-svn/Makefile b/trac-plugins-RoadmapHours-svn/Makefile
index cce4cae..5dd06a7 100644
--- a/trac-plugins-RoadmapHours-svn/Makefile
+++ b/trac-plugins-RoadmapHours-svn/Makefile
@@ -35,5 +35,5 @@ post-extract:
 	find ${WRKSRC} -type d -name .svn -print | xargs rm -r
 
 .include "../../lang/python/egg.mk"
-.include "../../wip/mk/svn-package2.mk"
+.include "../../wip/mk/svn-package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/trac-plugins-SensitiveTickets-svn/Makefile b/trac-plugins-SensitiveTickets-svn/Makefile
index de9ffa3..7c701a7 100644
--- a/trac-plugins-SensitiveTickets-svn/Makefile
+++ b/trac-plugins-SensitiveTickets-svn/Makefile
@@ -35,5 +35,5 @@ post-extract:
 	find ${WRKSRC} -type d -name .svn -print | xargs rm -r
 
 .include "../../lang/python/egg.mk"
-.include "../../wip/mk/svn-package2.mk"
+.include "../../wip/mk/svn-package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/trac-plugins-TimingAndEstimation-svn/Makefile b/trac-plugins-TimingAndEstimation-svn/Makefile
index e8d3ae4..be87dc0 100644
--- a/trac-plugins-TimingAndEstimation-svn/Makefile
+++ b/trac-plugins-TimingAndEstimation-svn/Makefile
@@ -44,5 +44,5 @@ post-install:
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
-.include "../../wip/mk/svn-package2.mk"
+.include "../../wip/mk/svn-package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/trac-plugins-spamfilter-svn/Makefile b/trac-plugins-spamfilter-svn/Makefile
index 1cbe066..b5d7746 100644
--- a/trac-plugins-spamfilter-svn/Makefile
+++ b/trac-plugins-spamfilter-svn/Makefile
@@ -30,5 +30,5 @@ post-extract:
 	find ${WRKSRC} -type d -name .svn -print | xargs rm -r
 
 .include "../../lang/python/egg.mk"
-.include "../../wip/mk/svn-package2.mk"
+.include "../../wip/mk/svn-package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/virtualbox-svn/Makefile b/virtualbox-svn/Makefile
index a082f00..fda21b1 100644
--- a/virtualbox-svn/Makefile
+++ b/virtualbox-svn/Makefile
@@ -102,7 +102,7 @@ do-install:
 	${RUN} cd ${WRKSRC} && . ./env.sh && kmk install
 
 .include "../../textproc/libxml2/buildlink3.mk"
-.include "../../wip/mk/svn-package2.mk"
+.include "../../wip/mk/svn-package.mk"
 .include "../../mk/java-vm.mk"
 .include "../../net/libIDL/buildlink3.mk"
 .include "../../audio/pulseaudio/buildlink3.mk"


Home | Main Index | Thread Index | Old Index