pkgsrc-WIP-changes archive

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

Add freebsd-svn - A variant of subversion package built with the FreeBSD commit template. Things to fix: Strip it back so that it rides the main devel/subversion without duplication. Make it so it can co-exist alongside stock package (install binary as fbsd-svn?)



Module Name:	pkgsrc-wip
Committed By:	Sevan Janiyan <venture37%geeklan.co.uk@localhost>
Pushed By:	sevan
Date:		Fri Aug 17 10:28:49 2018 +0100
Changeset:	08386002852bc3e3d2de767d06df13a11ab4a9d7

Added Files:
	freebsd-svn/DESCR
	freebsd-svn/Makefile
	freebsd-svn/PLIST
	freebsd-svn/buildlink3.mk
	freebsd-svn/distinfo
	freebsd-svn/options.mk

Log Message:
Add freebsd-svn - A variant of subversion package built with the FreeBSD commit
template.
Things to fix:
Strip it back so that it rides the main devel/subversion without duplication.
Make it so it can co-exist alongside stock package (install binary as fbsd-svn?)

Put together on the first night of the Essen Hackathon so I could work on
FreeBSD from my iBook running NetBSD/macppc 8.0 and it worked great :)

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

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

diffstat:
 freebsd-svn/DESCR         |   4 ++
 freebsd-svn/Makefile      |  90 ++++++++++++++++++++++++++++++++
 freebsd-svn/PLIST         | 130 ++++++++++++++++++++++++++++++++++++++++++++++
 freebsd-svn/buildlink3.mk |   3 ++
 freebsd-svn/distinfo      |  13 +++++
 freebsd-svn/options.mk    |   3 ++
 6 files changed, 243 insertions(+)

