- add stage support

Approved by:	lev@ (implicit)

6 files changed, 27 insertions, 27 deletions

diff --git a/devel/p5-subversion/Makefile b/devel/p5-subversion/Makefile
index 70339c919559..67b0e06a6ebb 100644
--- a/devel/p5-subversion/Makefile
+++ b/devel/p5-subversion/Makefile
@@ -17,29 +17,20 @@ PKGDIR=		${.CURDIR}
 
 USES=		perl5
 
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VER}
-MAN3=		SVN::Base.3 \
-		SVN::Client.3 \
-		SVN::Core.3 \
-		SVN::Delta.3 \
-		SVN::Fs.3 \
-		SVN::Ra.3 \
-		SVN::Repos.3 \
-		SVN::Wc.3
-
 SVN_BUILD_BINDINGS=yes
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile.common"
 
 CATEGORIES+=	perl5
 
 do-build:
-	cd ${WRKSRC} ; ${MAKE} swig-pl-lib ; ${MAKE} swig-pl
+	${MAKE} -C ${WRKSRC} swig-pl-lib ${MAKE_ARGS}
+	${MAKE} -C ${WRKSRC} swig-pl ${MAKE_ARGS}
+
+pre-install:
+	${REINPLACE_CMD} '/SWIG_PL_DIR/s, install$$, all pure_install,g' ${WRKSRC}/Makefile
 
 do-install:
-	cd ${WRKSRC} ; \
-	${REINPLACE_CMD} '/SWIG_PL_DIR/s, install$$, all pure_install,g' ${WRKSRC}/Makefile ; \
-	${MAKE} install-swig-pl
+	${MAKE} -C ${WRKSRC} install-swig-pl ${MAKE_ARGS}
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-subversion/pkg-plist b/devel/p5-subversion/pkg-plist
index 7c9539d6bdcd..7a6a9a502f6f 100644
--- a/devel/p5-subversion/pkg-plist
+++ b/devel/p5-subversion/pkg-plist
@@ -2,6 +2,14 @@ lib/libsvn_swig_perl-1.a
 lib/libsvn_swig_perl-1.la
 lib/libsvn_swig_perl-1.so
 lib/libsvn_swig_perl-1.so.0
+%%PERL5_MAN3%%/SVN::Base.3.gz
+%%PERL5_MAN3%%/SVN::Client.3.gz
+%%PERL5_MAN3%%/SVN::Core.3.gz
+%%PERL5_MAN3%%/SVN::Delta.3.gz
+%%PERL5_MAN3%%/SVN::Fs.3.gz
+%%PERL5_MAN3%%/SVN::Ra.3.gz
+%%PERL5_MAN3%%/SVN::Repos.3.gz
+%%PERL5_MAN3%%/SVN::Wc.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/SVN/Base.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/SVN/Client.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/SVN/Core.pm
@@ -30,7 +38,7 @@ lib/libsvn_swig_perl-1.so.0
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Ra
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Fs
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Delta
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Client
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Core
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Client
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/SVN
diff --git a/devel/py-subversion/Makefile b/devel/py-subversion/Makefile
index f5879628da7e..beb8452000d7 100644
--- a/devel/py-subversion/Makefile
+++ b/devel/py-subversion/Makefile
@@ -19,15 +19,15 @@ USE_PYTHON=	yes
 
 SVN_BUILD_BINDINGS=	yes
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile.common"
 
 CATEGORIES+=	python
 
 do-build:
-	cd ${WRKSRC} ; ${MAKE} swig-py-lib ; ${MAKE} swig-py
+	${MAKE} -C ${WRKSRC} swig-py-lib ${MAKE_ARGS}
+	${MAKE} -C ${WRKSRC} swig-py ${MAKE_ARGS}
 
 do-install:
-	cd ${WRKSRC} ; ${MAKE} install-swig-py
+	${MAKE} -C ${WRKSRC} install-swig-py ${MAKE_ARGS}
 
 .include <bsd.port.post.mk>
