Attachment #47759 for bug #73135

View | Details | Raw Unified | Return to bug 73135
Collapse All | Expand All

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	MD5 (subversion-1.0.8.tar.bz2) = b2378b7d9d00653249877531a61ef1db	1	MD5 (subversion-1.1.1.tar.bz2) = a180c3fe91680389c210c99def54d9e0
2	SIZE (subversion-1.0.8.tar.bz2) = 5978990	2	SIZE (subversion-1.1.1.tar.bz2) = 6768086

Line 0 Link Here

(-)files/patch-subversion::bindings::swig::perl::native::Makefile.PL.in (+11 lines)
	1	--- subversion/bindings/swig/perl/native/Makefile.PL.in.orig Tue Sep 14 09:32:08 2004
	2	+++ subversion/bindings/swig/perl/native/Makefile.PL.in Thu Sep 30 07:11:47 2004
	3	@@ -41,7 +41,7 @@
	4
	5	my %config = (
	6	ABSTRACT => 'Perl bindings for Subversion',
	7	- INC => join(' ',$apr_cflags, $apu_cflags,
	8	+ INC => join(' ', $ENV{'CCFLAGS'} \|\| '', $apr_cflags, $apu_cflags,
	9	" -I$swig_srcdir/perl/libsvn_swig_perl",
	10	" -I$svnlib_srcdir/include",
	11	" -I$swig_srcdir -g"),




--- build-outputs.mk.orig	Wed Sep 29 14:23:34 2004
+++ build-outputs.mk	Thu Sep 30 09:41:25 2004
@@ -500,7 +500,7 @@
 	cd subversion/svnadmin ; $(INSTALL_BIN) svnadmin$(EXEEXT) $(DESTDIR)$(bindir)/svnadmin$(EXEEXT)
 	cd subversion/svndumpfilter ; $(INSTALL_BIN) svndumpfilter$(EXEEXT) $(DESTDIR)$(bindir)/svndumpfilter$(EXEEXT)
 	cd subversion/svnlook ; $(INSTALL_BIN) svnlook$(EXEEXT) $(DESTDIR)$(bindir)/svnlook$(EXEEXT)
-	cd subversion/svnserve ; $(INSTALL_BIN) svnserve$(EXEEXT) $(DESTDIR)$(bindir)/svnserve$(EXEEXT)
+	cd subversion/svnserve ; $(INSTALL_BIN) svnserve$(EXEEXT) $(DESTDIR)$(bindir)/svnserve.bin$(EXEEXT)
 	cd subversion/svnversion ; $(INSTALL_BIN) svnversion$(EXEEXT) $(DESTDIR)$(bindir)/svnversion$(EXEEXT)
 
 install-contrib: contrib/client-side/svn-push/svn-push$(EXEEXT) install-lib install-fsmod-lib
 	$(MKDIR) $(DESTDIR)$(fs_libdir)

Lines 1-11 Link Here

(-)files/patch-subversion::bindings::swig::perl::Makefile.PL (-11 lines)
1	--- subversion/bindings/swig/perl/Makefile.PL.orig Sat Jan 24 20:46:46 2004
2	+++ subversion/bindings/swig/perl/Makefile.PL Sat Jan 31 21:40:23 2004
3	@@ -41,7 +41,7 @@
4
5	my %config = (
6	ABSTRACT => 'Perl bindings for Subversion',
7	- CCFLAGS => join(' ', $apr_cflags, $apu_cflags,
8	+ CCFLAGS => join(' ', $ENV{'CCFLAGS'} \|\| '', $apr_cflags, $apu_cflags,
9	`$perl_path -MExtUtils::Embed -e ccopts`,
10	' -I.. -I../../../include -g'),
11	OBJECT => q/$(O_FILES)/,




--- subversion/bindings/swig/perl/Base.pm  (revision 10173)
+++ subversion/bindings/swig/perl/Base.pm  (revision 10174)
@@ -60,6 +60,7 @@ sub import {
 package SVN::_$pkg;
 require DynaLoader;
 bootstrap SVN::_$pkg;
+sub dl_load_flags { 0x01 }
 1;
     ' or die $@;
     };
--- subversion/bindings/swig/perl/Makefile.PL  (revision 10173)
+++ subversion/bindings/swig/perl/Makefile.PL  (revision 10174)
@@ -1,4 +1,5 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -w
+use strict;
 use ExtUtils::MakeMaker;
 use Cwd 'abs_path';
 use Config;
@@ -8,6 +9,12 @@ if ($^O ne 'VMS') {
   $perl_path .= $Config{_exe} unless $perl_path =~ m/$Config{_exe}$/i;
 }
 
+my $top_builddir = '../../../..';
+my $top_srcdir = '@top_srcdir@';
+my $svnlib_srcdir = "${top_srcdir}/subversion";
+my $swig_srcdir = "${svnlib_srcdir}/bindings/swig";
+
+
 my $swig_version;
 open TOPMAKE, "<../../../../Makefile";
 while (<TOPMAKE>) {
@@ -50,8 +57,7 @@ my %config = (
     OBJECT => q/$(O_FILES)/,
     LIBS => [join(' ', $apr_ldflags,
                   (map {$_ = abs_path($_); "-L$_"} @ldpaths),
-                  @ldmodules, '-lsvn_swig_perl-1',
-                  `swig -perl -ldflags`)],
+                  @ldmodules)],
 );
 
 sub perlish {
@@ -64,6 +70,7 @@ WriteMakefile(%config, NAME => 'SVN::_Co
 	      PM => {map { ("$_.pm" => "\$(INST_LIBDIR)/$_.pm") }
 		     map { perlish $_ }
 		     ('base', 'core', @modules)},
+              LDFROM => '$(O_FILES) '."../.libs/libsvn_swig_perl-1.a",
 	      clean => { FILES => "*.hi *.c *.bs".
                          join(' Makefile.','',@modules) }
 	     );
@@ -84,15 +91,19 @@ sub MY::postamble {
    my $module_c_files = join (' ',map { "svn_$_.c"} @modules);
    my $module_make_commands = join ('',map {"\tmake -f Makefile.$_\n"} @modules);
 
-   my $flags;
+   my ($flags, $flags_runtime);
    if ($swig_version >= 103020) {
      $flags = '-noruntime -noproxy';
+     $flags_runtime = '-runtime -noproxy';
    } else {
+     # XXX: prehaps deprecated
      $flags = '-c';
    }
    
-   my $swig_command = "swig $flags -nopm -perl " .
-                      "-I.. -I../../../include $apr_cflags";
+   my ($swig_command, $swig_command_runtime) =
+       map {"swig $_ -nopm -perl " .
+            "-I.. -I../../../include $apr_cflags" }
+	   ($flags, $flags_runtime);
 
    my $swig_modules_command = join ('',
                                     map {"\nsvn_$_.c : ../svn_$_.i ".
@@ -127,7 +138,7 @@ modules :: $module_c_files
 $module_make_commands\t\$(NOECHO) \$(TOUCH) \$\@
 
 core.c :: ../core.i
-\t$swig_command -module SVN::_Core -o core.c ../core.i
+\t$swig_command_runtime -module SVN::_Core -o core.c ../core.i
 
 $swig_modules_command
 

Lines 52-57 Link Here

(-)pkg-plist (-2 / +14 lines)
52	lib/libsvn_fs-1.a	52	lib/libsvn_fs-1.a
53	lib/libsvn_fs-1.so	53	lib/libsvn_fs-1.so
54	lib/libsvn_fs-1.so.0	54	lib/libsvn_fs-1.so.0
		55	lib/libsvn_fs_base-1.a
		56	lib/libsvn_fs_base-1.so
		57	lib/libsvn_fs_base-1.so.0
		58	lib/libsvn_fs_fs-1.a
		59	lib/libsvn_fs_fs-1.so
		60	lib/libsvn_fs_fs-1.so.0
55	lib/libsvn_ra-1.a	61	lib/libsvn_ra-1.a
56	lib/libsvn_ra-1.so	62	lib/libsvn_ra-1.so
57	lib/libsvn_ra-1.so.0	63	lib/libsvn_ra-1.so.0
Lines 73-81 Link Here
73	lib/libsvn_wc-1.a	79	lib/libsvn_wc-1.a
74	lib/libsvn_wc-1.so	80	lib/libsvn_wc-1.so
75	lib/libsvn_wc-1.so.0	81	lib/libsvn_wc-1.so.0
76	%%MOD_DAV_SVN%%libexec/apache2/mod_dav_svn.a	82	share/locale/de/LC_MESSAGES/subversion.mo
		83	share/locale/es/LC_MESSAGES/subversion.mo
		84	share/locale/ja/LC_MESSAGES/subversion.mo
		85	share/locale/nb/LC_MESSAGES/subversion.mo
		86	share/locale/pl/LC_MESSAGES/subversion.mo
		87	share/locale/pt_BR/LC_MESSAGES/subversion.mo
		88	share/locale/sv/LC_MESSAGES/subversion.mo
		89	share/locale/zh_TW/LC_MESSAGES/subversion.mo
77	%%MOD_DAV_SVN%%libexec/apache2/mod_dav_svn.so	90	%%MOD_DAV_SVN%%libexec/apache2/mod_dav_svn.so
78	%%MOD_DAV_SVN%%libexec/apache2/mod_authz_svn.a
79	%%MOD_DAV_SVN%%libexec/apache2/mod_authz_svn.so	91	%%MOD_DAV_SVN%%libexec/apache2/mod_authz_svn.so
80	%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/apache2 -a -n dav libexec/apache2/mod_dav.so	92	%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/apache2 -a -n dav libexec/apache2/mod_dav.so
81	%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/apache2 -a -n dav_svn libexec/apache2/mod_dav_svn.so	93	%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/apache2 -a -n dav_svn libexec/apache2/mod_dav_svn.so




# $FreeBSD: ports/devel/subversion/Makefile,v 1.70 2004/10/15 21:41:09 pav Exp $

PORTNAME=	subversion
PORTVERSION=	1.1.1
CATEGORIES=	devel
MASTER_SITES=	http://subversion.tigris.org/tarballs/


CONFIGURE_ARGS+=--with-apr=${LOCALBASE}/lib/apache2/apr-config \
		--with-apr-util=${LOCALBASE}/lib/apache2/apu-config
APR_APU_DIR=	${LOCALBASE}/lib/apache2
APR_CONFIG=	apr-config
APR_PORT=	www/apache2
OPT_NAME=	WITH_BERKELEYDB=(db4|db41|db42)
.else

CONFIGURE_ARGS+=--with-apr=${LOCALBASE} \
		--with-apr-util=${LOCALBASE}
APR_APU_DIR=	${LOCALBASE}/bin
APR_CONFIG=	apr-1-config
APR_PORT=	devel/apr
OPT_NAME=	APR_UTIL_WITH_BERKELEY_DB=yes
.endif

	@${REINPLACE_CMD} "s#^LIBTOOL =.*#LIBTOOL = ${LIBTOOL}#" ${WRKSRC}/Makefile.in

pre-configure:
	@if [ ! -x ${APR_APU_DIR}/${APR_CONFIG} -o ! -x ${APR_APU_DIR}/${APR_CONFIG} ] ; then \
		${ECHO_MSG} "" ; \
		${ECHO_MSG} 'You selected to use `'"${APR_PORT}' for apr library." ; \
		${ECHO_MSG} 'It seems that `'"${APR_PORT}' is not properly installed." ; \
		${ECHO_MSG} "" ; \
		${FALSE} ; \
	fi
	@if [ `${APR_APU_DIR}/${APR_CONFIG} --db-version` != "4" ] ; then \
		${ECHO_MSG} "" ; \
 		${ECHO_MSG} 'You should build `'"${APR_PORT}' with db4 support to use subversion with it." ; \
 		${ECHO_MSG} 'Please rebuild `'"${APR_PORT}' with option "'`'"${OPT_NAME}' and try again." ; \
		${ECHO_MSG} "" ; \
		${FALSE} ; \
	fi

Return to bug 73135

Lines 1-11 Link Here

(-)files/build-outputs.mk.patch (-10 / +10 lines)
1	--- build-outputs.mk.orig Wed Oct 8 16:01:40 2003	1	--- build-outputs.mk.orig Wed Sep 29 14:23:34 2004
2	+++ build-outputs.mk Wed Oct 8 16:02:00 2003	2	+++ build-outputs.mk Thu Sep 30 09:41:25 2004
3	@@ -447,7 +447,7 @@	3	@@ -500,7 +500,7 @@
4	cd subversion/svnadmin ; $(INSTALL_FS_BIN) svnadmin$(EXEEXT) $(DESTDIR)$(fs_bindir)/svnadmin$(EXEEXT)	4	cd subversion/svnadmin ; $(INSTALL_BIN) svnadmin$(EXEEXT) $(DESTDIR)$(bindir)/svnadmin$(EXEEXT)
5	cd subversion/svndumpfilter ; $(INSTALL_FS_BIN) svndumpfilter$(EXEEXT) $(DESTDIR)$(fs_bindir)/svndumpfilter$(EXEEXT)	5	cd subversion/svndumpfilter ; $(INSTALL_BIN) svndumpfilter$(EXEEXT) $(DESTDIR)$(bindir)/svndumpfilter$(EXEEXT)
6	cd subversion/svnlook ; $(INSTALL_FS_BIN) svnlook$(EXEEXT) $(DESTDIR)$(fs_bindir)/svnlook$(EXEEXT)	6	cd subversion/svnlook ; $(INSTALL_BIN) svnlook$(EXEEXT) $(DESTDIR)$(bindir)/svnlook$(EXEEXT)
7	- cd subversion/svnserve ; $(INSTALL_FS_BIN) svnserve$(EXEEXT) $(DESTDIR)$(fs_bindir)/svnserve$(EXEEXT)	7	- cd subversion/svnserve ; $(INSTALL_BIN) svnserve$(EXEEXT) $(DESTDIR)$(bindir)/svnserve$(EXEEXT)
8	+ cd subversion/svnserve ; $(INSTALL_FS_BIN) svnserve$(EXEEXT) $(DESTDIR)$(fs_bindir)/svnserve.bin$(EXEEXT)	8	+ cd subversion/svnserve ; $(INSTALL_BIN) svnserve$(EXEEXT) $(DESTDIR)$(bindir)/svnserve.bin$(EXEEXT)
		9	cd subversion/svnversion ; $(INSTALL_BIN) svnversion$(EXEEXT) $(DESTDIR)$(bindir)/svnversion$(EXEEXT)
9		10
10	install-fs-lib: subversion/libsvn_fs/libsvn_fs-1.la subversion/libsvn_repos/libsvn_repos-1.la subversion/libsvn_ra_local/libsvn_ra_local-1.la	11	install-contrib: contrib/client-side/svn-push/svn-push$(EXEEXT) install-lib install-fsmod-lib
11	$(MKDIR) $(DESTDIR)$(fs_libdir)

Lines 1-82 Link Here

(-)files/patch-svnperl-noruntime (-82 lines)
1	--- subversion/bindings/swig/perl/Base.pm (revision 10173)
2	+++ subversion/bindings/swig/perl/Base.pm (revision 10174)
3	@@ -60,6 +60,7 @@ sub import {
4	package SVN::_$pkg;
5	require DynaLoader;
6	bootstrap SVN::_$pkg;
7	+sub dl_load_flags { 0x01 }
8	1;
9	' or die $@;
10	};
11	--- subversion/bindings/swig/perl/Makefile.PL (revision 10173)
12	+++ subversion/bindings/swig/perl/Makefile.PL (revision 10174)
13	@@ -1,4 +1,5 @@
14	-#!/usr/bin/perl
15	+#!/usr/bin/perl -w
16	+use strict;
17	use ExtUtils::MakeMaker;
18	use Cwd 'abs_path';
19	use Config;
20	@@ -8,6 +9,12 @@ if ($^O ne 'VMS') {
21	$perl_path .= $Config{_exe} unless $perl_path =~ m/$Config{_exe}$/i;
22	}
23
24	+my $top_builddir = '../../../..';
25	+my $top_srcdir = '@top_srcdir@';
26	+my $svnlib_srcdir = "${top_srcdir}/subversion";
27	+my $swig_srcdir = "${svnlib_srcdir}/bindings/swig";
28	+
29	+
30	my $swig_version;
31	open TOPMAKE, "<../../../../Makefile";
32	while (<TOPMAKE>) {
33	@@ -50,8 +57,7 @@ my %config = (
34	OBJECT => q/$(O_FILES)/,
35	LIBS => [join(' ', $apr_ldflags,
36	(map {$_ = abs_path($_); "-L$_"} @ldpaths),
37	- @ldmodules, '-lsvn_swig_perl-1',
38	- `swig -perl -ldflags`)],
39	+ @ldmodules)],
40	);
41
42	sub perlish {
43	@@ -64,6 +70,7 @@ WriteMakefile(%config, NAME => 'SVN::_Co
44	PM => {map { ("$_.pm" => "\$(INST_LIBDIR)/$_.pm") }
45	map { perlish $_ }
46	('base', 'core', @modules)},
47	+ LDFROM => '$(O_FILES) '."../.libs/libsvn_swig_perl-1.a",
48	clean => { FILES => ".hi .c *.bs".
49	join(' Makefile.','',@modules) }
50	);
51	@@ -84,15 +91,19 @@ sub MY::postamble {
52	my $module_c_files = join (' ',map { "svn_$_.c"} @modules);
53	my $module_make_commands = join ('',map {"\tmake -f Makefile.$_\n"} @modules);
54
55	- my $flags;
56	+ my ($flags, $flags_runtime);
57	if ($swig_version >= 103020) {
58	$flags = '-noruntime -noproxy';
59	+ $flags_runtime = '-runtime -noproxy';
60	} else {
61	+ # XXX: prehaps deprecated
62	$flags = '-c';
63	}
64
65	- my $swig_command = "swig $flags -nopm -perl " .
66	- "-I.. -I../../../include $apr_cflags";
67	+ my ($swig_command, $swig_command_runtime) =
68	+ map {"swig $_ -nopm -perl " .
69	+ "-I.. -I../../../include $apr_cflags" }
70	+ ($flags, $flags_runtime);
71
72	my $swig_modules_command = join ('',
73	map {"\nsvn_$_.c : ../svn_$_.i ".
74	@@ -127,7 +138,7 @@ modules :: $module_c_files
75	$module_make_commands\t\$(NOECHO) \$(TOUCH) \$\@
76
77	core.c :: ../core.i
78	-\t$swig_command -module SVN::_Core -o core.c ../core.i
79	+\t$swig_command_runtime -module SVN::_Core -o core.c ../core.i
80
81	$swig_modules_command
82

Lines 5-11 Link Here

(-)Makefile (-5 / +7 lines)
5	# $FreeBSD: ports/devel/subversion/Makefile,v 1.70 2004/10/15 21:41:09 pav Exp $	5	# $FreeBSD: ports/devel/subversion/Makefile,v 1.70 2004/10/15 21:41:09 pav Exp $
6		6
7	PORTNAME= subversion	7	PORTNAME= subversion
8	PORTVERSION= 1.0.8	8	PORTVERSION= 1.1.1
9	CATEGORIES= devel	9	CATEGORIES= devel
10	MASTER_SITES= http://subversion.tigris.org/tarballs/	10	MASTER_SITES= http://subversion.tigris.org/tarballs/
11		11
Lines 108-113 Link Here
108	CONFIGURE_ARGS+=--with-apr=${LOCALBASE}/lib/apache2/apr-config \	108	CONFIGURE_ARGS+=--with-apr=${LOCALBASE}/lib/apache2/apr-config \
109	--with-apr-util=${LOCALBASE}/lib/apache2/apu-config	109	--with-apr-util=${LOCALBASE}/lib/apache2/apu-config
110	APR_APU_DIR= ${LOCALBASE}/lib/apache2	110	APR_APU_DIR= ${LOCALBASE}/lib/apache2
		111	APR_CONFIG= apr-config
111	APR_PORT= www/apache2	112	APR_PORT= www/apache2
112	OPT_NAME= WITH_BERKELEYDB=(db4\|db41\|db42)	113	OPT_NAME= WITH_BERKELEYDB=(db4\|db41\|db42)
113	.else	114	.else
Lines 115-120 Link Here
115	CONFIGURE_ARGS+=--with-apr=${LOCALBASE} \	116	CONFIGURE_ARGS+=--with-apr=${LOCALBASE} \
116	--with-apr-util=${LOCALBASE}	117	--with-apr-util=${LOCALBASE}
117	APR_APU_DIR= ${LOCALBASE}/bin	118	APR_APU_DIR= ${LOCALBASE}/bin
		119	APR_CONFIG= apr-1-config
118	APR_PORT= devel/apr	120	APR_PORT= devel/apr
119	OPT_NAME= APR_UTIL_WITH_BERKELEY_DB=yes	121	OPT_NAME= APR_UTIL_WITH_BERKELEY_DB=yes
120	.endif	122	.endif
Lines 225-241 Link Here
225	@${REINPLACE_CMD} "s#^LIBTOOL =.*#LIBTOOL = ${LIBTOOL}#" ${WRKSRC}/Makefile.in	227	@${REINPLACE_CMD} "s#^LIBTOOL =.*#LIBTOOL = ${LIBTOOL}#" ${WRKSRC}/Makefile.in
226		228
227	pre-configure:	229	pre-configure:
228	@if [ ! -x ${APR_APU_DIR}/apr-config -o ! -x ${APR_APU_DIR}/apu-config ] ; then \	230	@if [ ! -x ${APR_APU_DIR}/${APR_CONFIG} -o ! -x ${APR_APU_DIR}/${APR_CONFIG} ] ; then \
229	${ECHO_MSG} "" ; \	231	${ECHO_MSG} "" ; \
230	${ECHO_MSG} 'You select to use`'"${APR_PORT}' for apr library." ; \	232	${ECHO_MSG} 'You selected to use `'"${APR_PORT}' for apr library." ; \
231	${ECHO_MSG} 'It seems that `'"${APR_PORT}' is not properly installed." ; \	233	${ECHO_MSG} 'It seems that `'"${APR_PORT}' is not properly installed." ; \
232	${ECHO_MSG} "" ; \	234	${ECHO_MSG} "" ; \
233	${FALSE} ; \	235	${FALSE} ; \
234	fi	236	fi
235	@if [ `${APR_APU_DIR}/apu-config --db-version` != "4" ] ; then \	237	@if [ `${APR_APU_DIR}/${APR_CONFIG} --db-version` != "4" ] ; then \
236	${ECHO_MSG} "" ; \	238	${ECHO_MSG} "" ; \
237	${ECHO_MSG} 'You should build `'"${APR_PORT}' with db4 support to use subversion with it." ; \	239	${ECHO_MSG} 'You should build `'"${APR_PORT}' with db4 support to use subversion with it." ; \
238	${ECHO_MSG} 'Please, rebuild `'"${APR_PORT}' with option "'`'"${OPT_NAME}' and try again." ; \	240	${ECHO_MSG} 'Please rebuild `'"${APR_PORT}' with option "'`'"${OPT_NAME}' and try again." ; \
239	${ECHO_MSG} "" ; \	241	${ECHO_MSG} "" ; \
240	${FALSE} ; \	242	${FALSE} ; \
241	fi	243	fi