[48890] trunk/dports/devel/libgphoto2

[blb at macports.org]

Revision: 48890
          http://trac.macports.org/changeset/48890
Author:   blb at macports.org
Date:     2009-03-31 01:08:29 -0700 (Tue, 31 Mar 2009)
Log Message:
-----------
devel/libgphoto2 - make sure libgphoto2 prefers using its files from what
it is currently building instead of an older one already installed; see
<http://lists.macosforge.org/pipermail/macports-users/2009-March/014605.html>

Modified Paths:
--------------
    trunk/dports/devel/libgphoto2/Portfile

Added Paths:
-----------
    trunk/dports/devel/libgphoto2/files/patch-camlibs_Makefile.in.diff
    trunk/dports/devel/libgphoto2/files/patch-configure-nodoxygen.diff
    trunk/dports/devel/libgphoto2/files/patch-configure.diff

Removed Paths:
-------------
    trunk/dports/devel/libgphoto2/files/patch-configure

Modified: trunk/dports/devel/libgphoto2/Portfile
===================================================================
--- trunk/dports/devel/libgphoto2/Portfile	2009-03-31 07:58:09 UTC (rev 48889)
+++ trunk/dports/devel/libgphoto2/Portfile	2009-03-31 08:08:29 UTC (rev 48890)
@@ -29,7 +29,8 @@
                     port:libusb \
                     port:libtool
 
-patchfiles          patch-configure
+patchfiles          patch-configure.diff patch-configure-nodoxygen.diff \
+                    patch-camlibs_Makefile.in.diff
 
 configure.cflags-append   -I${prefix}/include -no-cpp-precomp
 configure.args      --mandir=${prefix}/share/man \
@@ -43,6 +44,6 @@
 
 variant with_doxygen description {Use doxygen to generate API docs} {
    depends_build-append   port:doxygen
-   patchfiles-delete      patch-configure
+   patchfiles-delete      patch-configure-nodoxygen.diff
 }
 

Added: trunk/dports/devel/libgphoto2/files/patch-camlibs_Makefile.in.diff
===================================================================
--- trunk/dports/devel/libgphoto2/files/patch-camlibs_Makefile.in.diff	                        (rev 0)
+++ trunk/dports/devel/libgphoto2/files/patch-camlibs_Makefile.in.diff	2009-03-31 08:08:29 UTC (rev 48890)
@@ -0,0 +1,11 @@
+--- camlibs/Makefile.in.orig	2009-01-21 14:23:03.000000000 -0700
++++ camlibs/Makefile.in	2009-03-31 01:34:35.000000000 -0600
+@@ -887,7 +887,7 @@
+ 	-export-symbols '$(top_srcdir)/camlibs/camlib.sym' \
+ 	-rpath '$(camlibdir)'
+ 
+-camlib_libadd = $(top_builddir)/libgphoto2/libgphoto2.la
++camlib_libadd = $(top_builddir)/libgphoto2/libgphoto2.la $(top_builddir)/libgphoto2_port/libgphoto2_port/libgphoto2_port.la
+ adc65_la_SOURCES = adc65/adc65.c
+ adc65_la_LDFLAGS = $(camlib_ldflags)
+ adc65_la_DEPENDENCIES = $(camlib_dependencies)

Deleted: trunk/dports/devel/libgphoto2/files/patch-configure
===================================================================
--- trunk/dports/devel/libgphoto2/files/patch-configure	2009-03-31 07:58:09 UTC (rev 48889)
+++ trunk/dports/devel/libgphoto2/files/patch-configure	2009-03-31 08:08:29 UTC (rev 48890)
@@ -1,11 +0,0 @@
---- ./configure.orig	2006-12-25 04:12:44.000000000 +0900
-+++ ./configure	2007-03-12 23:23:34.000000000 +0900
-@@ -30050,7 +30050,7 @@
-   ;;
- esac
- fi
--DOXYGEN=$ac_cv_path_DOXYGEN
-+DOXYGEN="false"
- if test -n "$DOXYGEN"; then
-   { echo "$as_me:$LINENO: result: $DOXYGEN" >&5
- echo "${ECHO_T}$DOXYGEN" >&6; }

Copied: trunk/dports/devel/libgphoto2/files/patch-configure-nodoxygen.diff (from rev 48866, trunk/dports/devel/libgphoto2/files/patch-configure)
===================================================================
--- trunk/dports/devel/libgphoto2/files/patch-configure-nodoxygen.diff	                        (rev 0)
+++ trunk/dports/devel/libgphoto2/files/patch-configure-nodoxygen.diff	2009-03-31 08:08:29 UTC (rev 48890)
@@ -0,0 +1,11 @@
+--- ./configure.orig	2006-12-25 04:12:44.000000000 +0900
++++ ./configure	2007-03-12 23:23:34.000000000 +0900
+@@ -30050,7 +30050,7 @@
+   ;;
+ esac
+ fi
+-DOXYGEN=$ac_cv_path_DOXYGEN
++DOXYGEN="false"
+ if test -n "$DOXYGEN"; then
+   { echo "$as_me:$LINENO: result: $DOXYGEN" >&5
+ echo "${ECHO_T}$DOXYGEN" >&6; }

Added: trunk/dports/devel/libgphoto2/files/patch-configure.diff
===================================================================
--- trunk/dports/devel/libgphoto2/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/devel/libgphoto2/files/patch-configure.diff	2009-03-31 08:08:29 UTC (rev 48890)
@@ -0,0 +1,18 @@
+--- configure.orig	2009-01-21 14:23:06.000000000 -0700
++++ configure	2009-03-31 00:41:47.000000000 -0600
+@@ -2664,7 +2664,6 @@
+ 
+ 
+ 
+-AM_CPPFLAGS="$CPPFLAGS"
+ 
+ AM_CPPFLAGS="-I\$(top_srcdir)"
+ AM_CPPFLAGS="$AM_CPPFLAGS -I\$(top_builddir)"
+@@ -2672,6 +2671,7 @@
+ AM_CPPFLAGS="$AM_CPPFLAGS -I\$(top_srcdir)/libgphoto2"
+ AM_CPPFLAGS="$AM_CPPFLAGS -I\$(top_builddir)/libgphoto2"
+ 
++AM_CPPFLAGS="$AM_CPPFLAGS $CPPFLAGS"
+ 
+ 
+ ac_ext=c
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090331/cb388374/attachment.html>