ex-windows user, first time trying to add a new flavor: without Berkeley
DB (no_bdb). Learnt a fair bit already! its diff'd against the new 1.2.3p0.
I get the build _I_ want now, but I surely haven't done this correctly
for others. I am not sure how to add a dependency based on a FLAVOR
(deleted DB) nor how to set the output type (changed to FSFS).
Suggestions on improvements are welcome.
cheers, scorch
--
out of the frying pan and into the fire
--- Makefile Sat Sep 17 01:38:58 2005
+++ Makefile.new Sat Sep 17 01:38:31 2005
@@ -4,7 +4,7 @@
COMMENT-perl= "perl interface to subversion"
COMMENT-python= "python interface to subversion"
-VERSION= 1.2.1
+VERSION= 1.2.3
DISTNAME= subversion-${VERSION}
PKGNAME= ${DISTNAME}p0
PKGNAME-perl= p5-SVN-${VERSION}
@@ -20,11 +20,11 @@
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= apr-1 db z
+WANTLIB= apr-1 z
MASTER_SITES= ${HOMEPAGE}/tarballs/
-PSEUDO_FLAVORS= no_bindings
+PSEUDO_FLAVORS= no_bindings no_bdb
FLAVOR?=
PYTHON_VER= 2.3
@@ -82,6 +82,13 @@
--without-swig
.endif
+.if !${FLAVOR:L:Mno_bdb}
+CONFIGURE_ARGS+=--with-berkeley-db
+.else
+CONFIGURE_ARGS+=--without-berkeley-db
+.endif
+
+
REGRESS_DEPENDS=::lang/python/${PYTHON_VER} \
::devel/p5-IO-String
REGRESS_FLAGS= LD_LIBRARY_PATH=`find ${WRKBUILD} -name .libs | tr '\012' :`
@@ -98,9 +105,34 @@
post-install:
@cd ${WRKBUILD} && ${MAKE_PROGRAM} install-swig-py
@cd ${WRKBUILD} && ${MAKE_PROGRAM} install-swig-pl
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/subversion
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/subversion/backup
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/subversion/hook-scripts
+ ${INSTALL_DATA_DIR}
${PREFIX}/share/examples/subversion/hook-scripts/mailer
+ ${INSTALL_DATA_DIR}
${PREFIX}/share/examples/subversion/hook-scripts/mailer/tests
+ ${INSTALL_DATA} ${WRKBUILD}/tools/backup/hot-backup.py \
+ ${PREFIX}/share/examples/subversion/backup
+ ${INSTALL_DATA} ${WRKBUILD}/tools/hook-scripts/* \
+ ${PREFIX}/share/examples/subversion/hook-scripts
+ ${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/README \
+ ${PREFIX}/share/examples/subversion/hook-scripts
+ ${INSTALL_DATA}
${WRKSRC}/tools/hook-scripts/commit-access-control.cfg.example \
+ ${PREFIX}/share/examples/subversion/hook-scripts
+ ${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/commit-email.rb \
+ ${PREFIX}/share/examples/subversion/hook-scripts
+ ${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/svnperms.conf.example \
+ ${PREFIX}/share/examples/subversion/hook-scripts
+ ${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/svnperms.py \
+ ${PREFIX}/share/examples/subversion/hook-scripts
+ ${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/mailer/mailer.conf.example
\
+ ${PREFIX}/share/examples/subversion/hook-scripts/mailer
+ ${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/mailer/mailer.py \
+ ${PREFIX}/share/examples/subversion/hook-scripts/mailer
+ ${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/mailer/tests/* \
+
${PREFIX}/share/examples/subversion/hook-scripts/mailer/tests
post-regress:
- @cd ${WRKBUILD} && ${MAKE_PROGRAM} ${REGRESS_FLAGS} check FSTYPE=bdb
+ @cd ${WRKBUILD} && ${MAKE_PROGRAM} ${REGRESS_FLAGS} check FSTYPE=fsfs
@cd ${WRKBUILD} && ${MAKE_PROGRAM} ${REGRESS_FLAGS} check-swig-pl
.endif
