summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/gimp-devel/Makefile3
-rw-r--r--print/Makefile1
-rw-r--r--print/gimp-devel-gutenprint/Makefile4
-rw-r--r--print/gutenprint-base/Makefile12
4 files changed, 13 insertions, 7 deletions
diff --git a/graphics/gimp-devel/Makefile b/graphics/gimp-devel/Makefile
index 8f04dede40c9..af3f6623ea07 100644
--- a/graphics/gimp-devel/Makefile
+++ b/graphics/gimp-devel/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gimp
PORTVERSION?= 2.3
+PORTREVISION= 1
PORTEPOCH?= 2
CATEGORIES= graphics gnome
MASTER_SITES?= # empty
@@ -43,7 +44,7 @@ RUN_DEPENDS+= ${LOCALBASE}/libexec/gimp/2.2/environ/pygimp.env:${PORTSDIR}/graph
.endif
.if !defined(WITHOUT_PRINT)
-RUN_DEPENDS+= ${LOCALBASE}/libexec/gimp/2.2/plug-ins/print:${PORTSDIR}/print/gimp-gutenprint
+RUN_DEPENDS+= ${LOCALBASE}/libexec/gimp/2.2/plug-ins/print:${PORTSDIR}/print/gimp-devel-gutenprint
.endif
do-install: # empty
diff --git a/print/Makefile b/print/Makefile
index 1ea88ab409eb..213ff79ea119 100644
--- a/print/Makefile
+++ b/print/Makefile
@@ -92,6 +92,7 @@
SUBDIR += ghostscript-gpl
SUBDIR += ghostscript-gpl-nox11
SUBDIR += ghostview
+ SUBDIR += gimp-devel-gutenprint
SUBDIR += gimp-gutenprint
SUBDIR += gimp-print
SUBDIR += gl2ps
diff --git a/print/gimp-devel-gutenprint/Makefile b/print/gimp-devel-gutenprint/Makefile
index 109e99f4ee79..1f3caba12491 100644
--- a/print/gimp-devel-gutenprint/Makefile
+++ b/print/gimp-devel-gutenprint/Makefile
@@ -7,7 +7,7 @@
PORTREVISION= 0
PORTEPOCH= 0
-PKGNAMEPREFIX= gimp-
+PKGNAMEPREFIX= gimp-devel-
PKGNAMESUFFIX= # empty
MAINTAINER= ahze@FreeBSD.org
@@ -15,7 +15,7 @@ COMMENT= Gimp print plug-in
MASTERDIR= ${.CURDIR}/../../print/gutenprint-base
-GUT_SLAVE= gimp
+GUT_SLAVE= gimp-devel
PLIST= ${.CURDIR}/pkg-plist
.include "${MASTERDIR}/Makefile"
diff --git a/print/gutenprint-base/Makefile b/print/gutenprint-base/Makefile
index 44325388fe04..447d3334c46f 100644
--- a/print/gutenprint-base/Makefile
+++ b/print/gutenprint-base/Makefile
@@ -1,4 +1,4 @@
-# ports collection makefile for: [Jgimp-print
+# ports collection makefile for: gimp-print
# Date Created: 2002 01 02
# Whom: dgilbert@velocet.ca
#
@@ -43,9 +43,13 @@ GUTENPRINTUI2_LIBS=`${PKG_CONFIG} --libs gutenprintui2`
MAN1+= escputil.1
.endif
-.if defined(GUT_SLAVE) && ${GUT_SLAVE}=="gimp"
-LIB_DEPENDS+= gimp-2.0:${PORTSDIR}/graphics/gimp-app \
- gutenprint.2:${PORTSDIR}/print/gutenprint-base
+.if defined(GUT_SLAVE) && (${GUT_SLAVE}=="gimp" || ${GUT_SLAVE}=="gimp-devel")
+.if ${GUT_SLAVE}=="gimp"
+LIB_DEPENDS+= gimp-2.0:${PORTSDIR}/graphics/gimp-app
+.elif ${GUT_SLAVE}=="gimp-devel"
+LIB_DEPENDS+= gimp-2.0:${PORTSDIR}/graphics/gimp-app-devel
+.endif
+LIB_DEPENDS+= gutenprint.2:${PORTSDIR}/print/gutenprint-base
CONFIGURE_ARGS=--with-gimp2=yes # Override CONFIGURE_ARGS
BUILD_WRKSRC= ${WRKSRC}/src/gimp2
INSTALL_WRKSRC= ${WRKSRC}/src/gimp2