diff options
-rw-r--r-- | graphics/gphoto2/Makefile | 39 | ||||
-rw-r--r-- | graphics/gphoto2/distinfo | 2 | ||||
-rw-r--r-- | graphics/gphoto2/files/patch-frontends_command-line_actions.c | 30 | ||||
-rw-r--r-- | graphics/gphoto2/files/patch-libgphoto2_gphoto2-filesys.c | 18 | ||||
-rw-r--r-- | graphics/gphoto2/files/patch-libgphoto2_port::ltmain.sh | 23 | ||||
-rw-r--r-- | graphics/gphoto2/files/patch-ltmain.sh | 32 | ||||
-rw-r--r-- | graphics/gphoto2/pkg-comment | 2 | ||||
-rw-r--r-- | graphics/gphoto2/pkg-descr | 8 | ||||
-rw-r--r-- | graphics/gphoto2/pkg-plist | 90 |
9 files changed, 12 insertions, 232 deletions
diff --git a/graphics/gphoto2/Makefile b/graphics/gphoto2/Makefile index 8ff329917297..cd7e3a05e4f1 100644 --- a/graphics/gphoto2/Makefile +++ b/graphics/gphoto2/Makefile @@ -6,61 +6,38 @@ # PORTNAME= gphoto2 -PORTVERSION= 2.1.0 -PORTREVISION= 3 +PORTVERSION= 2.1.1 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ - http://www.gphoto.net/dist/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= gphoto MAINTAINER= ports@FreeBSD.org -BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig -LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext \ - usb-0.1.7:${PORTSDIR}/devel/libusb \ +LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \ aa.1:${PORTSDIR}/graphics/aalib \ jpeg.9:${PORTSDIR}/graphics/jpeg \ - exif.8:${PORTSDIR}/graphics/libexif -RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig + gphoto2.2:${PORTSDIR}/graphics/libgphoto2 USE_BZIP2= yes USE_REINPLACE= yes -USE_GNOMENG= yes -USE_GNOME= glib12 USE_GMAKE= yes GNU_CONFIGURE= yes 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 +CONFIGURE_ARGS= --without-cdk MAN1= gphoto2.1 -MAN3= gphoto2.3 gphoto2_port.3 post-patch: -.for file in configure libgphoto2_port/configure - @${REINPLACE_CMD} -e 's|-g -Wall||g ; \ - s|-pthread|${PTHREAD_LIBS:S/"//g}|g' ${WRKSRC}/${file} -.endfor - @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ - 's|`glib-config|`\$$(GLIB_CONFIG)|g ; \ - s| install-docDATA||g ; \ - s| install-figureDATA||g ; \ - s|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' - @${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \ - 's|malloc\.h|stdlib.h|g' + @${REINPLACE_CMD} -e 's|-pthread|${PTHREADS_LIBS:S/"//g}|g ; \ + s|-g -Wall||g' ${WRKSRC}/configure post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} -.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 + ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} .endfor .endif diff --git a/graphics/gphoto2/distinfo b/graphics/gphoto2/distinfo index 6216af92ba74..fa6bea3f3902 100644 --- a/graphics/gphoto2/distinfo +++ b/graphics/gphoto2/distinfo @@ -1 +1 @@ -MD5 (gphoto2-2.1.0.tar.bz2) = b998bcb01cbb1916dedea03b7119ae42 +MD5 (gphoto2-2.1.1.tar.bz2) = ce77b9c9ce25a57990c61f9e301e74b9 diff --git a/graphics/gphoto2/files/patch-frontends_command-line_actions.c b/graphics/gphoto2/files/patch-frontends_command-line_actions.c deleted file mode 100644 index 369e3b94d3ac..000000000000 --- a/graphics/gphoto2/files/patch-frontends_command-line_actions.c +++ /dev/null @@ -1,30 +0,0 @@ ---- frontends/command-line/actions.c.orig Sat Aug 31 20:34:21 2002 -+++ frontends/command-line/actions.c Sat Aug 31 20:36:35 2002 -@@ -316,6 +316,7 @@ - const char *data; - unsigned long size; - ExifData *ed; -+ unsigned int i; - - CR (gp_file_new (&file)); - CRU (gp_camera_file_get (p->camera, p->folder, filename, -@@ -337,16 +338,9 @@ - printf ("%-59.59s", _("Value")); - printf ("\n"); - print_hline (); -- if (ed->ifd0) -- show_ifd (ed->ifd0); -- if (ed->ifd1) -- show_ifd (ed->ifd1); -- if (ed->ifd_exif) -- show_ifd (ed->ifd_exif); -- if (ed->ifd_gps) -- show_ifd (ed->ifd_gps); -- if (ed->ifd_interoperability) -- show_ifd (ed->ifd_interoperability); -+ for (i = 0; i < EXIF_IFD_COUNT; i++) -+ if (ed->ifd[i]) -+ show_ifd (ed->ifd[i]); - print_hline (); - if (ed->size) { - printf (_("EXIF data contains a thumbnail (%i bytes)."), diff --git a/graphics/gphoto2/files/patch-libgphoto2_gphoto2-filesys.c b/graphics/gphoto2/files/patch-libgphoto2_gphoto2-filesys.c deleted file mode 100644 index 0cf2e9054d9a..000000000000 --- a/graphics/gphoto2/files/patch-libgphoto2_gphoto2-filesys.c +++ /dev/null @@ -1,18 +0,0 @@ ---- libgphoto2/gphoto2-filesys.c.orig Sat Aug 31 20:30:42 2002 -+++ libgphoto2/gphoto2-filesys.c Sat Aug 31 20:32:23 2002 -@@ -98,12 +98,12 @@ - /* - * HP PhotoSmart C30 has the date and time in ifd_exif. - */ -- e = exif_content_get_entry (ed->ifd0, EXIF_TAG_DATE_TIME); -+ e = exif_content_get_entry (ed->ifd[EXIF_IFD_0], EXIF_TAG_DATE_TIME); - if (!e) -- e = exif_content_get_entry (ed->ifd_exif, -+ e = exif_content_get_entry (ed->ifd[EXIF_IFD_EXIF], - EXIF_TAG_DATE_TIME_ORIGINAL); - if (!e) -- e = exif_content_get_entry (ed->ifd_exif, -+ e = exif_content_get_entry (ed->ifd[EXIF_IFD_EXIF], - EXIF_TAG_DATE_TIME_DIGITIZED); - if (!e) { - GP_DEBUG ("EXIF data has not date/time tag."); diff --git a/graphics/gphoto2/files/patch-libgphoto2_port::ltmain.sh b/graphics/gphoto2/files/patch-libgphoto2_port::ltmain.sh deleted file mode 100644 index 7fd28043b837..000000000000 --- a/graphics/gphoto2/files/patch-libgphoto2_port::ltmain.sh +++ /dev/null @@ -1,23 +0,0 @@ ---- 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/files/patch-ltmain.sh b/graphics/gphoto2/files/patch-ltmain.sh deleted file mode 100644 index 7bf52e314a48..000000000000 --- a/graphics/gphoto2/files/patch-ltmain.sh +++ /dev/null @@ -1,32 +0,0 @@ ---- ltmain.sh.orig Tue Jun 25 20:57:40 2002 -+++ ltmain.sh Sat Dec 21 03:49:50 2002 -@@ -967,6 +967,7 @@ - ;; - - -avoid-version) -+ build_old_libs=no - avoid_version=yes - continue - ;; -@@ -1063,7 +1064,7 @@ - case $host in - *-*-openbsd* | *-*-freebsd*) - # Do not include libc_r directly, use -pthread flag. -- continue -+ #continue - ;; - esac - fi -@@ -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-comment b/graphics/gphoto2/pkg-comment index f0c4300f9733..af63f0496d93 100644 --- a/graphics/gphoto2/pkg-comment +++ b/graphics/gphoto2/pkg-comment @@ -1 +1 @@ -A universal digital camera picture control tool +A command-line frontend to libgphoto2 diff --git a/graphics/gphoto2/pkg-descr b/graphics/gphoto2/pkg-descr index 8682f4643bf8..788916797508 100644 --- a/graphics/gphoto2/pkg-descr +++ b/graphics/gphoto2/pkg-descr @@ -1,7 +1,3 @@ -gphoto2 is a library that can be used by applications to access -various digital cameras. +gphoto2 is a command-line frontend to libgphoto2. -Additionally, the command-line frontend, which is shipped with -the library, is called gphoto2, too. - -WWW: http://www.gphoto.org/ +WWW: http://gphoto.sourceforge.net/ diff --git a/graphics/gphoto2/pkg-plist b/graphics/gphoto2/pkg-plist index 2724bd51c51b..f995ddcb0573 100644 --- a/graphics/gphoto2/pkg-plist +++ b/graphics/gphoto2/pkg-plist @@ -1,107 +1,17 @@ bin/gphoto2 -bin/gphoto2-config -bin/gphoto2-port-config -include/gphoto2/gphoto2-abilities-list.h -include/gphoto2/gphoto2-camera.h -include/gphoto2/gphoto2-context.h -include/gphoto2/gphoto2-file.h -include/gphoto2/gphoto2-filesys.h -include/gphoto2/gphoto2-library.h -include/gphoto2/gphoto2-list.h -include/gphoto2/gphoto2-port-info-list.h -include/gphoto2/gphoto2-port-log.h -include/gphoto2/gphoto2-port-portability.h -include/gphoto2/gphoto2-port-result.h -include/gphoto2/gphoto2-port.h -include/gphoto2/gphoto2-result.h -include/gphoto2/gphoto2-setting.h -include/gphoto2/gphoto2-widget.h -include/gphoto2/gphoto2.h -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.5 -libdata/pkgconfig/libgphoto2.pc %%PORTDOCS%%share/doc/gphoto2/AUTHORS -%%PORTDOCS%%share/doc/gphoto2/FAQ %%PORTDOCS%%share/doc/gphoto2/NEWS %%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 -share/gphoto2/konica/japanese -share/gphoto2/konica/korean -share/gphoto2/konica/spanish 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 -share/locale/it/LC_MESSAGES/libgphoto2_port.mo share/locale/ja/LC_MESSAGES/gphoto2.mo -share/locale/ja/LC_MESSAGES/libgphoto2_port.mo share/locale/no/LC_MESSAGES/gphoto2.mo -share/locale/no/LC_MESSAGES/libgphoto2_port.mo share/locale/ru/LC_MESSAGES/gphoto2.mo -share/locale/ru/LC_MESSAGES/libgphoto2_port.mo share/locale/sl/LC_MESSAGES/gphoto2.mo -share/locale/sl/LC_MESSAGES/libgphoto2_port.mo share/locale/sv/LC_MESSAGES/gphoto2.mo -share/locale/sv/LC_MESSAGES/libgphoto2_port.mo share/locale/uk/LC_MESSAGES/gphoto2.mo -share/locale/uk/LC_MESSAGES/libgphoto2_port.mo 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.5.0 -@dirrm lib/gphoto2_port -@dirrm lib/gphoto2/2.1.0 -@dirrm lib/gphoto2 -@dirrm include/gphoto2 |