Attachment #47418 for bug #72665

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




# $FreeBSD: ports/devel/subversion/Makefile,v 1.69 2004/09/26 07:36:59 lev Exp $

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



INSTALLS_SHLIB=	yes

USE_SIZE=	yes
USE_BZIP2=	yes
USE_LIBTOOL_VER=15
USE_REINPLACE=	yes

.endif

.if defined(WITH_PYTHON)
USE_PYTHON=		yes
.include "${PORTSDIR}/Mk/bsd.python.mk"
SWIG_BINDINGS+=		python
PLIST_SUB+=		WITH_PYTHON=""

post-build:
.if defined(WITH_PERL)
	cd ${WRKSRC} ; \
	  ${MAKE} swig-pl
	cd ${WRKSRC}/subversion/bindings/swig/perl ; \
	  ${SETENV} APR_CONFIG="${APR_APU_DIR}/apr-config" APU_CONFIG="${APR_APU_DIR}/apu-config" \
	    CCFLAGS="${CCFLAGS}" CC="${CC}" \
	    ${PERL} Makefile.PL PREFIX="${PREFIX}" \
	    INSTALLPRIVLIB="${PREFIX}/lib" INSTALLARCHLIB="${PREFIX}/lib" ; \
	  ${MAKE} all
.endif
.if defined(WITH_PYTHON)
	cd ${WRKSRC} ; \

.endif
.if defined(WITH_PERL)
	cd ${WRKSRC} ; \
	  ${MAKE} install-swig-pl
	cd ${WRKSRC}/subversion/bindings/swig/perl ; \
	  ${MAKE} install
.endif
.if defined(WITH_PYTHON)
	cd ${WRKSRC} ; \

Lines 1-2 Link Here

(-)/home/clsung/ports/devel/subversion/distinfo (-2 / +2 lines)
1	MD5 (subversion-1.0.8.tar.bz2) = b2378b7d9d00653249877531a61ef1db	1	MD5 (subversion-1.1.0.tar.bz2) = a91b0d79b8c8ab8747587037c044c6c9
2	SIZE (subversion-1.0.8.tar.bz2) = 5978990	2	SIZE (subversion-1.1.0.tar.bz2) = 6747545

Lines 1-11 Link Here

(-)/home/clsung/ports/devel/subversion/files/build-outputs.mk.patch (-9 / +1 lines)
1	--- build-outputs.mk.orig Wed Oct 8 16:01:40 2003	1	--- build-outputs.mk.orig Wed Oct 8 16:01:40 2003
2	+++ build-outputs.mk Wed Oct 8 16:02:00 2003	2	+++ build-outputs.mk Wed Oct 8 16:02:00 2003
3	@@ -447,7 +447,7 @@	3	@@ -0,0 +0,0 @@
4	cd subversion/svnadmin ; $(INSTALL_FS_BIN) svnadmin$(EXEEXT) $(DESTDIR)$(fs_bindir)/svnadmin$(EXEEXT)
5	cd subversion/svndumpfilter ; $(INSTALL_FS_BIN) svndumpfilter$(EXEEXT) $(DESTDIR)$(fs_bindir)/svndumpfilter$(EXEEXT)
6	cd subversion/svnlook ; $(INSTALL_FS_BIN) svnlook$(EXEEXT) $(DESTDIR)$(fs_bindir)/svnlook$(EXEEXT)
7	- cd subversion/svnserve ; $(INSTALL_FS_BIN) svnserve$(EXEEXT) $(DESTDIR)$(fs_bindir)/svnserve$(EXEEXT)
8	+ cd subversion/svnserve ; $(INSTALL_FS_BIN) svnserve$(EXEEXT) $(DESTDIR)$(fs_bindir)/svnserve.bin$(EXEEXT)
9
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	$(MKDIR) $(DESTDIR)$(fs_libdir)

Lines 1-11 Link Here

(-)/home/clsung/ports/devel/subversion/files/patch-subversion::bindings::swig::perl::Makefile.PL (-11 / +3 lines)
1	--- subversion/bindings/swig/perl/Makefile.PL.orig Sat Jan 24 20:46:46 2004	1	--- configure.orig Thu Oct 9 09:10:22 2003
2	+++ subversion/bindings/swig/perl/Makefile.PL Sat Jan 31 21:40:23 2004	2	+++ configure Thu Oct 9 09:10:30 2003
3	@@ -41,7 +41,7 @@	3	@@ -0,0 +0,0 @@
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)/,

Line 0 Link Here

(-)/home/clsung/ports/devel/subversion/files/patch-svnperl-memoryleak (+3 lines)
	1	--- configure.orig Thu Oct 9 09:10:22 2003
	2	+++ configure Thu Oct 9 09:10:30 2003
	3	@@ -0,0 +0,0 @@




