(1) Update to 1.7.4.

(2) Remove all run-time dependencies for static build. (3) Check for incompatible options, like static and KDE Wallet. (4) Move FreeBSD extended API to private include file. (5) Fix build of mod_dontdothat. PR: [2] ports/166187, [5] ports/165390, [4] ports/165311. Feature safe: yes
svn path=/head/; revision=294088
2025-01-09 06:51:44 +00:00 · 2012-04-01 18:45:05 +00:00 · 2012-04-01 18:45:05 +00:00 · 387a3d4fe2 · 2021-03-31 03:12:20 +00:00
commit 387a3d4fe2
parent d43ec355dd
6 changed files with 120 additions and 69 deletions
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@ -43,6 +43,8 @@ SVNFSTYPE?=	fsfs

 SUB_FILES=	pkg-install \
 		pkg-deinstall
+		
+BOOK_VERSION=	4259

 .if make(repository)
 WITH_REPOSITORY_CREATION=	yes
@ -73,8 +75,8 @@ SUB_LIST+=	SVNSERVE_BIN_EXT=""
 .endif

 .if !defined(NOPORTDOCS) && defined(WITH_BOOK)
-BOOK_HTML=	svn-book-html.tar.bz2
-BOOK_PDF=	svn-book.pdf
+BOOK_HTML=	svn-book-html-r${BOOK_VERSION}.tar.bz2
+BOOK_PDF=	svn-book-r${BOOK_VERSION}.pdf.bz2
 DISTFILES+=	${BOOK_HTML}:book ${BOOK_PDF}:book
 PLIST_SUB+=	BOOK=""
 .else
@ -92,6 +94,14 @@ SCRIPTS=

 SCRIPTS_DATA=

+.ifdef (WITH_STATIC)
+USE_GETTEXT=		build
+BDB_BUILD_DEPENDS=	yes
+OLD_LIB_DEPENDS:=	${LIB_DEPENDS:S!^!${LOCALBASE}/lib/lib!:C!(\.[0-9]+)?:!.a:!}
+BUILD_DEPENDS+=		${OLD_LIB_DEPENDS}
+LIB_DEPENDS=
+.endif
+
 pre-everything::
 	@${ECHO_MSG} ""
 .if defined(WITH_NEON)
@ -111,12 +121,6 @@ pre-everything::
 	@${ECHO_MSG} ""
 .endif
 .if defined(WITH_MOD_DAV_SVN)
-.if defined(WITH_STATIC)
-	@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	@${ECHO_MSG} "!!! mod_dav_svn and static build are not compatible !!!"
-	@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	@${FALSE}
-.endif
 	@${ECHO_MSG} "mod_dav_svn module for Apache 2.X enabled."
 .else
 	@${ECHO_MSG} "You can enable the mod_dav_svn module for Apache 2.X"
@ -133,12 +137,6 @@ pre-everything::
 	@${ECHO_MSG} ""
 .endif
 .if defined(WITH_SVNAUTHZ_VALIDATE)
-.if defined(WITH_STATIC)
-	@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	@${ECHO_MSG} "!!! svnauthz-validate and static build are not compatible !!!"
-	@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	@${FALSE}
-.endif
 	@${ECHO_MSG} "svnauthz-validate enabled."
 	@${ECHO_MSG} ""
 .endif
@ -169,6 +167,30 @@ pre-everything::
 #	@${ECHO_MSG} ""
 #.endif
 .if defined(WITH_STATIC)
