Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 17 Jan 2014 17:00:04 GMT
From:      dfilter@FreeBSD.ORG (dfilter service)
To:        freebsd-ports-bugs@FreeBSD.org
Subject:   Re: ports/181073: commit references a PR
Message-ID:  <201401171700.s0HH04B9022151@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/181073; it has been noted by GNATS.

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/181073: commit references a PR
Date: Fri, 17 Jan 2014 16:57:02 +0000 (UTC)

 Author: miwi
 Date: Fri Jan 17 16:56:53 2014
 New Revision: 340074
 URL: http://svnweb.freebsd.org/changeset/ports/340074
 QAT: https://qat.redports.org/buildarchive/r340074/
 
 Log:
   - Update to 0.2.0
   
   PR:		ports/181073
   Submitted by:	Ports Fury
 
 Modified:
   head/graphics/gtkam/Makefile
   head/graphics/gtkam/distinfo   (contents, props changed)
   head/graphics/gtkam/files/patch-Makefile.in   (contents, props changed)
   head/graphics/gtkam/pkg-plist   (contents, props changed)
 
 Modified: head/graphics/gtkam/Makefile
 ==============================================================================
 --- head/graphics/gtkam/Makefile	Fri Jan 17 16:56:15 2014	(r340073)
 +++ head/graphics/gtkam/Makefile	Fri Jan 17 16:56:53 2014	(r340074)
 @@ -2,77 +2,48 @@
  # $FreeBSD$
  
  PORTNAME=	gtkam
 -PORTVERSION=	0.1.18
 -PORTREVISION=	3
 +PORTVERSION=	0.2.0
  CATEGORIES=	graphics
  MASTER_SITES=	SF/gphoto/${PORTNAME}/${PORTVERSION}
  
  MAINTAINER=	ports@FreeBSD.org
  COMMENT=	Download and view files from various digital cameras
  
 -LIB_DEPENDS=	exif-gtk:${PORTSDIR}/graphics/libexif-gtk \
 -		gphoto2.2:${PORTSDIR}/graphics/libgphoto2
 +LICENSE=	GPLv2 # (or later)
  
 -WANT_GNOME=	yes
 -USES=        pathfix pkgconfig
 +LIB_DEPENDS=	libexif-gtk.so:${PORTSDIR}/graphics/libexif-gtk \
 +		libgphoto2.so:${PORTSDIR}/graphics/libgphoto2
 +
 +USES=		gmake pathfix pkgconfig
  USE_GNOME=	gnomehier gtk20
 -USE_GMAKE=	yes
  GNU_CONFIGURE=	yes
 +
  CPPFLAGS+=	-I${LOCALBASE}/include
  LDFLAGS+=	-L${LOCALBASE}/lib
  
 -MAN1=		gtkam.1
 +OPTIONS_DEFINE=	DOCS GIMP GNOME
 +OPTIONS_SUB=	yes
  
 -NO_STAGE=	yes
 -.include <bsd.port.pre.mk>
 +GIMP_DESC=		GIMP plugin support
 +GIMP_LIB_DEPENDS=	libgimp-2.0.so:${PORTSDIR}/graphics/gimp
 +GIMP_CONFIGURE_WITH=	gimp
  
 -.if exists(${LOCALBASE}/lib/libgimp-2.0.so) && !defined(WITHOUT_GIMP)
 -WITH_GIMP=	yes
 -.endif
 +GNOME_USE=		GNOME=gnomeprefix,libgnomeui
 +GNOME_CONFIGURE_OFF=	--without-bonobo --without-gnome
 +GNOME_MAKE_ENV=		GNOME_SUBDIRS="help omf-install"
  
 -.if defined(WITH_GIMP)
 -LIB_DEPENDS+=	gimp-2.0:${PORTSDIR}/graphics/gimp
 -PLIST_SUB+=	GIMP=""
 -.else
 -CONFIGURE_ARGS+=	--without-gimp
 -PLIST_SUB+=	GIMP="@comment "
 -.endif
 +.include <bsd.port.options.mk>
  
 -.if ${HAVE_GNOME:Mlibgnomeui}!=""
 -PKGNAMESUFFIX=	-gnome
 -USE_GNOME+=	gnomeprefix libgnomeui
 +.if ${PORT_OPTIONS:MGNOME}
  INSTALLS_OMF=	yes
 -MAKE_ENV+=	GNOME_SUBDIRS="help omf-install"
 -.else
 -CONFIGURE_ARGS+=	--without-bonobo --without-gnome
 -MAKE_ENV+=	GNOME_SUBDIRS=""
 -.endif
 -
 -pre-everything::
 -.if !defined(WITH_GIMP)
 -	@${ECHO_MSG}
 -	@${ECHO_MSG} "If you want to compile with plugin for The GIMP,"
 -	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_GIMP=yes\""
 -	@${ECHO_MSG}
  .endif
  
  post-patch:
  	@${REINPLACE_CMD} -e 's|GIMP_VERSION="2.0"|GIMP_VERSION="2.2"|g ; \
 -		 s|images/gtkam|gtkam/images|g' ${WRKSRC}/configure
 +		 s|images/gtkam|gtkam/images|g ; \
 +		 s|FLAGS -g|FLAGS|g' ${WRKSRC}/configure
  	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
  		's|images/gtkam|gtkam/images|g ; \
  		 s|$$(libdir)/gimp/|$$(libexecdir)/gimp/|g'
  
 -post-install:
 -	${INSTALL_DATA} ${WRKSRC}/gtkam.desktop \
 -		${PREFIX}/share/applications
 -	${INSTALL_DATA} ${WRKSRC}/gtkam.png \
 -		${PREFIX}/share/pixmaps
 -.if !defined(NOPORTDOCS)
 -	@${MKDIR} ${DOCSDIR}
 -.for file in AUTHORS NEWS README
 -	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 -.endfor
 -.endif
 -
 -.include <bsd.port.post.mk>
 +.include <bsd.port.mk>
 
 Modified: head/graphics/gtkam/distinfo
 ==============================================================================
 --- head/graphics/gtkam/distinfo	Fri Jan 17 16:56:15 2014	(r340073)
 +++ head/graphics/gtkam/distinfo	Fri Jan 17 16:56:53 2014	(r340074)
 @@ -1,2 +1,2 @@
 -SHA256 (gtkam-0.1.18.tar.gz) = 5221649c52ace24f28278b1a4dad7b4d3730a9a4e8dbcafe964a583e9e176ef5
 -SIZE (gtkam-0.1.18.tar.gz) = 1443404
 +SHA256 (gtkam-0.2.0.tar.gz) = ff5128d3988e37cca59853647fcab12be21d7b2de79aaad0b7c71cb0594053fd
 +SIZE (gtkam-0.2.0.tar.gz) = 1443593
 
 Modified: head/graphics/gtkam/files/patch-Makefile.in
 ==============================================================================
 --- head/graphics/gtkam/files/patch-Makefile.in	Fri Jan 17 16:56:15 2014	(r340073)
 +++ head/graphics/gtkam/files/patch-Makefile.in	Fri Jan 17 16:56:53 2014	(r340074)
 @@ -1,7 +1,7 @@
  --- Makefile.in.orig	2008-04-23 22:55:02.000000000 +0200
  +++ Makefile.in	2008-04-23 22:56:37.000000000 +0200
 -@@ -253,7 +253,7 @@
 - target_alias = @target_alias@
 +@@ -333,7 +333,7 @@
 + top_build_prefix = @top_build_prefix@
   top_builddir = @top_builddir@
   top_srcdir = @top_srcdir@
  -SUBDIRS = m4m art doc help omf-install packaging pixmaps po src test
 @@ -9,13 +9,12 @@
   ACLOCAL_AMFLAGS = -I m4m
   
   # disable scrollkeeper for distcheck
 -@@ -714,8 +714,7 @@
 - 
 - info-am:
 - 
 --install-data-am: install-ApplicationsDATA install-gtkamdocDATA \
 --	install-iconDATA
 -+install-data-am:
 - 
 - install-dvi: install-dvi-recursive
 - 
 +@@ -342,7 +342,7 @@
 + ########################################################################
 + # Install a few support and doc files
 + gtkamdocdir = $(datadir)/doc/gtkam
 +-gtkamdoc_DATA = AUTHORS COPYING NEWS README TODO CHANGES
 ++gtkamdoc_DATA = AUTHORS NEWS README TODO CHANGES
 + icondir = $(datadir)/pixmaps
 + icon_DATA = gtkam.png
 + DESKTOP_IN_FILES = gtkam.desktop.in
 
 Modified: head/graphics/gtkam/pkg-plist
 ==============================================================================
 --- head/graphics/gtkam/pkg-plist	Fri Jan 17 16:56:15 2014	(r340073)
 +++ head/graphics/gtkam/pkg-plist	Fri Jan 17 16:56:53 2014	(r340074)
 @@ -1,30 +1,30 @@
  bin/gtkam
  %%GIMP%%libexec/gimp/2.2/plug-ins/gtkam-gimp
 +man/man1/gtkam.1.gz
 +share/applications/gtkam.desktop
  %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 +%%PORTDOCS%%%%DOCSDIR%%/CHANGES
  %%PORTDOCS%%%%DOCSDIR%%/NEWS
  %%PORTDOCS%%%%DOCSDIR%%/README
 -share/applications/gtkam.desktop
 -%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_add_camera_enhanced_window.png
 -%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_add_camera_window.png
 -%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_fileinfo.png
 -%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_makedir.png
 -%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_save.png
 -%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_save_all.png
 -%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_start_window.png
 -%%GNOME:%%share/gnome/help/gtkam/C/gtkam.xml
 -%%GNOME:%%share/gnome/help/gtkam/C/legal.xml
 -%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_add_camera_enhanced_window.png
 -%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_add_camera_window.png
 -%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_fileinfo.png
 -%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_makedir.png
 -%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_save.png
 -%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_save_all.png
 -%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_start_window.png
 -%%GNOME:%%share/gnome/help/gtkam/ru/gtkam.xml
 -%%GNOME:%%share/gnome/help/gtkam/ru/legal.xml
 -%%GNOME:%%share/omf/gtkam/gtkam-C.omf
 -%%GNOME:%%share/omf/gtkam/gtkam-ru.omf
 -share/pixmaps/gtkam.png
 +%%PORTDOCS%%%%DOCSDIR%%/TODO
 +%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_add_camera_enhanced_window.png
 +%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_add_camera_window.png
 +%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_fileinfo.png
 +%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_makedir.png
 +%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_save.png
 +%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_save_all.png
 +%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_start_window.png
 +%%GNOME%%share/gnome/help/gtkam/C/gtkam.xml
 +%%GNOME%%share/gnome/help/gtkam/C/legal.xml
 +%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_add_camera_enhanced_window.png
 +%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_add_camera_window.png
 +%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_fileinfo.png
 +%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_makedir.png
 +%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_save.png
 +%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_save_all.png
 +%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_start_window.png
 +%%GNOME%%share/gnome/help/gtkam/ru/gtkam.xml
 +%%GNOME%%share/gnome/help/gtkam/ru/legal.xml
  %%DATADIR%%/images/gtkam-audio.png
  %%DATADIR%%/images/gtkam-camera.png
  %%DATADIR%%/images/gtkam-folder-camera.png
 @@ -59,17 +59,20 @@ share/locale/ru/LC_MESSAGES/gtkam.mo
  share/locale/sk/LC_MESSAGES/gtkam.mo
  share/locale/sl/LC_MESSAGES/gtkam.mo
  share/locale/sv/LC_MESSAGES/gtkam.mo
 -share/locale/vi/LC_MESSAGES/gtkam.mo
  share/locale/uk/LC_MESSAGES/gtkam.mo
 +share/locale/vi/LC_MESSAGES/gtkam.mo
  share/locale/zh_CN/LC_MESSAGES/gtkam.mo
 +%%GNOME%%share/omf/gtkam/gtkam-C.omf
 +%%GNOME%%share/omf/gtkam/gtkam-ru.omf
 +share/pixmaps/gtkam.png
  share/pixmaps/gtkam-camera.png
  @dirrm %%DATADIR%%/pixmaps
  @dirrm %%DATADIR%%/images
  @dirrm %%DATADIR%%
 -%%GNOME:%%@dirrm share/omf/gtkam
 -%%GNOME:%%@dirrm share/gnome/help/gtkam/ru/figures
 -%%GNOME:%%@dirrm share/gnome/help/gtkam/ru
 -%%GNOME:%%@dirrm share/gnome/help/gtkam/C/figures
 -%%GNOME:%%@dirrm share/gnome/help/gtkam/C
 -%%GNOME:%%@dirrm share/gnome/help/gtkam
 +%%GNOME%%@dirrm share/omf/gtkam
 +%%GNOME%%@dirrm share/gnome/help/gtkam/ru/figures
 +%%GNOME%%@dirrm share/gnome/help/gtkam/ru
 +%%GNOME%%@dirrm share/gnome/help/gtkam/C/figures
 +%%GNOME%%@dirrm share/gnome/help/gtkam/C
 +%%GNOME%%@dirrm share/gnome/help/gtkam
  %%PORTDOCS%%@dirrm %%DOCSDIR%%
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401171700.s0HH04B9022151>