diff --git a/devel/py-subversion/pkg-plist b/devel/py-subversion/pkg-plist
index 297499a1a5c4..812e02b77644 100644
--- a/devel/py-subversion/pkg-plist
+++ b/devel/py-subversion/pkg-plist
@@ -54,5 +54,5 @@ lib/libsvn_swig_py-1.so.0
 %%PYTHON_SITELIBDIR%%/svn/repos.pyc
 %%PYTHON_SITELIBDIR%%/svn/wc.py
 %%PYTHON_SITELIBDIR%%/svn/wc.pyc
-@dirrm %%PYTHON_SITELIBDIR%%/libsvn
 @dirrm %%PYTHON_SITELIBDIR%%/svn
+@dirrm %%PYTHON_SITELIBDIR%%/libsvn
diff --git a/devel/ruby-subversion/Makefile b/devel/ruby-subversion/Makefile
index e851bc2de682..d5da32f7c9f3 100644
--- a/devel/ruby-subversion/Makefile
+++ b/devel/ruby-subversion/Makefile
@@ -9,7 +9,8 @@ COMMENT=	Ruby bindings for version control system
 .if defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 16
 MASTERDIR=	${.CURDIR}/../../devel/subversion16
 .elif defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 17
-MASTERDIR=	${.CURDIR}/../../devel/subversion16
+BROKEN=	does not build with subversion17
+MASTERDIR=	${.CURDIR}/../../devel/subversion17
 .else
 MASTERDIR=	${.CURDIR}/../../devel/subversion
 .endif
@@ -19,15 +20,15 @@ USE_RUBY=	yes
 
 SVN_BUILD_BINDINGS=yes
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile.common"
 
 CATEGORIES+=	ruby
 
 do-build:
-	cd ${WRKSRC} ; ${MAKE} swig-rb-lib ; ${MAKE} swig-rb
+	${MAKE} -C ${WRKSRC} swig-rb-lib ${MAKE_ARGS}
+	${MAKE} -C ${WRKSRC} swig-rb ${MAKE_ARGS}
 
 do-install:
-	cd ${WRKSRC} ; ${MAKE} install-swig-rb
+	${MAKE} -C ${WRKSRC} install-swig-rb ${MAKE_ARGS}
 
 .include <bsd.port.post.mk>
diff --git a/devel/ruby-subversion/pkg-plist b/devel/ruby-subversion/pkg-plist
index 3fffe52f7393..b79d90e7493c 100644
--- a/devel/ruby-subversion/pkg-plist
+++ b/devel/ruby-subversion/pkg-plist
@@ -2,10 +2,10 @@ lib/libsvn_swig_ruby-1.a
 lib/libsvn_swig_ruby-1.la
 lib/libsvn_swig_ruby-1.so
 lib/libsvn_swig_ruby-1.so.0
-%%RUBY_SITEARCHLIBDIR%%/svn/ext/core.la
-%%RUBY_SITEARCHLIBDIR%%/svn/ext/core.so
 %%RUBY_SITEARCHLIBDIR%%/svn/ext/client.la
 %%RUBY_SITEARCHLIBDIR%%/svn/ext/client.so
+%%RUBY_SITEARCHLIBDIR%%/svn/ext/core.la
+%%RUBY_SITEARCHLIBDIR%%/svn/ext/core.so
 %%RUBY_SITEARCHLIBDIR%%/svn/ext/delta.la
 %%RUBY_SITEARCHLIBDIR%%/svn/ext/delta.so
 %%RUBY_SITEARCHLIBDIR%%/svn/ext/diff.la
@@ -30,6 +30,6 @@ lib/libsvn_swig_ruby-1.so.0
 %%RUBY_SITELIBDIR%%/svn/synchronizer.rb
 %%RUBY_SITELIBDIR%%/svn/util.rb
 %%RUBY_SITELIBDIR%%/svn/wc.rb
+@dirrm %%RUBY_SITELIBDIR%%/svn
 @dirrm %%RUBY_SITEARCHLIBDIR%%/svn/ext
 @dirrm %%RUBY_SITEARCHLIBDIR%%/svn
-@dirrm %%RUBY_SITELIBDIR%%/svn