Date: Sun, 27 Apr 2014 17:52:34 +0000 (UTC) From: Pawel Pekala <pawel@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r352442 - head/graphics/gimageview Message-ID: <201404271752.s3RHqYLm063124@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pawel Date: Sun Apr 27 17:52:34 2014 New Revision: 352442 URL: http://svnweb.freebsd.org/changeset/ports/352442 QAT: https://qat.redports.org/buildarchive/r352442/ Log: - Add staging support - Convert to new LIB_DEPENDS format - Use options helpers - Install striped binaries - Remove Authors tag from pkg-descr Modified: head/graphics/gimageview/Makefile head/graphics/gimageview/pkg-descr head/graphics/gimageview/pkg-plist Modified: head/graphics/gimageview/Makefile ============================================================================== --- head/graphics/gimageview/Makefile Sun Apr 27 17:42:13 2014 (r352441) +++ head/graphics/gimageview/Makefile Sun Apr 27 17:52:34 2014 (r352442) @@ -10,95 +10,55 @@ MASTER_SITES= SF/gtkmmviewer/${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Yet another GTK+ based image viewer -LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ - png15:${PORTSDIR}/graphics/png +LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ + libpng15.so:${PORTSDIR}/graphics/png USES= gmake pkgconfig -WANT_GNOME= yes GNU_CONFIGURE= yes +USE_GNOME= gtk20 +USE_XORG= xinerama ice +CONFIGURE_ARGS= --with-gtk2 CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" +CFLAGS+= -DUSE_GTK2 CPPFLAGS+= -I${LOCALBASE}/include MAKE_ARGS= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" +INSTALL_TARGET= install-strip OPTIONS_DEFINE= SPLASH NLS LIBMNG LIBWMF LIBRSVG2 LIBEXIF MPLAYER LIBXINE IMLIB OPTIONS_DEFAULT=SPLASH NLS LIBMNG LIBWMF LIBRSVG2 LIBEXIF MPLAYER NO_OPTIONS_SORT=yes -SPLASH_DESC= Show splash screen on startup -IMLIB_DESC= imlib, disable gdk-pixbuf +OPTIONS_SUB= yes -USE_GNOME= gtk20 -USE_XORG= xinerama ice -CONFIGURE_ARGS= --with-gtk2 -CFLAGS+= -DUSE_GTK2 +SPLASH_DESC= Show splash screen on startup +SPLASH_CONFIGURE_ENABLE=splash -NO_STAGE= yes -.include <bsd.port.options.mk> +NLS_CONFIGURE_ENABLE= nls +NLS_USES= gettext -.if ! ${PORT_OPTIONS:MSPLASH} -CONFIGURE_ARGS+= --disable-splash -.endif +IMLIB_DESC= imlib, disable gdk-pixbuf +IMLIB_CONFIGURE_ENABLE= gdk-pixbuf +IMLIB_USE= GNOME=imlib -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+= --disable-nls -PLIST_SUB+= NLS="@comment " -.endif +LIBMNG_CONFIGURE_WITH= libmng +LIBMNG_LIB_DEPENDS= libmng.so:${PORTSDIR}/graphics/libmng -.if ${PORT_OPTIONS:MIMLIB} -USE_GNOME+= imlib -CONFIGURE_ARGS+= --disable-gdk-pixbuf -.endif +LIBWMF_CONFIGURE_WITH= libwmf +LIBWMF_LIB_DEPENDS= libwmf.so:${PORTSDIR}/graphics/libwmf -.if ${PORT_OPTIONS:MLIBMNG} -LIB_DEPENDS+= mng:${PORTSDIR}/graphics/libmng -PLIST_SUB+= WITH_LIBMNG="" -.else -CONFIGURE_ARGS+= --without-libmng -PLIST_SUB+= WITH_LIBMNG="@comment " -.endif - -.if ${PORT_OPTIONS:MLIBWMF} -LIB_DEPENDS+= wmf:${PORTSDIR}/graphics/libwmf -PLIST_SUB+= WITH_LIBWMF="" -.else -CONFIGURE_ARGS+= --without-libwmf -PLIST_SUB+= WITH_LIBWMF="@comment " -.endif +LIBRSVG2_CONFIGURE_WITH=librsvg +LIBRSVG2_LIB_DEPENDS= librsvg-2.so:${PORTSDIR}/graphics/librsvg2 -.if ${PORT_OPTIONS:MLIBRSVG2} -LIB_DEPENDS+= rsvg-2:${PORTSDIR}/graphics/librsvg2 -PLIST_SUB+= WITH_LIBRSVG="" -.else -CONFIGURE_ARGS+= --without-librsvg -PLIST_SUB+= WITH_LIBRSVG="@comment " -.endif +LIBEXIF_CONFIGURE_ENABLE=exif +LIBEXIF_LIB_DEPENDS= libexif.so:${PORTSDIR}/graphics/libexif +LIBEXIF_EXTRA_PATCHES= ${FILESDIR}/extra-patch-src-exit_view.c -.if ${PORT_OPTIONS:MLIBEXIF} -LIB_DEPENDS+= exif:${PORTSDIR}/graphics/libexif -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src-exit_view.c -.else -CONFIGURE_ARGS+= --disable-exif -.endif +MPLAYER_CONFIGURE_ENABLE=mplayer +MPLAYER_RUN_DEPENDS= mplayer:${PORTSDIR}/multimedia/mplayer -.if ${PORT_OPTIONS:MMPLAYER} -RUN_DEPENDS+= mplayer:${PORTSDIR}/multimedia/mplayer -CONFIGURE_ARGS+= --enable-mplayer -PLIST_SUB+= WITH_LIBMPLAYER="" -.else -CONFIGURE_ARGS+= --disable-mplayer -PLIST_SUB+= WITH_LIBMPLAYER="@comment " -.endif +LIBXINE_CONFIGURE_WITH= xine +LIBXINE_LIB_DEPENDS= xine:${PORTSDIR}/multimedia/libxine -.if ${PORT_OPTIONS:MLIBXINE} -LIB_DEPENDS+= xine:${PORTSDIR}/multimedia/libxine -CONFIGURE_ARGS+= --with-xine -PLIST_SUB+= WITH_LIBXINE="" -.else -CONFIGURE_ARGS+= --without-xine -PLIST_SUB+= WITH_LIBXINE="@comment " -.endif +.include <bsd.port.options.mk> post-patch: @${REINPLACE_CMD} -e 's/DATADIRNAME=lib/DATADIRNAME=share/g' \ @@ -107,6 +67,8 @@ post-patch: @${REINPLACE_CMD} -e 's|/gnome/apps/|/apps/|' \ ${WRKSRC}/gimageview.spec \ ${WRKSRC}/etc/Makefile.in + @${FIND} ${WRKSRC} -name Makefile.in -exec ${REINPLACE_CMD} \ + 's|= $$(DESTDIR)|= |' {} \; post-configure: .if ${PORT_OPTIONS:MIMLIB} Modified: head/graphics/gimageview/pkg-descr ============================================================================== --- head/graphics/gimageview/pkg-descr Sun Apr 27 17:42:13 2014 (r352441) +++ head/graphics/gimageview/pkg-descr Sun Apr 27 17:52:34 2014 (r352442) @@ -4,5 +4,4 @@ It supports tabbed browsing, thumbnail t drag and drop, reading thumbnail cache of other famous image viewers, and a flexible user interface. -Authors: Takuro Ashie <ashie@homa.ne.jp>, Nyan2 <t-nyan2@nifty.com> WWW: http://gtkmmviewer.sourceforge.net/ Modified: head/graphics/gimageview/pkg-plist ============================================================================== --- head/graphics/gimageview/pkg-plist Sun Apr 27 17:42:13 2014 (r352441) +++ head/graphics/gimageview/pkg-plist Sun Apr 27 17:52:34 2014 (r352442) @@ -6,21 +6,21 @@ lib/gimageview/archiver/libgimv_zip_exta lib/gimageview/image_loader/libgimv_bmp_loader.so lib/gimageview/image_loader/libgimv_jpeg_loader.so lib/gimageview/image_loader/libgimv_mag_loader.so -%%WITH_LIBMNG%%lib/gimageview/image_loader/libgimv_mng_loader.so +%%LIBMNG%%lib/gimageview/image_loader/libgimv_mng_loader.so lib/gimageview/image_loader/libgimv_pcx_loader.so lib/gimageview/image_loader/libgimv_pixbuf_loader.so lib/gimageview/image_loader/libgimv_png_loader.so -%%WITH_LIBRSVG%%lib/gimageview/image_loader/libgimv_rsvg_loader.so +%%LIBRSVG2%%lib/gimageview/image_loader/libgimv_rsvg_loader.so lib/gimageview/image_loader/libgimv_tga_loader.so -%%WITH_LIBWMF%%lib/gimageview/image_loader/libgimv_wmf_loader.so +%%LIBWMF%%lib/gimageview/image_loader/libgimv_wmf_loader.so lib/gimageview/image_loader/libgimv_xbm_loader.so lib/gimageview/image_loader/libgimv_xcf_loader.so lib/gimageview/image_loader/libgimv_xvpics_loader.so lib/gimageview/image_saver/libgimv_png_saver.so lib/gimageview/image_saver/libgimv_pnm_saver.so lib/gimageview/image_saver/libgimv_xvpics_saver.so -%%WITH_LIBMPLAYER%%lib/gimageview/image_view/libgimv_mplayer.so -%%WITH_LIBXINE%%lib/gimageview/image_view/libgimv_xine.so +%%MPLAYER%%lib/gimageview/image_view/libgimv_mplayer.so +%%LIBXINE%%lib/gimageview/image_view/libgimv_xine.so lib/gimageview/io_stream/libgimv_bz_io.so lib/gimageview/io_stream/libgimv_gzip_io.so lib/gimageview/thumbnail/libgimv_ee_thumb.so
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404271752.s3RHqYLm063124>