Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/devel
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28341

Modified Files:
        svn-javahl.info svn-swig-pm.info svn-swig-py.info 
        svn-swig-rb.info svn15.info svn17.info svn18.info 
        libapache2-mod-svn.info 
Log Message:
Rely on values from apr-1-config instead of hardcoding them.

Index: svn-swig-pm.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/devel/svn-swig-pm.info,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- svn-swig-pm.info    26 Jul 2013 20:54:42 -0000      1.34
+++ svn-swig-pm.info    8 Aug 2013 00:40:52 -0000       1.35
@@ -39,6 +39,8 @@
 PatchScript: <<
        perl -pi -e "s/PACKAGE_NAME='subversion'/PACKAGE_NAME='subversion18'/" 
configure
        perl -pi -e 's/(`echo \$\$inst`)/${1}18/' Makefile.in
+       # Make sure we remove any -no-cpp-precomp
+       perl -pi -e "s/clang/gcc/" configure
 <<
 
 # Compile Phase:
@@ -102,11 +104,11 @@
  
  ######################## Running SWIG ########################
  
- make autogen-swig-pl CPPFLAGS='-I$(top_srcdir)/subversion/include 
-I$(top_builddir)/subversion -I%p/include/serf-1 -I%p/include/apache2 
-I%p/include  -DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK' INCLUDES=''
+ make autogen-swig-pl
  
  ######################## Building libsvn_swig_perl ########################
  
- make libsvn_swig_perl CPPFLAGS='-I$(top_srcdir)/subversion/include 
-I$(top_builddir)/subversion -I%p/include/serf-1 -I%p/include/apache2 
-I%p/include  -DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK' INCLUDES=''
+ make libsvn_swig_perl
  
  ######################## Running Makefile.PL ########################
  
@@ -116,7 +118,7 @@
  ######################## Building Perl Bindings ########################
  
  popd 
- make swig-pl CPPFLAGS='-I$(top_srcdir)/subversion/include 
-I$(top_builddir)/subversion -I%p/include/serf-1 -I%p/include/apache2 
-I%p/include  -DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK' INCLUDES=''
+ make swig-pl
 
 <<
 InfoTest: <<

Index: svn-javahl.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/devel/svn-javahl.info,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- svn-javahl.info     26 Jul 2013 20:54:42 -0000      1.27
+++ svn-javahl.info     8 Aug 2013 00:40:52 -0000       1.28
@@ -36,6 +36,8 @@
 PatchScript: <<
        perl -pi -e "s/PACKAGE_NAME='subversion'/PACKAGE_NAME='subversion18'/" 
configure
        perl -pi -e 's/(`echo \$\$inst`)/${1}18/' Makefile.in
+       # Make sure we remove any -no-cpp-precomp
+       perl -pi -e "s/clang/gcc/" configure
 <<
 
 # Compile Phase:
@@ -79,7 +81,7 @@
  fi
  
  ### Build javahl bindings
- make javahl CPPFLAGS='-I$(top_srcdir)/subversion/include 
-I$(top_builddir)/subversion -I%p/include/serf-1 -I%p/include/apache2 
-I%p/include  -DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK' INCLUDES=''
+ make javahl
 <<
 InfoTest: <<
  TestDepends: junit

Index: svn-swig-py.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/devel/svn-swig-py.info,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- svn-swig-py.info    26 Jul 2013 20:54:42 -0000      1.18
+++ svn-swig-py.info    8 Aug 2013 00:40:52 -0000       1.19
@@ -36,6 +36,8 @@
 PatchScript: <<
        perl -pi -e "s/PACKAGE_NAME='subversion'/PACKAGE_NAME='subversion18'/" 
configure
        perl -pi -e 's/(`echo \$\$inst`)/${1}18/' Makefile.in
+       # Make sure we remove any -no-cpp-precomp
+       perl -pi -e "s/clang/gcc/" configure
 <<
 
 # Compile Phase:
@@ -76,7 +78,7 @@
  ./conf+78,7 @@ang/gcc/" configureompakefile.insubversion18'/" 
