Date: Thu, 23 Dec 2004 01:23:19 +0100 (CET) From: Herve Quiroz <hq@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/75411: [PATCH] devel/subversion: cleanup and improvements Message-ID: <200412230023.iBN0NJ0S013146@arabica.esil.univ-mrs.fr> Resent-Message-ID: <200412230030.iBN0URYK052086@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 75411
>Category: ports
>Synopsis: [PATCH] devel/subversion: cleanup and improvements
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Dec 23 00:30:27 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Herve Quiroz
>Release: FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD arabica.esil.univ-mrs.fr 5.3-STABLE FreeBSD 5.3-STABLE #1: Mon Dec 6 04:02:19 CET
>Description:
- Use %%DATADIR%% to calm portlint
- Remove whitespaces at end of lines to calm portlint
- Remove USE_SIZE to calm portlint
- Fix some typo in the preliminary notice
- Add $FreeBSD$ tags where missing (patches and pkg-plist)
- No longer build and install multi-file HTML Subversion Book as its broken but
rather install the single-file HTML and PDF versions provided in the
distribution [1]
- Handle NOPORTDOCS/WITH_BOOK possible issues
NOTE: The Subversion book knob has changed. It is now 'WITH_BOOK'.
NOTE2: Should we bump PORTREVISION here? IMHO we shouldn't as the upgrade is
probably not worth it for the end-user...
Reported by: mah [1]
Removed file(s):
- files/patch-doc::book::Makefile
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:
--- subversion-1.1.1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /var/fcvs/ports/devel/subversion/Makefile,v
retrieving revision 1.73
diff -u -u -r1.73 Makefile
--- Makefile 11 Nov 2004 06:50:34 -0000 1.73
+++ Makefile 22 Dec 2004 23:55:36 -0000
@@ -16,7 +16,6 @@
INSTALLS_SHLIB= yes
-USE_SIZE= yes
USE_BZIP2= yes
USE_LIBTOOL_VER=15
USE_REINPLACE= yes
@@ -96,7 +95,7 @@
#JAVA_BUILD= yes
#JAVA_RUN= yes
#.include "${PORTSDIR}/Mk/bsd.java.mk"
-#CONFIGURE_ARGS+= --enable-javahl --with-jdk=${JAVA_HOME}
+#CONFIGURE_ARGS+= --enable-javahl --with-jdk=${JAVA_HOME}
#PLIST_SUB+= WITH_JAVA=""
#.else
#PLIST_SUB+= WITH_JAVA="@comment "
@@ -108,7 +107,7 @@
CONFIGURE_ARGS+= --with-swig=${LOCALBASE} \
--enable-swig-bindings=${SWIG_BINDINGS:Q:S/ /,/g:S/\\//g}
.else
-CONFIGURE_ARGS+= --without-swig --disable-swig-bindings
+CONFIGURE_ARGS+= --without-swig --disable-swig-bindings
.endif
.if defined(WITH_MOD_DAV_SVN)
@@ -150,10 +149,8 @@
PLIST_SUB+= SVNSERVE_WRAPPER="@comment "
.endif
-.if defined(WITH_BOOK_HTML)
+.if !defined(NOPORTDOCS) && defined(WITH_BOOK)
PORTDOCS+= book
-BUILD_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \
- ${LOCALBASE}/bin/xsltproc:${PORTSDIR}/textproc/libxslt
.endif
SCRIPTS=
@@ -234,17 +231,17 @@
@${ECHO_MSG} ""
@${ECHO_MSG} "Repository will be created at '${SVNREPOS}' with group '${SVNGROUP}'"
@${ECHO_MSG} "You could change these settings by defining SVNREPOS and SVNGROUP"
- @${ECHO_MSG} ""
.endif
@${ECHO_MSG} ""
-.if defined(WITH_BOOK_HTML)
- @${ECHO_MSG} "Subversion Book (HTML) enabled."
+.if !defined(NOPORTDOCS)
+.if defined(WITH_BOOK)
+ @${ECHO_MSG} "Subversion Book will be installed."
.else
- @${ECHO_MSG} "You can install the Subversion Book (HTML) by defining"
- @${ECHO_MSG} "WITH_BOOK_HTML."
+ @${ECHO_MSG} "You can install the Subversion Book by defining WITH_BOOK."
+.endif
.endif
@${ECHO_MSG} ""
- @${ECHO_MSG} "May useful scripts will be installed into ${PREFIX}/share/subversion"
+ @${ECHO_MSG} "Many useful scripts will be installed into ${PREFIX}/share/subversion"
post-extract:
@${RM} -r ${WRKSRC}/neon
@@ -290,12 +287,6 @@
# cd ${WRKSRC} ; \
# ${MAKE} javahl
#.endif
-.if defined(WITH_BOOK_HTML)
- cd ${WRKSRC}/doc/book/tools/ ; \
- ${LN} -s ${PREFIX}/share/xsl/docbook xsl
- cd ${WRKSRC}/doc/book ; \
- ${MAKE} all-html
-.endif
.if defined(WITH_MOD_DAV_SVN)
pre-install:
@@ -311,9 +302,10 @@
for f in ${TXT_DOCS}; do \
${INSTALL_DATA} ${WRKSRC}/$$f ${DOCSDIR}; \
done
-.if defined(WITH_BOOK_HTML)
- cd ${WRKSRC}/doc/book ; \
- ${MAKE} install-book-html install-book-html-chunk INSTALL_DIR=${DOCSDIR}
+.if defined(WITH_BOOK)
+ @${MKDIR} ${DOCSDIR}/book
+ cd ${WRKSRC}/doc/book/book ; \
+ ${INSTALL_DATA} svn-book.html svn-book.pdf ${DOCSDIR}/book
.endif
.endif
.if defined(WITH_PERL)
Index: pkg-plist
===================================================================
RCS file: /var/fcvs/ports/devel/subversion/pkg-plist,v
retrieving revision 1.26
diff -u -u -r1.26 pkg-plist
--- pkg-plist 10 Nov 2004 20:40:19 -0000 1.26
+++ pkg-plist 22 Dec 2004 23:41:53 -0000
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
bin/svn
bin/svnadmin
bin/svndumpfilter
@@ -88,68 +89,68 @@
%%WITHOUT_GETTEXT%%share/locale/sv/LC_MESSAGES/subversion.mo
%%WITHOUT_GETTEXT%%share/locale/zh_CN/LC_MESSAGES/subversion.mo
%%WITHOUT_GETTEXT%%share/locale/zh_TW/LC_MESSAGES/subversion.mo
-share/subversion/backup/hot-backup.py
-share/subversion/client-side/bash_completion
-share/subversion/client-side/bash_completion_test
-share/subversion/client-side/server-vsn.py
-share/subversion/client-side/showchange.pl
-share/subversion/cvs2svn/README
-share/subversion/dev/check-license.py
-share/subversion/dev/datecheck.py
-share/subversion/dev/find-textfiles.sh
-share/subversion/dev/gcov.patch
-share/subversion/dev/gnuify-changelog.pl
-share/subversion/dev/iz/defect.dem
-share/subversion/dev/iz/ff2csv.command
-share/subversion/dev/iz/ff2csv.py
-share/subversion/dev/iz/find-fix.py
-share/subversion/dev/iz/run-queries.sh
-share/subversion/dev/normalize-dump.py
-share/subversion/dev/prebuild-cleanup.sh
-share/subversion/dev/random-commits.py
-share/subversion/dev/scramble-tree.py
-share/subversion/dev/stress.pl
-share/subversion/dev/svn-dev.el
-share/subversion/dev/svn-dev.vim
-share/subversion/dev/trails.py
-share/subversion/dev/verify-history.py
-share/subversion/examples/blame.py
-share/subversion/examples/check-modified.py
-share/subversion/examples/dumpprops.py
-share/subversion/examples/getfile.py
-share/subversion/examples/geturl.py
-share/subversion/examples/minimal_client.c
-share/subversion/examples/putfile.py
-share/subversion/examples/revplist.py
-share/subversion/examples/svnlook.py
-share/subversion/examples/svnserve-sgid.c
-share/subversion/examples/svnshell.py
-share/subversion/hook-scripts/commit-access-control.cfg.example
-share/subversion/hook-scripts/commit-access-control.pl
-share/subversion/hook-scripts/commit-email.pl
-share/subversion/hook-scripts/mailer/mailer.conf.example
-share/subversion/hook-scripts/mailer/mailer.py
-share/subversion/hook-scripts/mailer/tests/mailer-init.sh
-share/subversion/hook-scripts/mailer/tests/mailer-t1.output
-share/subversion/hook-scripts/mailer/tests/mailer-t1.sh
-share/subversion/hook-scripts/mailer/tests/mailer-tweak.py
-share/subversion/hook-scripts/propchange-email.pl
-share/subversion/hook-scripts/README
-share/subversion/hook-scripts/svnperms.conf.example
-share/subversion/hook-scripts/svnperms.py
-share/subversion/hook-scripts/verify-po.py
-share/subversion/po/svn-po-status-report.sh
-share/subversion/test-scripts/svntest/README
-share/subversion/test-scripts/svntest/svntest-check-configuration.sh
-share/subversion/test-scripts/svntest/svntest-config.sh
-share/subversion/test-scripts/svntest/svntest-rebuild-generic.sh
-share/subversion/test-scripts/svntest/svntest-rebuild.sh
-share/subversion/test-scripts/svntest/svntest-run.sh
-share/subversion/test-scripts/svntest/svntest-sendmail.sh
-share/subversion/test-scripts/svntest/svntest-update.sh
-share/subversion/test-scripts/svntest/svntest.sh
-share/subversion/xslt/svnindex.css
-share/subversion/xslt/svnindex.xsl
+%%DATADIR%%/backup/hot-backup.py
+%%DATADIR%%/client-side/bash_completion
+%%DATADIR%%/client-side/bash_completion_test
+%%DATADIR%%/client-side/server-vsn.py
+%%DATADIR%%/client-side/showchange.pl
+%%DATADIR%%/cvs2svn/README
+%%DATADIR%%/dev/check-license.py
+%%DATADIR%%/dev/datecheck.py
+%%DATADIR%%/dev/find-textfiles.sh
+%%DATADIR%%/dev/gcov.patch
+%%DATADIR%%/dev/gnuify-changelog.pl
+%%DATADIR%%/dev/iz/defect.dem
+%%DATADIR%%/dev/iz/ff2csv.command
+%%DATADIR%%/dev/iz/ff2csv.py
+%%DATADIR%%/dev/iz/find-fix.py
+%%DATADIR%%/dev/iz/run-queries.sh
+%%DATADIR%%/dev/normalize-dump.py
+%%DATADIR%%/dev/prebuild-cleanup.sh
+%%DATADIR%%/dev/random-commits.py
+%%DATADIR%%/dev/scramble-tree.py
+%%DATADIR%%/dev/stress.pl
+%%DATADIR%%/dev/svn-dev.el
+%%DATADIR%%/dev/svn-dev.vim
+%%DATADIR%%/dev/trails.py
+%%DATADIR%%/dev/verify-history.py
+%%DATADIR%%/examples/blame.py
+%%DATADIR%%/examples/check-modified.py
+%%DATADIR%%/examples/dumpprops.py
+%%DATADIR%%/examples/getfile.py
+%%DATADIR%%/examples/geturl.py
+%%DATADIR%%/examples/minimal_client.c
+%%DATADIR%%/examples/putfile.py
+%%DATADIR%%/examples/revplist.py
+%%DATADIR%%/examples/svnlook.py
+%%DATADIR%%/examples/svnserve-sgid.c
+%%DATADIR%%/examples/svnshell.py
+%%DATADIR%%/hook-scripts/commit-access-control.cfg.example
+%%DATADIR%%/hook-scripts/commit-access-control.pl
+%%DATADIR%%/hook-scripts/commit-email.pl
+%%DATADIR%%/hook-scripts/mailer/mailer.conf.example
+%%DATADIR%%/hook-scripts/mailer/mailer.py
+%%DATADIR%%/hook-scripts/mailer/tests/mailer-init.sh
+%%DATADIR%%/hook-scripts/mailer/tests/mailer-t1.output
+%%DATADIR%%/hook-scripts/mailer/tests/mailer-t1.sh
+%%DATADIR%%/hook-scripts/mailer/tests/mailer-tweak.py
+%%DATADIR%%/hook-scripts/propchange-email.pl
+%%DATADIR%%/hook-scripts/README
+%%DATADIR%%/hook-scripts/svnperms.conf.example
+%%DATADIR%%/hook-scripts/svnperms.py
+%%DATADIR%%/hook-scripts/verify-po.py
+%%DATADIR%%/po/svn-po-status-report.sh
+%%DATADIR%%/test-scripts/svntest/README
+%%DATADIR%%/test-scripts/svntest/svntest-check-configuration.sh
+%%DATADIR%%/test-scripts/svntest/svntest-config.sh
+%%DATADIR%%/test-scripts/svntest/svntest-rebuild-generic.sh
+%%DATADIR%%/test-scripts/svntest/svntest-rebuild.sh
+%%DATADIR%%/test-scripts/svntest/svntest-run.sh
+%%DATADIR%%/test-scripts/svntest/svntest-sendmail.sh
+%%DATADIR%%/test-scripts/svntest/svntest-update.sh
+%%DATADIR%%/test-scripts/svntest/svntest.sh
+%%DATADIR%%/xslt/svnindex.css
+%%DATADIR%%/xslt/svnindex.xsl
%%MOD_DAV_SVN%%libexec/apache2/mod_dav_svn.so
%%MOD_DAV_SVN%%libexec/apache2/mod_authz_svn.so
%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/apache2 -a -n dav libexec/apache2/mod_dav.so
@@ -235,17 +236,17 @@
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/wc.pyc
%%WITH_PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/libsvn
%%WITH_PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/svn
-@dirrm share/subversion/backup
-@dirrm share/subversion/client-side
-@dirrm share/subversion/cvs2svn
-@dirrm share/subversion/dev/iz
-@dirrm share/subversion/dev
-@dirrm share/subversion/examples
-@dirrm share/subversion/hook-scripts/mailer/tests
-@dirrm share/subversion/hook-scripts/mailer
-@dirrm share/subversion/hook-scripts
-@dirrm share/subversion/po
-@dirrm share/subversion/test-scripts/svntest
-@dirrm share/subversion/test-scripts
-@dirrm share/subversion/xslt
-@dirrm share/subversion
+@dirrm %%DATADIR%%/backup
+@dirrm %%DATADIR%%/client-side
+@dirrm %%DATADIR%%/cvs2svn
+@dirrm %%DATADIR%%/dev/iz
+@dirrm %%DATADIR%%/dev
+@dirrm %%DATADIR%%/examples
+@dirrm %%DATADIR%%/hook-scripts/mailer/tests
+@dirrm %%DATADIR%%/hook-scripts/mailer
+@dirrm %%DATADIR%%/hook-scripts
+@dirrm %%DATADIR%%/po
+@dirrm %%DATADIR%%/test-scripts/svntest
+@dirrm %%DATADIR%%/test-scripts
+@dirrm %%DATADIR%%/xslt
+@dirrm %%DATADIR%%
Index: files/patch-ac-helpers::ltmain.sh
===================================================================
RCS file: /var/fcvs/ports/devel/subversion/files/patch-ac-helpers::ltmain.sh,v
retrieving revision 1.3
diff -u -u -r1.3 patch-ac-helpers::ltmain.sh
--- files/patch-ac-helpers::ltmain.sh 5 Nov 2004 15:42:05 -0000 1.3
+++ files/patch-ac-helpers::ltmain.sh 22 Dec 2004 23:43:23 -0000
@@ -1,3 +1,5 @@
+$FreeBSD$
+
--- ac-helpers/ltmain.sh.orig 2004-10-22 22:13:13.000000000 +0400
+++ ac-helpers/ltmain.sh 2004-11-05 11:30:39.328125000 +0300
@@ -1061,7 +1061,7 @@
Index: files/patch-doc::book::Makefile
===================================================================
RCS file: files/patch-doc::book::Makefile
diff -N files/patch-doc::book::Makefile
--- files/patch-doc::book::Makefile 5 Nov 2004 15:42:05 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,31 +0,0 @@
---- doc/book/Makefile.orig 2004-09-14 06:50:26.000000000 +0400
-+++ doc/book/Makefile 2004-11-05 11:33:23.265625000 +0300
-@@ -1,5 +1,5 @@
- XSLTPROC = xsltproc
--INSTALL_DIR = $(DESTDIR)/usr/share/doc/subversion
-+#INSTALL_DIR = $(DESTDIR)/usr/share/doc/subversion
- INSTALL = install
-
- ## You shouldn't normally need to edit anything below here.
-@@ -118,7 +118,7 @@
- $(BOOK_INSTALL_DIR):
- $(INSTALL) -d $(BOOK_INSTALL_DIR)
-
--install-book-html: $(BOOK_HTML_TARGET)
-+install-book-html:
- $(INSTALL) -d $(BOOK_INSTALL_DIR)/images
- $(INSTALL) $(BOOK_HTML_TARGET) $(BOOK_INSTALL_DIR)
- $(INSTALL) $(BOOK_DIR)/styles.css $(BOOK_INSTALL_DIR)
-@@ -130,10 +130,10 @@
- $(INSTALL) $(BOOK_DIR)/styles.css $(BOOK_INSTALL_DIR)
- $(INSTALL) $(BOOK_IMAGES) $(BOOK_INSTALL_DIR)/images
-
--install-book-pdf: $(BOOK_PDF_TARGET) $(BOOK_INSTALL_DIR)
-+install-book-pdf:
- $(INSTALL) $(BOOK_PDF_TARGET) $(BOOK_INSTALL_DIR)
-
--install-book-ps: $(BOOK_PS_TARGET) $(BOOK_INSTALL_DIR)
-+install-book-ps:
- $(INSTALL) $(BOOK_PS_TARGET) $(BOOK_INSTALL_DIR)
-
- book-clean:
Index: files/patch-subversion::bindings::swig::perl::natives::Base.pm
===================================================================
RCS file: /var/fcvs/ports/devel/subversion/files/patch-subversion::bindings::swig::perl::natives::Base.pm,v
retrieving revision 1.1
diff -u -u -r1.1 patch-subversion::bindings::swig::perl::natives::Base.pm
--- files/patch-subversion::bindings::swig::perl::natives::Base.pm 5 Nov 2004 15:42:05 -0000 1.1
+++ files/patch-subversion::bindings::swig::perl::natives::Base.pm 22 Dec 2004 23:43:29 -0000
@@ -1,3 +1,5 @@
+$FreeBSD$
+
--- subversion/bindings/swig/perl/native/Base.pm.orig 2004-10-20 10:46:59.000000000 +0400
+++ subversion/bindings/swig/perl/native/Base.pm 2004-11-05 11:43:35.578125000 +0300
@@ -60,6 +60,7 @@
Index: files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in
===================================================================
RCS file: /var/fcvs/ports/devel/subversion/files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in,v
retrieving revision 1.1
diff -u -u -r1.1 patch-subversion::bindings::swig::perl::natives::Makefle.PL.in
--- files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in 5 Nov 2004 15:42:05 -0000 1.1
+++ files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in 22 Dec 2004 23:43:31 -0000
@@ -1,3 +1,5 @@
+$FreeBSD$
+
--- subversion/bindings/swig/perl/native/Makefile.PL.in.orig 2004-09-14 20:32:08.000000000 +0400
+++ subversion/bindings/swig/perl/native/Makefile.PL.in 2004-11-05 11:51:01.000000000 +0300
@@ -1,4 +1,5 @@
Index: files/svnserve.wrapper
===================================================================
RCS file: /var/fcvs/ports/devel/subversion/files/svnserve.wrapper,v
retrieving revision 1.1
diff -u -u -r1.1 svnserve.wrapper
--- files/svnserve.wrapper 9 Oct 2003 12:50:16 -0000 1.1
+++ files/svnserve.wrapper 22 Dec 2004 23:43:11 -0000
@@ -1,4 +1,6 @@
#!/bin/sh
+#
+# $FreeBSD$
SVNSERVE=$(dirname $(realpath $0))/svnserve.bin
--- subversion-1.1.1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200412230023.iBN0NJ0S013146>