+.if defined(WITH_MOD_DAV_SVN)
+	@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+	@${ECHO_MSG} "!!! mod_dav_svn and static build are not compatible !!!"
+	@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+	@${FALSE}
+.endif
+.if defined(WITH_SVNAUTHZ_VALIDATE)
+	@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+	@${ECHO_MSG} "!!! svnauthz_validate and static build are not compatible !!!"
+	@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+	@${FALSE}
+.endif
+.if defined(WITH_GNOME_KEYRING)
+	@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+	@${ECHO_MSG} "!!! Gnome Keyring and static build are not compatible !!!"
+	@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+	@${FALSE}
+.endif
+.if defined(WITH_KDE_WALLET)
+	@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+	@${ECHO_MSG} "!!! KDE Wallet and static build are not compatible !!!"
+	@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+	@${FALSE}
+.endif
 	@${ECHO_MSG} "Static binaries will be built."
 .endif
 	@${ECHO_MSG} "Many useful scripts will be installed into ${DATADIR}"
--- a/devel/subversion/Makefile.common
+++ b/devel/subversion/Makefile.common
@ -5,14 +5,15 @@
 # $FreeBSD$

 PORTNAME=	subversion
-PORTVERSION=	1.7.3
+PORTVERSION=	1.7.4
 PORTREVISION?=	0
 CATEGORIES+=	devel
-MASTER_SITES=	${MASTER_SITE_APACHE}:main \
-		http://svnbook.red-bean.com/en/1.7/:book
+MASTER_SITES=	${MASTER_SITE_APACHE:S/$/:main/} \
+		${MASTER_SITE_LOCAL:S/$/:book/}
 DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}:main
 DIST_SUBDIR=	subversion17
-MASTER_SITE_SUBDIR=subversion/:main
+MASTER_SITE_SUBDIR=	subversion/:main \
+			lev/:book

 MAKE_JOBS_SAFE=	yes
 USE_BZIP2=	yes
@ -74,11 +75,11 @@ PLIST_SUB+=	MOD_DAV_SVN=""
 SUB_LIST+=	MOD_DAV_SVN_INSTALL="YES"
 SVNGROUP?=	www
 SVNUSER?=	www
-#.if defined(WITH_MOD_DONTDOTHAT)
-#PLIST_SUB+=	MOD_DONTDOTHAT=""
-#.else
+.if defined(WITH_MOD_DONTDOTHAT)
+PLIST_SUB+=	MOD_DONTDOTHAT=""
+.else
 PLIST_SUB+=	MOD_DONTDOTHAT="@comment "
-#.endif
+.endif
 .else
 CONFIGURE_ARGS+=--with-apxs=no
 PLIST_SUB+=	MOD_DAV_SVN="@comment "
@ -171,6 +172,16 @@ PLIST_SUB+=	KDE_KWALLET="@comment "

 .include <bsd.port.pre.mk>

+pre-everything::
+.if defined(SVN_BUILD_BINDINGS)
+.if defined(WITH_STATIC)
+	@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+	@${ECHO_MSG} "!!! bindings and static build are not compatible !!!"
+	@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+	@${FALSE}
+.endif
+.endif
+
 post-patch:
 .if ${PREFIX} != "/usr"
 	@${REINPLACE_CMD} "s#/etc/subversion#${ETCDIR}#g" ${WRKSRC}/subversion/libsvn_subr/config_file.c
