From 6a51c00002337ed19ce074821121ac5788ca6b92 Mon Sep 17 00:00:00 2001 From: krion Date: Fri, 26 Mar 2004 14:42:36 +0000 Subject: - Fix build with gimp-2.0.0 PR: ports/64763 Submitted by: Ports Fury --- graphics/gtkam/Makefile | 7 ++++--- graphics/gtkam/files/patch-src_Makefile.in | 2 +- graphics/gtkam/pkg-plist | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) (limited to 'graphics') diff --git a/graphics/gtkam/Makefile b/graphics/gtkam/Makefile index 96634e7a4d52..15dffeadf5e8 100644 --- a/graphics/gtkam/Makefile +++ b/graphics/gtkam/Makefile @@ -28,12 +28,12 @@ MAN1= gtkam.1 .include -.if exists(${X11BASE}/lib/libgimp-1.3.so) +.if exists(${X11BASE}/lib/libgimp-2.0.so) WITH_GIMP= yes .endif .if defined(WITH_GIMP) -LIB_DEPENDS+= gimp-1.3:${PORTSDIR}/graphics/gimp-devel +LIB_DEPENDS+= gimp-2.0:${PORTSDIR}/graphics/gimp-devel PLIST_SUB+= GIMP="" .else CONFIGURE_ARGS+= --without-gimp @@ -59,7 +59,8 @@ pre-everything:: .endif post-patch: - @${REINPLACE_CMD} -e 's|-g -Wall||g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|-g -Wall||g ; \ + s|gimpui-1.3|gimpui-2.0|g' ${WRKSRC}/configure @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ 's|images/gtkam|gtkam/images|g' diff --git a/graphics/gtkam/files/patch-src_Makefile.in b/graphics/gtkam/files/patch-src_Makefile.in index dbbc39c5c682..6c213beccd56 100644 --- a/graphics/gtkam/files/patch-src_Makefile.in +++ b/graphics/gtkam/files/patch-src_Makefile.in @@ -5,7 +5,7 @@ -@HAVE_GIMP_TRUE@gtkam_gimp_libexecdir = $(libdir)/gimp/1.3/plug-ins -+@HAVE_GIMP_TRUE@gtkam_gimp_libexecdir = $(libexecdir)/gimp/1.3/plug-ins ++@HAVE_GIMP_TRUE@gtkam_gimp_libexecdir = $(libexecdir)/gimp/2.0/plug-ins @HAVE_GIMP_TRUE@gtkam_gimp_libexec_PROGRAMS = gtkam-gimp @HAVE_GIMP_TRUE@gtkam_gimp_SOURCES = gtkam-gimp.c @HAVE_GIMP_TRUE@gtkam_gimp_LDADD = \ diff --git a/graphics/gtkam/pkg-plist b/graphics/gtkam/pkg-plist index a8efb1447dcf..4400bde58c7c 100644 --- a/graphics/gtkam/pkg-plist +++ b/graphics/gtkam/pkg-plist @@ -1,5 +1,5 @@ bin/gtkam -%%GIMP%%libexec/gimp/1.3/plug-ins/gtkam-gimp +%%GIMP%%libexec/gimp/2.0/plug-ins/gtkam-gimp %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README -- cgit