configureion -I%p/include/serf-1 -I%p/include/apache2 -I%p/include  -DDARWIN 
-DSIGPROCMASK_SETS_THREAD_MASK' INCLUDES=''UDES=''s
~ÿ€PYÓP+h
~ÿÐf
~ÿk@ÒP+6 èè!è! r
~ÿs
~ÿxô6ÓP+i
~ÿ’"ÒP+†@ÒP+ r
~ÿ`"ÒP+ßr
~ÿÀïšÓP+u*ÒP+àšÓP+ØäšÓP+¨éšÓP+€JÒP+xô6ÓP+i
~ÿÐg
~ÿk@ÒP+à!à! r
~ÿs
~ÿH¾ÓP+ài
~ÿ’"ÒP+†@ÒP+ r
~ÿ`"ÒP+ßr
~ÿÐr
~ÿÈr
~ÿ8K;ÒP+Œp˜s
~ÿu*ÒP+€JÒP+ài
~ÿ°h
~ÿk@ÒP+GHIJKMNOP r
~ÿs
~ÿHuíÒP+€k
~ÿ’"ÒP+†@ÒP+ r
~ÿ0ïšÓP+u*ÒP+7ÓP+ 
©ÊÒP+àšÓP+ØäšÓP+¨éšÓP+€JÒP+HuíÒP+€k
~ÿÀi
~ÿk@ÒP+8uíÒP+€k
~ÿði
~ÿk@ÒP+(uíÒP+€k
~ÿ j
~ÿk@ÒP+uíÒP+€k
~ÿPj
~ÿk@ÒP+   ¨îšÓP+u*ÒP+¨éšÓP+Ðd
~ÿŠøÊÒP+e)ÒP+ØäšÓP+ðj
~ÿyøÊÒP+e)ÒP+àšÓP+ k
~ÿZøÊÒP+e)ÒP+ؤÊÒP+7ÓP+ 
©ÊÒP+àšÓP+Ø7ÓP+ØäšÓP+¨éšÓP+€JÒP+8K;ÒP+m–ÒP+s
~ÿp;ÊÒP+Ðl
~ÿ k
~ÿk@ÒP+5678:<=>?@BD r
~ÿs
~ÿ q“ÒP+s
~ÿu*ÒP+E;ÒP+Pk
~ÿm–ÒP+e)ÒP+E;ÒP+Õ_@fÆS Qöl±íìƒbÒP+s
~ÿ q“ÒP+àm
~ÿ°l
~ÿk@ÒP+u]ÞÓ       4Q ÷U^Qʉ§¶uª¹ñìò*ēv r
~ÿs
~ÿH¾_ÒP+ðo
~ÿ’"ÒP+†@ÒP+ r
~ÿ`"ÒP+ßr
~ÿÐr
~ÿÈr
~ÿ7ÓP+u*ÒP+Ø7ÓP+   7ÓP+€JÒP+ðo
~ÿ m
~ÿk@ÒP+8¾_ÒP+ðo
~ÿÐm
~ÿk@igure %c
  
  ### Build swig python bindings
- make swig-py CPPFLAGS='-I$(top_srcdir)/subversion/include 
-I$(top_builddir)/subversion -I%p/include/serf-1 -I%p/include/apache2 
-I%p/include  -DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK' INCLUDES=''
+ make swig-py
 <<
 InfoTest: <<
  TestScript: <<

Index: libapache2-mod-svn.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/devel/libapache2-mod-svn.info,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- libapache2-mod-svn.info     31 May 2012 22:47:55 -0000      1.13
+++ libapache2-mod-svn.info     8 Aug 2013 00:40:52 -0000       1.14
@@ -84,7 +84,7 @@
  ./configure %c
 
  ### make mod_svn shared
- make apache-mod CPPFLAGS='-I$(top_srcdir)/subversion/include 
-I$(top_builddir)/subversion -I%p/include/neon -I%p/include/serf-0 
-I%p/include/apache2 -I%p/lib/system-openssl/include -I%p/include/db5 
-I%p/include  -DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK' INCLUDES=''
+ make apache-mod
 <<
 
 # Install Phase:

Index: svn18.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/devel/svn18.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- svn18.info  26 Jul 2013 20:54:42 -0000      1.3
+++ svn18.info  8 Aug 2013 00:40:52 -0000       1.4
@@ -31,6 +31,8 @@
 PatchScript: <<
        perl -pi -e "s/PACKAGE_NAME='subversion'/PACKAGE_NAME='subversion18'/" 
configure
        perl -pi -e 's/(`echo \$\$inst`)/${1}18/' Makefile.in
+       # Make sure we remove any -no-cpp-precomp
+       perl -pi -e "s/clang/gcc/" configure
 <<
 
 # Compile Phase:
@@ -69,10 +71,7 @@
  export RUBY=/usr/bin/false
  export PERL=/usr/bin/false
 
- ./configure %c
-
- ### make everything shared
- make CPPFLAGS='-I$(top_srcdir)/subversion/include 
-I$(top_builddir)/subversion -I%p/include/serf-1 -I%p/include/apache2 
-I%p/include/db5 -I%p/include  -DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK' 
INCLUDES=''  SVN_APRUTIL_LIBS='%p/lib/libaprutil.la %p/lib/libexpat.la'
+ %{default_script}
 <<
 InfoTest: TestScript: make check || exit 2
 

Index: svn-swig-rb.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/devel/svn-swig-rb.info,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- svn-swig-rb.info    26 Jul 2013 20:54:42 -0000      1.14
+++ svn-swig-rb.info    8 Aug 2013 00:40:52 -0000       1.15
@@ -36,6 +36,8 @@
 PatchScript: <<
        perl -pi -e "s/PACKAGE_NAME='subversion'/PACKAGE_NAME='subversion18'/" 
configure
        perl -pi -e 's/(`echo \$\$inst`)/${1}18/' Makefile.in
+       # Make sure we remove any -no-cpp-precomp
+       perl -pi -e "s/clang/gcc/" configure
 <<
 
 # Compile Phase:
@@ -79,7 +81,7 @@
  if [ "$rubyhdrdir" == "nil" ]; then
    rubyhdrdir=`%p/bin/ruby%type_raw[ruby] -rrbconfig -e "print 