--- a/devel/subversion/distinfo
+++ b/devel/subversion/distinfo
@ -1,6 +1,6 @@
-SHA256 (subversion17/subversion-1.7.3.tar.bz2) = f68ac8f96047a2d7775085d8c9795457feb24dafa21ac1fdeafa3b39d112fd0e
-SIZE (subversion17/subversion-1.7.3.tar.bz2) = 5956842
-SHA256 (subversion17/svn-book-html.tar.bz2) = 2bd4e5553b941bcf77761b09e9ce37bdc439a76e2c47200b3d0b2fdd295e9d9c
-SIZE (subversion17/svn-book-html.tar.bz2) = 467682
-SHA256 (subversion17/svn-book.pdf) = 6ee0f610c6a0df4b081c2a42a56768626fb0771f5e4f49f537560e7d6a60cba6
-SIZE (subversion17/svn-book.pdf) = 1921989
+SHA256 (subversion17/subversion-1.7.4.tar.bz2) = c4c736f5d94a93b5862d1d2452353146c8aeaae33ccec67649bba91f91ad506f
+SIZE (subversion17/subversion-1.7.4.tar.bz2) = 5978020
+SHA256 (subversion17/svn-book-html-r4259.tar.bz2) = f02b64ad255b507325a960586225d721e086ec6f2a1843214202814e7fee3ac3
+SIZE (subversion17/svn-book-html-r4259.tar.bz2) = 467637
+SHA256 (subversion17/svn-book-r4259.pdf.bz2) = 784ea29e47202a78edf038545fee3319da701a61c467b8efa59be39362662ff5
+SIZE (subversion17/svn-book-r4259.pdf.bz2) = 1202957
--- a/devel/subversion/files/build-outputs.mk
+++ b/devel/subversion/files/build-outputs.mk
--- a/devel/subversion/files/extra-patch-enhanced-keyword
+++ b/devel/subversion/files/extra-patch-enhanced-keyword
@ -1,23 +1,22 @@
-diff -ruN subversion/include/svn_subst.h subversion/include/svn_subst.h
--- subversion/include/svn_subst.h	2011-05-12 21:30:02.000000000 +0400
-+++ subversion/include/svn_subst.h	2011-09-07 21:47:19.000000000 +0400
-@@ -127,16 +127,31 @@
-  * Set @a *kw to a new keywords hash filled with the appropriate contents
-  * given a @a keywords_string (the contents of the svn:keywords
-  * property for the file in question), the revision @a rev, the @a url,
- * the @a date the file was committed on, and the @a author of the last
- * commit.  Any of these can be @c NULL to indicate that the information is
- * not present, or @c 0 for @a date.
+diff -ruN subversion/include/private/svn_string_private.h subversion/include/private/svn_string_private.h
+--- subversion/include/private/svn_string_private.h	2012-02-24 11:21:04.000000000 +0400
+++ subversion/include/private/svn_string_private.h	2012-04-01 22:27:28.000000000 +0400
+@@ -35,6 +35,31 @@
+ #endif /* __cplusplus */
+ 
+ /**
+ * Set @a *kw to a new keywords hash filled with the appropriate contents
+ * given a @a keywords_string (the contents of the svn:keywords
+ * property for the file in question), the revision @a rev, the @a url,
 + * the url of the root of the @a repos, the @a date the file was committed
 + * on, and the @a author of the last commit.  Any of these can be @c NULL
 + * to indicate that the information is not present, or @c 0 for @a date.
-  *
-  * Hash keys are of type <tt>const char *</tt>.
-  * Hash values are of type <tt>svn_string_t *</tt>.
-  *
-  * All memory is allocated out of @a pool.
-  *
- * @since New in 1.3.
+ *
+ * Hash keys are of type <tt>const char *</tt>.
+ * Hash values are of type <tt>svn_string_t *</tt>.
+ *
+ * All memory is allocated out of @a pool.
+ *
 + * @since New in 1.6
 + */
 +svn_error_t *
@ -30,16 +29,13 @@ diff -ruN subversion/include/svn_subst.h subversion/include/svn_subst.h
 +                          const char *author,
 +                          apr_pool_t *pool);
 +
-+/** Similar to svn_subst_build_keywords3() except that it does not
-+ * supply the repository location.
-+ *
-+ * @deprecated Provided for backward compatibility with the 1.3 API.
+/**
+  * @defgroup svn_string String handling
+  * @{
  */
- svn_error_t *
- svn_subst_build_keywords2(apr_hash_t **kw,
 diff -ruN subversion/libsvn_client/cat.c subversion/libsvn_client/cat.c
 --- subversion/libsvn_client/cat.c	2011-08-18 18:05:35.000000000 +0400
-+++ subversion/libsvn_client/cat.c	2011-09-07 21:47:19.000000000 +0400
+++ subversion/libsvn_client/cat.c	2012-04-01 22:24:38.000000000 +0400
@@ -137,12 +137,15 @@
       const char *rev_str;
       const char *author;
@ -98,8 +94,8 @@ diff -ruN subversion/libsvn_client/cat.c subversion/libsvn_client/cat.c
                    cmt_author ? cmt_author->data : NULL,
                    pool));
 diff -ruN subversion/libsvn_client/commit.c subversion/libsvn_client/commit.c
