Revision: 74223 http://trac.macports.org/changeset/74223 Author: michaelld@macports.org Date: 2010-12-07 18:28:08 -0800 (Tue, 07 Dec 2010) Log Message: ----------- libgphoto2: Correct linking to not use already-installed (in ${prefix}/lib) libgphoto2 and libgphoto2_port libraries. Modified Paths: -------------- trunk/dports/devel/libgphoto2/Portfile trunk/dports/devel/libgphoto2/files/patch-camlibs_Makefile.in.diff Modified: trunk/dports/devel/libgphoto2/Portfile =================================================================== --- trunk/dports/devel/libgphoto2/Portfile 2010-12-08 02:02:11 UTC (rev 74222) +++ trunk/dports/devel/libgphoto2/Portfile 2010-12-08 02:28:08 UTC (rev 74223) @@ -1,3 +1,4 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 # $Id$ PortSystem 1.0 @@ -32,7 +33,10 @@ patchfiles patch-configure.diff patch-configure-nodoxygen.diff \ patch-camlibs_Makefile.in.diff -configure.cflags-append -I${prefix}/include +# Use CPATH and LIBRARY_PATH for ${prefix}/include and ${prefix}/lib +configure.ldflags-delete -L${prefix}/lib +configure.cppflags-delete -I${prefix}/include + configure.args --mandir=${prefix}/share/man \ --with-drivers=all --with-libexif=auto Modified: trunk/dports/devel/libgphoto2/files/patch-camlibs_Makefile.in.diff =================================================================== --- trunk/dports/devel/libgphoto2/files/patch-camlibs_Makefile.in.diff 2010-12-08 02:02:11 UTC (rev 74222) +++ trunk/dports/devel/libgphoto2/files/patch-camlibs_Makefile.in.diff 2010-12-08 02:28:08 UTC (rev 74223) @@ -1,6 +1,6 @@ ---- 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 @@ +--- camlibs/Makefile.in.orig 2010-12-07 21:16:17.000000000 -0500 ++++ camlibs/Makefile.in 2010-12-07 21:17:15.000000000 -0500 +@@ -910,7 +910,7 @@ -export-symbols '$(top_srcdir)/camlibs/camlib.sym' \ -rpath '$(camlibdir)' @@ -9,3 +9,30 @@ adc65_la_SOURCES = adc65/adc65.c adc65_la_LDFLAGS = $(camlib_ldflags) adc65_la_DEPENDENCIES = $(camlib_dependencies) +@@ -1000,7 +1000,7 @@ + directory_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS) $(LIBEXIF_CFLAGS) + directory_la_LDFLAGS = $(camlib_ldflags) + directory_la_DEPENDENCIES = $(camlib_dependencies) +-directory_la_LIBADD = $(LIBEXIF_LIBS) $(top_builddir)/libgphoto2/libgphoto2.la ++directory_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la $(top_builddir)/libgphoto2_port/libgphoto2_port/libgphoto2_port.la $(LIBEXIF_LIBS) + enigma13_la_SOURCES = enigma13/enigma13.c + enigma13_la_LDFLAGS = $(camlib_ldflags) + enigma13_la_DEPENDENCIES = $(camlib_dependencies) +@@ -1221,7 +1221,7 @@ + + sierra_la_LDFLAGS = $(camlib_ldflags) + sierra_la_DEPENDENCIES = $(camlib_dependencies) +-sierra_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la $(LIBEXIF_LIBS) ++sierra_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la $(top_builddir)/libgphoto2_port/libgphoto2_port/libgphoto2_port.la $(LIBEXIF_LIBS) + sipix_blink_la_SOURCES = sipix/blink.c + sipix_blink_la_LDFLAGS = $(camlib_ldflags) + sipix_blink_la_DEPENDENCIES = $(camlib_dependencies) +@@ -1255,7 +1255,7 @@ + + sony_dscf1_la_LDFLAGS = $(camlib_ldflags) + sony_dscf1_la_DEPENDENCIES = $(camlib_dependencies) +-sony_dscf1_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la ++sony_dscf1_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la $(top_builddir)/libgphoto2_port/libgphoto2_port/libgphoto2_port.la + sony_dscf55_la_SOURCES = \ + sonydscf55/sony.c sonydscf55/sony.h \ + sonydscf55/camera.c sonydscf55/nls.h