diff --git a/graphics/gtkam/Makefile b/graphics/gtkam/Makefile index b3ee6a5703b6..96634e7a4d52 100644 --- a/graphics/gtkam/Makefile +++ b/graphics/gtkam/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gtkam -PORTVERSION= 0.1.10 -PORTREVISION= 1 +PORTVERSION= 0.1.11 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= gphoto @@ -18,17 +17,17 @@ COMMENT= Download and view files from various digital cameras LIB_DEPENDS= exif-gtk.4:${PORTSDIR}/graphics/libexif-gtk \ gphoto2.2:${PORTSDIR}/graphics/libgphoto2 -USE_BZIP2= yes USE_X_PREFIX= yes -USE_REINPLACE= yes +WANT_GNOME= yes +USE_GNOME= gnomehack gnomehier gnometarget gtk20 GNU_CONFIGURE= yes -USE_GNOME= libbonoboui CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --without-gnome MAN1= gtkam.1 +.include + .if exists(${X11BASE}/lib/libgimp-1.3.so) WITH_GIMP= yes .endif @@ -37,10 +36,20 @@ WITH_GIMP= yes LIB_DEPENDS+= gimp-1.3:${PORTSDIR}/graphics/gimp-devel PLIST_SUB+= GIMP="" .else -CONFIGURE_ARGS= --without-gimp +CONFIGURE_ARGS+= --without-gimp PLIST_SUB+= GIMP="@comment " .endif +.if ${HAVE_GNOME:Mlibgnomeui}!="" +PKGNAMESUFFIX= -gnome +USE_GNOME+= gnomeprefix libgnomeui +MAKE_ENV+= GNOME_SUBDIRS="help omf-install" +DATADIR= ${PREFIX}/share/gnome/${PORTNAME} +.else +CONFIGURE_ARGS+= --without-bonobo-activation --without-gnome +MAKE_ENV+= GNOME_SUBDIRS="" +.endif + pre-everything:: .if !defined(WITH_GIMP) @${ECHO_MSG} @@ -52,11 +61,13 @@ pre-everything:: post-patch: @${REINPLACE_CMD} -e 's|-g -Wall||g' ${WRKSRC}/configure @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ - 's| install-gtkamdocDATA||g ; \ - s|images/gtkam|gtkam/images|g ; \ - s|^test_fsel_LDFLAGS =.*|test_fsel_LDFLAGS = \$$(EXIF_LIBS)|g' + 's|images/gtkam|gtkam/images|g' post-install: + ${INSTALL_DATA} ${WRKSRC}/gtkam.desktop \ + ${PREFIX}/share/gnome/applications + ${INSTALL_DATA} ${WRKSRC}/gtkam.png \ + ${PREFIX}/share/gnome/pixmaps .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} .for file in AUTHORS NEWS README @@ -64,4 +75,4 @@ post-install: .endfor .endif -.include +.include diff --git a/graphics/gtkam/distinfo b/graphics/gtkam/distinfo index e9af43e2f835..372641b60bdf 100644 --- a/graphics/gtkam/distinfo +++ b/graphics/gtkam/distinfo @@ -1,2 +1,2 @@ -MD5 (gtkam-0.1.10.tar.bz2) = 91f342aba0f6161c334ab5a8c74795cb -SIZE (gtkam-0.1.10.tar.bz2) = 326015 +MD5 (gtkam-0.1.11.tar.gz) = 084e90e73179e9cac6664fd1b30e86d8 +SIZE (gtkam-0.1.11.tar.gz) = 611388 diff --git a/graphics/gtkam/files/patch-Makefile.in b/graphics/gtkam/files/patch-Makefile.in new file mode 100644 index 000000000000..34176d3dbbcc --- /dev/null +++ b/graphics/gtkam/files/patch-Makefile.in @@ -0,0 +1,21 @@ +--- Makefile.in.orig Sun Mar 7 07:36:03 2004 ++++ Makefile.in Sat Mar 20 16:06:19 2004 +@@ -108,7 +108,7 @@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ + +-SUBDIRS = intl m4 art doc help omf-install packaging pixmaps po src test ++SUBDIRS = intl m4 art doc $(GNOME_SUBDIRS) packaging pixmaps po src test + + gtkamdocdir = $(datadir)/doc/gtkam + gtkamdoc_DATA = AUTHORS COPYING NEWS README TODO +@@ -412,8 +412,7 @@ + install-exec-am: + install-exec: install-exec-recursive + +-install-data-am: install-desktopDATA install-gtkamdocDATA \ +- install-iconDATA ++install-data-am: + install-data: install-data-recursive + + install-am: all-am diff --git a/graphics/gtkam/pkg-plist b/graphics/gtkam/pkg-plist index 40121ccd9b60..a8efb1447dcf 100644 --- a/graphics/gtkam/pkg-plist +++ b/graphics/gtkam/pkg-plist @@ -1,20 +1,35 @@ bin/gtkam %%GIMP%%libexec/gimp/1.3/plug-ins/gtkam-gimp -%%PORTDOCS%%share/doc/gtkam/AUTHORS -%%PORTDOCS%%share/doc/gtkam/NEWS -%%PORTDOCS%%share/doc/gtkam/README -share/gtkam/images/gtkam-audio.png -share/gtkam/images/gtkam-camera.png -share/gtkam/images/gtkam-folder-camera.png -share/gtkam/images/gtkam-folder.png -share/gtkam/images/gtkam-lock.png -share/gtkam/images/gtkam-new.png -share/gtkam/pixmaps/camera.xpm -share/gtkam/pixmaps/configure.xpm -share/gtkam/pixmaps/delete_images.xpm -share/gtkam/pixmaps/exit.xpm -share/gtkam/pixmaps/folder.xpm -share/gtkam/pixmaps/save_current_image.xpm +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/README +share/gnome/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:%%@exec scrollkeeper-install -q %D/share/gnome/omf/gtkam/gtkam-C.omf 2>/dev/null || true +%%GNOME:%%share/gnome/omf/gtkam/gtkam-C.omf +%%GNOME:%%@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gtkam/gtkam-C.omf 2>/dev/null || true +share/gnome/pixmaps/gtkam.png +%%DATADIR%%/images/gtkam-audio.png +%%DATADIR%%/images/gtkam-camera.png +%%DATADIR%%/images/gtkam-folder-camera.png +%%DATADIR%%/images/gtkam-folder.png +%%DATADIR%%/images/gtkam-lock.png +%%DATADIR%%/images/gtkam-new.png +%%DATADIR%%/pixmaps/camera.xpm +%%DATADIR%%/pixmaps/configure.xpm +%%DATADIR%%/pixmaps/delete_images.xpm +%%DATADIR%%/pixmaps/exit.xpm +%%DATADIR%%/pixmaps/folder.xpm +%%DATADIR%%/pixmaps/save_current_image.xpm +share/locale/cs/LC_MESSAGES/gtkam.mo share/locale/da/LC_MESSAGES/gtkam.mo share/locale/de/LC_MESSAGES/gtkam.mo share/locale/es/LC_MESSAGES/gtkam.mo @@ -29,7 +44,11 @@ share/locale/ru/LC_MESSAGES/gtkam.mo share/locale/sl/LC_MESSAGES/gtkam.mo share/locale/sv/LC_MESSAGES/gtkam.mo share/locale/uk/LC_MESSAGES/gtkam.mo -@dirrm share/gtkam/pixmaps -@dirrm share/gtkam/images -@dirrm share/gtkam -%%PORTDOCS%%@dirrm share/doc/gtkam +@dirrm %%DATADIR%%/pixmaps +@dirrm %%DATADIR%%/images +@dirrm %%DATADIR%% +%%GNOME:%%@dirrm share/gnome/omf/gtkam +%%GNOME:%%@dirrm share/gnome/help/gtkam/C/figures +%%GNOME:%%@dirrm share/gnome/help/gtkam/C +%%GNOME:%%@dirrm share/gnome/help/gtkam +%%PORTDOCS%%@dirrm %%DOCSDIR%%