diffs:
diff --git a/freebsd-svn/DESCR b/freebsd-svn/DESCR
new file mode 100644
index 0000000000..5996165d0f
--- /dev/null
+++ b/freebsd-svn/DESCR
@@ -0,0 +1,4 @@
+This package contains all the Subversion programs and libraries except
+the Apache module mod_dav_svn (for which see the ap2-subversion
+package) and the Python bindings and some programs which use them (for
+which see the py-subversion package). It includes the FreeBSD commit template.
diff --git a/freebsd-svn/Makefile b/freebsd-svn/Makefile
new file mode 100644
index 0000000000..3b111cbf08
--- /dev/null
+++ b/freebsd-svn/Makefile
@@ -0,0 +1,90 @@
+# $NetBSD$
+
+PKGNAME=	freebsd-subversion-${SVNVER}
+COMMENT=	Subversion with FreeBSD commit template
+
+# on at least solaris, configure fails to figure out
+# that you need -lintl
+BROKEN_GETTEXT_DETECTION=	yes
+
+.include "../../devel/subversion/Makefile.common"
+
+CONFLICTS+= 		subversion-[0-9]* subversion-base-[0-9]*
+
+DISTINFO_FILE=		${.CURDIR}/../../wip/freebsd-svn/distinfo
+
+PATCHFILES+= 		extra-patch-fbsd-template
+PATCH_SITES+= 		https://svnweb.freebsd.org/ports/head/devel/subversion19/files/
+
+USE_TOOLS+=		msgfmt
+
+CONFIGURE_ARGS+=	--without-apxs
+
+APU_OPTIONS=		PKG_BUILD_OPTIONS.apr-util
+BUILD_DEFS+=		${APU_OPTIONS}
+
+CFLAGS.SunOS+=		-D__EXTENSIONS__
+
+BUILDLINK_API_DEPENDS.sqlite3+=	sqlite3>=3.7.15.1
+.include "../../databases/sqlite3/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+
+PLIST_VARS+=		db4
+.include "../../devel/apr-util/buildlink3.mk"
+.if !empty(PKG_BUILD_OPTIONS.apr-util:Mdb4)
+PLIST.db4=		yes
+CONFIGURE_ARGS+=	--with-berkeley-db
+.else
+CONFIGURE_ARGS+=	--without-berkeley-db
+.endif
+
+PLIST_SUBST+=		DAV_RA=${DAV_RA:Q}
+
+RCD_SCRIPTS=	svnserve
+
+post-install:
+	${INSTALL_DATA_DIR} ${DESTDIR}${SVNDOC}
+	cd ${WRKSRC} && ${INSTALL_DATA} INSTALL README ${DESTDIR}${SVNDOC}
+	cd ${WRKSRC}/doc/user && ${INSTALL_DATA} *.html *.txt ${DESTDIR}${SVNDOC}
+	${INSTALL_DATA_DIR} ${DESTDIR}${SVNEXAMPLES}/backup
+	${INSTALL_DATA_DIR} ${DESTDIR}${SVNEXAMPLES}/cgi
+	${INSTALL_DATA_DIR} ${DESTDIR}${SVNEXAMPLES}/hook-scripts
+	${INSTALL_DATA_DIR} ${DESTDIR}${SVNEXAMPLES}/hook-scripts/mailer
+	${INSTALL_DATA_DIR} ${DESTDIR}${SVNEXAMPLES}/hook-scripts/mailer/tests
+	${INSTALL_DATA} ${WRKSRC}/tools/backup/hot-backup.py \
+		${DESTDIR}${SVNEXAMPLES}/backup
+	${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/commit* \
+		${DESTDIR}${SVNEXAMPLES}/hook-scripts
+	${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/svnperms* \
+		${DESTDIR}${SVNEXAMPLES}/hook-scripts
+	${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/log-police.py \
+		${WRKSRC}/tools/hook-scripts/verify-po.py \
+		${DESTDIR}${SVNEXAMPLES}/hook-scripts
+	${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/mailer/mailer* \
+		${DESTDIR}${SVNEXAMPLES}/hook-scripts/mailer
+	${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/mailer/tests/mailer* \
+		${DESTDIR}${SVNEXAMPLES}/hook-scripts/mailer/tests
+
+.PHONY: svn-build-outputs-hack
+# Subversion's build system is set up to build everything from source
+# at once.  In pkgsrc, we install the base part of subversion, and
+# then build other pieces against installed libraries.  Here, we run
+# svn's equivalent of automake to say that the libraries installed as
+# part of subversion-base are installed, and save that generated file.
+# Other packages then copy this file into place when building to avoid
+# having to build these libraries again.
+#
+# The normal update procedure is
+#   test build and package subversion-base
+#   run make svn-build-outputs-hack
+#   test build and package other subversion packages
+#   commit the update to ../subversion/files/build-outputs.mk along with the version change
+#
+svn-build-outputs-hack:
+	cd ${WRKSRC} && ./gen-make.py --release --installed-libs libsvn_client,libsvn_delta,libsvn_diff,libsvn_fs,libsvn_ra,libsvn_repos,libsvn_subr,libsvn_wc
+	${MV} -f ${WRKSRC}/build-outputs.mk ${FILESDIR}/build-outputs.mk
+
+.include "../../devel/apr/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../mk/curses.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/freebsd-svn/PLIST b/freebsd-svn/PLIST
new file mode 100644
index 0000000000..ce33f1e69a
--- /dev/null
+++ b/freebsd-svn/PLIST
@@ -0,0 +1,130 @@
+@comment $NetBSD: PLIST,v 1.26 2018/01/01 22:29:26 rillig Exp $
+bin/svn
+bin/svnadmin
+bin/svnbench
+bin/svndumpfilter
+bin/svnfsfs
+bin/svnlook
+bin/svnmucc
+bin/svnrdump
+bin/svnserve
+bin/svnsync
+bin/svnversion
+include/subversion-1/mod_authz_svn.h
+include/subversion-1/mod_dav_svn.h
+include/subversion-1/svn-revision.txt
+include/subversion-1/svn_auth.h
+include/subversion-1/svn_base64.h
+include/subversion-1/svn_cache_config.h
+include/subversion-1/svn_checksum.h
+include/subversion-1/svn_client.h
+include/subversion-1/svn_cmdline.h
+include/subversion-1/svn_compat.h
+include/subversion-1/svn_config.h
+include/subversion-1/svn_ctype.h
+include/subversion-1/svn_dav.h
+include/subversion-1/svn_delta.h
+include/subversion-1/svn_diff.h
+include/subversion-1/svn_dirent_uri.h
+include/subversion-1/svn_dso.h
+include/subversion-1/svn_error.h
+include/subversion-1/svn_error_codes.h
+include/subversion-1/svn_fs.h
+include/subversion-1/svn_hash.h
+include/subversion-1/svn_io.h
+include/subversion-1/svn_iter.h
+include/subversion-1/svn_md5.h
+include/subversion-1/svn_mergeinfo.h
+include/subversion-1/svn_nls.h
+include/subversion-1/svn_opt.h
+include/subversion-1/svn_path.h
+include/subversion-1/svn_pools.h
+include/subversion-1/svn_props.h
+include/subversion-1/svn_quoprint.h
+include/subversion-1/svn_ra.h
+include/subversion-1/svn_ra_svn.h
+include/subversion-1/svn_repos.h
+include/subversion-1/svn_sorts.h
+include/subversion-1/svn_string.h
+include/subversion-1/svn_subst.h
+include/subversion-1/svn_time.h
+include/subversion-1/svn_types.h
+include/subversion-1/svn_user.h
+include/subversion-1/svn_utf.h
+include/subversion-1/svn_version.h
+include/subversion-1/svn_wc.h
+include/subversion-1/svn_x509.h
+include/subversion-1/svn_xml.h
+lib/libsvn_client-1.la
+lib/libsvn_delta-1.la
+lib/libsvn_diff-1.la
+lib/libsvn_fs-1.la
+${PLIST.db4}lib/libsvn_fs_base-1.la
+lib/libsvn_fs_fs-1.la
+lib/libsvn_fs_util-1.la
+lib/libsvn_fs_x-1.la
+lib/libsvn_ra-1.la
+lib/libsvn_ra_local-1.la
+${PLIST.serf}lib/libsvn_ra_serf-1.la
+lib/libsvn_ra_svn-1.la
+lib/libsvn_repos-1.la
+lib/libsvn_subr-1.la
+lib/libsvn_wc-1.la
+lib/pkgconfig/libsvn_client.pc
+lib/pkgconfig/libsvn_delta.pc
+lib/pkgconfig/libsvn_diff.pc
+lib/pkgconfig/libsvn_fs.pc
+${PLIST.db4}lib/pkgconfig/libsvn_fs_base.pc
+lib/pkgconfig/libsvn_fs_fs.pc
+lib/pkgconfig/libsvn_fs_util.pc
+lib/pkgconfig/libsvn_fs_x.pc
+lib/pkgconfig/libsvn_ra.pc
+lib/pkgconfig/libsvn_ra_local.pc
+${PLIST.serf}lib/pkgconfig/libsvn_ra_serf.pc
+lib/pkgconfig/libsvn_ra_svn.pc
+lib/pkgconfig/libsvn_repos.pc
+lib/pkgconfig/libsvn_subr.pc
+lib/pkgconfig/libsvn_wc.pc
+man/man1/svn.1
+man/man1/svnadmin.1
+man/man1/svndumpfilter.1
+man/man1/svnlook.1
+man/man1/svnmucc.1
+man/man1/svnrdump.1
+man/man1/svnsync.1
+man/man1/svnversion.1
+man/man5/svnserve.conf.5
+man/man8/svnserve.8
+share/doc/subversion/INSTALL
+share/doc/subversion/README
+share/doc/subversion/cvs-crossover-guide.html
+share/doc/subversion/lj_article.txt
+share/doc/subversion/svn-best-practices.html
+share/examples/subversion/backup/hot-backup.py
+share/examples/subversion/hook-scripts/commit-access-control.cfg.example
+share/examples/subversion/hook-scripts/commit-access-control.pl
+share/examples/subversion/hook-scripts/commit-access-control.pl.in
+share/examples/subversion/hook-scripts/commit-email.rb
+share/examples/subversion/hook-scripts/log-police.py
+share/examples/subversion/hook-scripts/mailer/mailer.conf.example
+share/examples/subversion/hook-scripts/mailer/mailer.py
+share/examples/subversion/hook-scripts/mailer/tests/mailer-init.sh
+share/examples/subversion/hook-scripts/mailer/tests/mailer-t1.output
+share/examples/subversion/hook-scripts/mailer/tests/mailer-t1.sh
+share/examples/subversion/hook-scripts/mailer/tests/mailer-tweak.py
+share/examples/subversion/hook-scripts/mailer/tests/mailer.conf
+share/examples/subversion/hook-scripts/svnperms.conf.example
+share/examples/subversion/hook-scripts/svnperms.py
+share/examples/subversion/hook-scripts/verify-po.py
+share/locale/de/LC_MESSAGES/subversion.mo
+share/locale/es/LC_MESSAGES/subversion.mo
+share/locale/fr/LC_MESSAGES/subversion.mo
+share/locale/it/LC_MESSAGES/subversion.mo
+share/locale/ja/LC_MESSAGES/subversion.mo
+share/locale/ko/LC_MESSAGES/subversion.mo
+share/locale/nb/LC_MESSAGES/subversion.mo
+share/locale/pl/LC_MESSAGES/subversion.mo
+share/locale/pt_BR/LC_MESSAGES/subversion.mo
+share/locale/sv/LC_MESSAGES/subversion.mo
+share/locale/zh_CN/LC_MESSAGES/subversion.mo
+share/locale/zh_TW/LC_MESSAGES/subversion.mo
diff --git a/freebsd-svn/buildlink3.mk b/freebsd-svn/buildlink3.mk
new file mode 100644
index 0000000000..7e241295ea
--- /dev/null
+++ b/freebsd-svn/buildlink3.mk
@@ -0,0 +1,3 @@
+# $NetBSD$
+
+.include "../../devel/subversion-base/buildlink3.mk"
diff --git a/freebsd-svn/distinfo b/freebsd-svn/distinfo
new file mode 100644
index 0000000000..fef37a7c20
--- /dev/null
+++ b/freebsd-svn/distinfo
@@ -0,0 +1,13 @@
+$NetBSD$
+
+SHA1 (extra-patch-fbsd-template) = 59c060a4a1d4d78844a8f486359fec438333a115
+RMD160 (extra-patch-fbsd-template) = 0ee99dffeec6865761032dd47c25c73aef4e835e
+SHA512 (extra-patch-fbsd-template) = f9fa97c31d8fb5ea254cac67f6e32ec66308824251709b9c11c5b58444fc31f2624ecf77b4f5843ae57769ff4c1fc0b020a8a7287000ae7a6e02e1b630bd0687
+Size (extra-patch-fbsd-template) = 6525 bytes
+SHA1 (subversion-1.9.7.tar.bz2) = 874b81749cdc3e88152d103243c3623ac6338388
+RMD160 (subversion-1.9.7.tar.bz2) = d4ede3249729ce56ff7c9d7993a238d7a5446733
+SHA512 (subversion-1.9.7.tar.bz2) = a55efd3edaddbc099450d849fcc6fe5a8d20b85ece966d8ac2fd73ee9cb4255a0349bbcfceb4e9fca6daf054ce7c648eff8d273c6873f5dade6e62dcea7eeb2b
+Size (subversion-1.9.7.tar.bz2) = 7881909 bytes
+SHA1 (patch-ad) = 2c158d03d6636309f97fb785bb244b150c4ec8c3
+SHA1 (patch-ae) = a9cd7d26fb5f9da8ff81413ef32948ccd6c4290e
+SHA1 (patch-tools_dev_benchmarks_large__dirs_create__bigdir.sh) = ff19087ff4d348fdcf904eb52406f6b717fe444a
diff --git a/freebsd-svn/options.mk b/freebsd-svn/options.mk
new file mode 100644
index 0000000000..eec3d7cdd6
--- /dev/null
+++ b/freebsd-svn/options.mk
@@ -0,0 +1,3 @@
+# $NetBSD$
+
+.include "../../devel/subversion-base/options.mk"


Home | Main Index | Thread Index | Old Index