--- configure.orig	Thu Oct  9 09:10:22 2003
+++ configure	Thu Oct  9 09:10:30 2003
@@ -0,0 +0,0 @@
 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 73-81 Link Here

(-)/home/clsung/ports/devel/subversion/pkg-plist (-2 lines)
73	lib/libsvn_wc-1.a	73	lib/libsvn_wc-1.a
74	lib/libsvn_wc-1.so	74	lib/libsvn_wc-1.so
75	lib/libsvn_wc-1.so.0	75	lib/libsvn_wc-1.so.0
76	%%MOD_DAV_SVN%%libexec/apache2/mod_dav_svn.a
77	%%MOD_DAV_SVN%%libexec/apache2/mod_dav_svn.so	76	%%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	77	%%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	78	%%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	79	%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/apache2 -a -n dav_svn libexec/apache2/mod_dav_svn.so

Return to bug 72665

Lines 5-11 Link Here

(-)/home/clsung/ports/devel/subversion/Makefile (-13 / +3 lines)
5	# $FreeBSD: ports/devel/subversion/Makefile,v 1.69 2004/09/26 07:36:59 lev Exp $	5	# $FreeBSD: ports/devel/subversion/Makefile,v 1.69 2004/09/26 07:36:59 lev Exp $
6		6
7	PORTNAME= subversion	7	PORTNAME= subversion
8	PORTVERSION= 1.0.8	8	PORTVERSION= 1.1.0
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 16-22 Link Here
16		16
17	INSTALLS_SHLIB= yes	17	INSTALLS_SHLIB= yes
18		18
19	USE_SIZE= yes
20	USE_BZIP2= yes	19	USE_BZIP2= yes
21	USE_LIBTOOL_VER=15	20	USE_LIBTOOL_VER=15
22	USE_REINPLACE= yes	21	USE_REINPLACE= yes
Lines 72-78 Link Here
72	.endif	71	.endif
73		72
74	.if defined(WITH_PYTHON)	73	.if defined(WITH_PYTHON)
75	USE_PYTHON= yes
76	.include "${PORTSDIR}/Mk/bsd.python.mk"	74	.include "${PORTSDIR}/Mk/bsd.python.mk"
77	SWIG_BINDINGS+= python	75	SWIG_BINDINGS+= python
78	PLIST_SUB+= WITH_PYTHON=""	76	PLIST_SUB+= WITH_PYTHON=""
Lines 243-255 Link Here
243	post-build:	241	post-build:
244	.if defined(WITH_PERL)	242	.if defined(WITH_PERL)
245	cd ${WRKSRC} ; \	243	cd ${WRKSRC} ; \
246	${MAKE} swig-pl-lib	244	${MAKE} swig-pl
247	cd ${WRKSRC}/subversion/bindings/swig/perl ; \
248	${SETENV} APR_CONFIG="${APR_APU_DIR}/apr-config" APU_CONFIG="${APR_APU_DIR}/apu-config" \
249	CCFLAGS="${CCFLAGS}" CC="${CC}" \
250	${PERL} Makefile.PL PREFIX="${PREFIX}" \
251	INSTALLPRIVLIB="${PREFIX}/lib" INSTALLARCHLIB="${PREFIX}/lib" ; \
252	${MAKE} all
253	.endif	245	.endif
254	.if defined(WITH_PYTHON)	246	.if defined(WITH_PYTHON)
255	cd ${WRKSRC} ; \	247	cd ${WRKSRC} ; \
Lines 280-288 Link Here
280	.endif	272	.endif
281	.if defined(WITH_PERL)	273	.if defined(WITH_PERL)
282	cd ${WRKSRC} ; \	274	cd ${WRKSRC} ; \
283	${MAKE} install-swig-pl-lib	275	${MAKE} install-swig-pl
284	cd ${WRKSRC}/subversion/bindings/swig/perl ; \
285	${MAKE} install
286	.endif	276	.endif
287	.if defined(WITH_PYTHON)	277	.if defined(WITH_PYTHON)
288	cd ${WRKSRC} ; \	278	cd ${WRKSRC} ; \

Lines 1-82 Link Here

(-)/home/clsung/ports/devel/subversion/files/patch-svnperl-noruntime (-82 / +3 lines)
1	--- subversion/bindings/swig/perl/Base.pm (revision 10173)	1	--- configure.orig Thu Oct 9 09:10:22 2003
2	+++ subversion/bindings/swig/perl/Base.pm (revision 10174)	2	+++ configure Thu Oct 9 09:10:30 2003
3	@@ -60,6 +60,7 @@ sub import {	3	@@ -0,0 +0,0 @@
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