diff options
| -rw-r--r-- | graphics/gphoto2/Makefile | 30 | ||||
| -rw-r--r-- | graphics/gphoto2/distinfo | 2 | ||||
| -rw-r--r-- | graphics/gphoto2/files/patch-libgphoto2_port::ltmain.sh | 23 | ||||
| -rw-r--r-- | graphics/gphoto2/pkg-plist | 76 |
4 files changed, 85 insertions, 46 deletions
diff --git a/graphics/gphoto2/Makefile b/graphics/gphoto2/Makefile index 6c7c791f162b..c97b1944a3cc 100644 --- a/graphics/gphoto2/Makefile +++ b/graphics/gphoto2/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gphoto2 -PORTVERSION= 2.0 -PORTREVISION= 4 +PORTVERSION= 2.1.0 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://www.gphoto.net/dist/ @@ -23,28 +22,30 @@ LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext \ exif.5:${PORTSDIR}/graphics/libexif RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig +USE_BZIP2= yes +USE_REINPLACE= yes USE_GLIB= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --without-cdk --without-fig2dev +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ + LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CONFIGURE_ARGS= --without-cdk --without-fig2dev --without-xmlto INSTALLS_SHLIB= yes MAN1= gphoto2.1 - -INSTALL_CMD= /usr/bin/install -c -o ${BINOWN} -g ${BINGRP} +MAN3= gphoto2.3 gphoto2_port.3 post-patch: .for file in configure libgphoto2_port/configure - @${PERL} -pi -e 's|-g -Wall||g' ${WRKSRC}/${file} + @${REINPLACE_CMD} -e 's|-g -Wall||g ; \ + s|-pthread|${PTHREAD_LIBS:S/"//g}|g' ${WRKSRC}/${file} .endfor - @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${PERL} -pi -e \ - 's|\@INSTALL\@|${INSTALL_CMD}|g ; \ + @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ + 's|`glib-config|`\$$(GLIB_CONFIG)|g ; \ s| install-docDATA||g ; \ s| install-figureDATA||g ; \ - s|`glib-config|`\$$\(GLIB_CONFIG\)|g ; \ - s|\$$\(libdir\)/pkgconfig|\$$\(prefix\)/libdata/pkgconfig|g' + s|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' post-install: .if !defined(NOPORTDOCS) @@ -52,6 +53,11 @@ post-install: .for file in AUTHORS NEWS README doc/FAQ doc/gphoto2-cli.txt doc/gphoto2.txt ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} .endfor + @${MKDIR} ${PREFIX}/share/doc/libgphoto2_port +.for file in AUTHORS NEWS README + ${INSTALL_DATA} ${WRKSRC}/libgphoto2_port/${file} \ + ${PREFIX}/share/doc/libgphoto2_port +.endfor .endif .include <bsd.port.mk> diff --git a/graphics/gphoto2/distinfo b/graphics/gphoto2/distinfo index 7b8e7c545cd3..6216af92ba74 100644 --- a/graphics/gphoto2/distinfo +++ b/graphics/gphoto2/distinfo @@ -1 +1 @@ -MD5 (gphoto2-2.0.tar.gz) = f958d3c4b7238a8d6f1827da0d708941 +MD5 (gphoto2-2.1.0.tar.bz2) = b998bcb01cbb1916dedea03b7119ae42 diff --git a/graphics/gphoto2/files/patch-libgphoto2_port::ltmain.sh b/graphics/gphoto2/files/patch-libgphoto2_port::ltmain.sh new file mode 100644 index 000000000000..7fd28043b837 --- /dev/null +++ b/graphics/gphoto2/files/patch-libgphoto2_port::ltmain.sh @@ -0,0 +1,23 @@ +--- libgphoto2_port/ltmain.sh.orig Tue Jun 25 21:56:37 2002 ++++ libgphoto2_port/ltmain.sh Tue Jul 2 02:34:54 2002 +@@ -967,6 +967,7 @@ + ;; + + -avoid-version) ++ build_old_libs=no + avoid_version=yes + continue + ;; +@@ -4273,10 +4274,12 @@ + fi + + # Install the pseudo-library for information purposes. ++ if /usr/bin/false; then + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + instname="$dir/$name"i + $show "$install_prog $instname $destdir/$name" + $run eval "$install_prog $instname $destdir/$name" || exit $? ++ fi + + # Maybe install the static library, too. + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/graphics/gphoto2/pkg-plist b/graphics/gphoto2/pkg-plist index f90a4c4ebadf..2724bd51c51b 100644 --- a/graphics/gphoto2/pkg-plist +++ b/graphics/gphoto2/pkg-plist @@ -17,42 +17,45 @@ include/gphoto2/gphoto2-result.h include/gphoto2/gphoto2-setting.h include/gphoto2/gphoto2-widget.h include/gphoto2/gphoto2.h -lib/gphoto2/2.0/libgphoto2_agfa.so -lib/gphoto2/2.0/libgphoto2_barbie.so -lib/gphoto2/2.0/libgphoto2_canon.so -lib/gphoto2/2.0/libgphoto2_casio_qv.so -lib/gphoto2/2.0/libgphoto2_digita.so -lib/gphoto2/2.0/libgphoto2_dimagev.so -lib/gphoto2/2.0/libgphoto2_dimera3500.so -lib/gphoto2/2.0/libgphoto2_directory.so -lib/gphoto2/2.0/libgphoto2_jamcam.so -lib/gphoto2/2.0/libgphoto2_jd11.so -lib/gphoto2/2.0/libgphoto2_kodak_dc120.so -lib/gphoto2/2.0/libgphoto2_kodak_dc240.so -lib/gphoto2/2.0/libgphoto2_kodak_dc3200.so -lib/gphoto2/2.0/libgphoto2_konica.so -lib/gphoto2/2.0/libgphoto2_panasonic_coolshot.so -lib/gphoto2/2.0/libgphoto2_panasonic_dc1000.so -lib/gphoto2/2.0/libgphoto2_panasonic_dc1580.so -lib/gphoto2/2.0/libgphoto2_panasonic_l859.so -lib/gphoto2/2.0/libgphoto2_polaroid_pdc320.so -lib/gphoto2/2.0/libgphoto2_polaroid_pdc640.so -lib/gphoto2/2.0/libgphoto2_polaroid_pdc700.so -lib/gphoto2/2.0/libgphoto2_ptp.so -lib/gphoto2/2.0/libgphoto2_ricoh.so -lib/gphoto2/2.0/libgphoto2_samsung.so -lib/gphoto2/2.0/libgphoto2_sierra.so -lib/gphoto2/2.0/libgphoto2_sony_dscf1.so -lib/gphoto2/2.0/libgphoto2_sony_dscf55.so -lib/gphoto2/2.0/libgphoto2_stv0680.so -lib/gphoto2_port/0.0.4/libgphoto2_port_serial.so -lib/gphoto2_port/0.0.4/libgphoto2_port_usb.so +lib/gphoto2/2.1.0/libgphoto2_agfa.so +lib/gphoto2/2.1.0/libgphoto2_barbie.so +lib/gphoto2/2.1.0/libgphoto2_canon.so +lib/gphoto2/2.1.0/libgphoto2_casio_qv.so +lib/gphoto2/2.1.0/libgphoto2_digita.so +lib/gphoto2/2.1.0/libgphoto2_dimagev.so +lib/gphoto2/2.1.0/libgphoto2_dimera3500.so +lib/gphoto2/2.1.0/libgphoto2_directory.so +lib/gphoto2/2.1.0/libgphoto2_fuji.so +lib/gphoto2/2.1.0/libgphoto2_jamcam.so +lib/gphoto2/2.1.0/libgphoto2_jd11.so +lib/gphoto2/2.1.0/libgphoto2_kodak_dc120.so +lib/gphoto2/2.1.0/libgphoto2_kodak_dc240.so +lib/gphoto2/2.1.0/libgphoto2_kodak_dc3200.so +lib/gphoto2/2.1.0/libgphoto2_konica.so +lib/gphoto2/2.1.0/libgphoto2_mustek.so +lib/gphoto2/2.1.0/libgphoto2_panasonic_coolshot.so +lib/gphoto2/2.1.0/libgphoto2_panasonic_dc1000.so +lib/gphoto2/2.1.0/libgphoto2_panasonic_dc1580.so +lib/gphoto2/2.1.0/libgphoto2_panasonic_l859.so +lib/gphoto2/2.1.0/libgphoto2_polaroid_pdc320.so +lib/gphoto2/2.1.0/libgphoto2_polaroid_pdc640.so +lib/gphoto2/2.1.0/libgphoto2_polaroid_pdc700.so +lib/gphoto2/2.1.0/libgphoto2_ptp.so +lib/gphoto2/2.1.0/libgphoto2_ricoh.so +lib/gphoto2/2.1.0/libgphoto2_samsung.so +lib/gphoto2/2.1.0/libgphoto2_sierra.so +lib/gphoto2/2.1.0/libgphoto2_sipix.so +lib/gphoto2/2.1.0/libgphoto2_sony_dscf1.so +lib/gphoto2/2.1.0/libgphoto2_sony_dscf55.so +lib/gphoto2/2.1.0/libgphoto2_stv0680.so +lib/gphoto2_port/0.5.0/libgphoto2_port_serial.so +lib/gphoto2_port/0.5.0/libgphoto2_port_usb.so lib/libgphoto2.a lib/libgphoto2.so lib/libgphoto2.so.2 lib/libgphoto2_port.a lib/libgphoto2_port.so -lib/libgphoto2_port.so.0 +lib/libgphoto2_port.so.5 libdata/pkgconfig/libgphoto2.pc %%PORTDOCS%%share/doc/gphoto2/AUTHORS %%PORTDOCS%%share/doc/gphoto2/FAQ @@ -60,6 +63,9 @@ libdata/pkgconfig/libgphoto2.pc %%PORTDOCS%%share/doc/gphoto2/README %%PORTDOCS%%share/doc/gphoto2/gphoto2-cli.txt %%PORTDOCS%%share/doc/gphoto2/gphoto2.txt +%%PORTDOCS%%share/doc/libgphoto2_port/AUTHORS +%%PORTDOCS%%share/doc/libgphoto2_port/NEWS +%%PORTDOCS%%share/doc/libgphoto2_port/README share/gphoto2/konica/english share/gphoto2/konica/french share/gphoto2/konica/german @@ -70,6 +76,8 @@ share/locale/da/LC_MESSAGES/gphoto2.mo share/locale/da/LC_MESSAGES/libgphoto2_port.mo share/locale/de/LC_MESSAGES/gphoto2.mo share/locale/de/LC_MESSAGES/libgphoto2_port.mo +share/locale/es/LC_MESSAGES/gphoto2.mo +share/locale/es/LC_MESSAGES/libgphoto2_port.mo share/locale/fr/LC_MESSAGES/gphoto2.mo share/locale/fr/LC_MESSAGES/libgphoto2_port.mo share/locale/it/LC_MESSAGES/gphoto2.mo @@ -90,8 +98,10 @@ share/locale/zh_CN/LC_MESSAGES/gphoto2.mo share/locale/zh_CN/LC_MESSAGES/libgphoto2_port.mo @dirrm share/gphoto2/konica @dirrm share/gphoto2 +%%PORTDOCS%%@dirrm share/doc/libgphoto2_port %%PORTDOCS%%@dirrm share/doc/gphoto2 -@dirrm lib/gphoto2_port/0.0.4 +@dirrm lib/gphoto2_port/0.5.0 @dirrm lib/gphoto2_port -@dirrm lib/gphoto2/2.0 +@dirrm lib/gphoto2/2.1.0 @dirrm lib/gphoto2 +@dirrm include/gphoto2 |