--- subversion/libsvn_client/commit.c	2011-08-17 18:01:10.000000000 +0400
-+++ subversion/libsvn_client/commit.c	2011-09-07 21:47:19.000000000 +0400
+--- subversion/libsvn_client/commit.c	2011-11-28 21:04:12.000000000 +0400
+++ subversion/libsvn_client/commit.c	2012-04-01 22:24:38.000000000 +0400
@@ -126,9 +126,9 @@
     }
 
@ -113,8 +109,8 @@ diff -ruN subversion/libsvn_client/commit.c subversion/libsvn_client/commit.c
     keywords = NULL;
 
 diff -ruN subversion/libsvn_client/export.c subversion/libsvn_client/export.c
--- subversion/libsvn_client/export.c	2011-06-24 12:09:09.000000000 +0400
-+++ subversion/libsvn_client/export.c	2011-09-07 21:47:19.000000000 +0400
+--- subversion/libsvn_client/export.c	2012-02-10 08:00:30.000000000 +0400
+++ subversion/libsvn_client/export.c	2012-04-01 22:24:38.000000000 +0400
@@ -274,6 +274,7 @@
       svn_revnum_t changed_rev;
       const char *suffix;
@ -168,7 +164,7 @@ diff -ruN subversion/libsvn_client/export.c subversion/libsvn_client/export.c
       SVN_ERR(svn_subst_copy_and_translate4(fb->tmppath, fb->path,
 diff -ruN subversion/libsvn_subr/subst.c subversion/libsvn_subr/subst.c
 --- subversion/libsvn_subr/subst.c	2011-07-29 21:28:11.000000000 +0400
-+++ subversion/libsvn_subr/subst.c	2011-09-07 21:47:19.000000000 +0400
+++ subversion/libsvn_subr/subst.c	2012-04-01 22:24:38.000000000 +0400
@@ -135,8 +135,11 @@
  * %b basename of the URL of this file
  * %d short format of date of this revision
@ -344,7 +340,7 @@ diff -ruN subversion/libsvn_subr/subst.c subversion/libsvn_subr/subst.c
                        APR_HASH_KEY_STRING, header_val);
 diff -ruN subversion/libsvn_wc/translate.c subversion/libsvn_wc/translate.c
 --- subversion/libsvn_wc/translate.c	2011-07-07 15:29:08.000000000 +0400
-+++ subversion/libsvn_wc/translate.c	2011-09-07 21:47:19.000000000 +0400
+++ subversion/libsvn_wc/translate.c	2012-04-01 22:24:38.000000000 +0400
@@ -313,10 +313,10 @@
   apr_time_t changed_date;
   const char *changed_author;
--- a/devel/subversion/pkg-plist
+++ b/devel/subversion/pkg-plist
@ -353,6 +353,8 @@ lib/libsvn_wc-1.la
 %%DATADIR%%/po/po-update.sh
 %%DATADIR%%/server-side/mod_dontdothat/README
 %%DATADIR%%/server-side/mod_dontdothat/mod_dontdothat.c
+%%MOD_DONTDOTHAT%%%%DATADIR%%/server-side/mod_dontdothat/mod_dontdothat.la
+%%MOD_DONTDOTHAT%%%%DATADIR%%/server-side/mod_dontdothat/mod_dontdothat.slo
 %%DATADIR%%/server-side/fsfs-reshard.py
 %%DATADIR%%/server-side/svn-backup-dumps.py
 %%DATADIR%%/server-side/svn-populate-node-origins-index