RbConfig::CONFIG['archdir']"`
  fi
- make swig-rb CPPFLAGS="-I$(top_srcdir)/subversion/include 
-I$(top_builddir)/subversion -I$rubyhdrdir -I%p/include/serf-1 
-I%p/include/apache2 -I%p/include -DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK" 
INCLUDES=''
+ make swig-rb
 <<
 InfoTest: <<
  TestScript: <<

Index: svn17.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/devel/svn17.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- svn17.info  26 Jul 2013 20:54:42 -0000      1.9
+++ svn17.info  8 Aug 2013 00:40:52 -0000       1.10
@@ -33,6 +33,8 @@
 PatchScript: <<
        perl -pi -e "s/PACKAGE_NAME='subversion'/PACKAGE_NAME='subversion17'/" 
configure
        perl -pi -e 's/(`echo \$\$inst`)/${1}17/' Makefile.in
+       # Make sure we remove any -no-cpp-precomp
+       perl -pi -e "s/clang/gcc/" configure
 <<
 
 # Compile Phase:
@@ -73,10 +75,7 @@
  export RUBY=/usr/bin/false
  export PERL=/usr/bin/false
 
- ./configure %c
-
- ### make everything shared
- make CPPFLAGS='-I$(top_srcdir)/subversion/include 
-I$(top_builddir)/subversion -I%p/include/neon -I%p/include/serf-1 
-I%p/include/apache2 -I%p/include/db5 -I%p/include  -DDARWIN 
-DSIGPROCMASK_SETS_THREAD_MASK' INCLUDES=''  
SVN_APRUTIL_LIBS='%p/lib/libaprutil.la %p/lib/libexpat.la'
+ %{default_script}
 <<
 InfoTest: TestScript: make check || exit 2
 

Index: svn15.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/devel/svn15.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- svn15.info  19 Jun 2013 01:00:43 -0000      1.6
+++ svn15.info  8 Aug 2013 00:40:52 -0000       1.7
@@ -39,6 +39,8 @@
        %{default_script}
        perl -pi -e "s/PACKAGE_NAME='subversion'/PACKAGE_NAME='subversion15'/" 
configure
        perl -pi -e 's/(`echo \$\$inst`)/${1}15/' Makefile.in
+       # Make sure we remove any -no-cpp-precomp
+       perl -pi -e "s/clang/gcc/" configure
 <<
 
 # Compile Phase:
@@ -77,10 +79,7 @@
  export RUBY=/usr/bin/false
  export PERL=/usr/bin/false
 
- ./configure %c
-
- ### make everything shared
- make CPPFLAGS='-I$(top_srcdir)/subversion/include 
-I$(top_builddir)/subversion -I%p/include/neon -I%p/include/serf-0 
-I%p/include/apache2 -I%p/include/db5 -I%p/include  -DDARWIN 
-DSIGPROCMASK_SETS_THREAD_MASK' INCLUDES=''  
SVN_APRUTIL_LIBS='%p/lib/libaprutil.la %p/lib/libexpat.la'
+ %{default_script}
 <<
 InfoTest: TestScript: make check || exit 1
 


------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with <2% overhead. 
Download for free and get started troubleshooting in minutes. 
http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to