aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@FreeBSD.org>2004-01-22 01:30:27 +0800
committermarcus <marcus@FreeBSD.org>2004-01-22 01:30:27 +0800
commitc8157deecebf0cddac4fbf3dcf48e5cc9f44d5a0 (patch)
tree71b6098238d141836043874780d8105378f991db
parent6de147929097ee2d663c8c751c06ea661637496e (diff)
downloadfreebsd-ports-gnome-c8157deecebf0cddac4fbf3dcf48e5cc9f44d5a0.tar.gz
freebsd-ports-gnome-c8157deecebf0cddac4fbf3dcf48e5cc9f44d5a0.tar.zst
freebsd-ports-gnome-c8157deecebf0cddac4fbf3dcf48e5cc9f44d5a0.zip
* Fix the GNOME desktop entry to call gimp-1.3 instead of gimp-remote-1.3
as the latter didn't work correctly from the menu * Conditionalize installation of the print plug-in [1] Submitted by: clement
Diffstat
-rw-r--r--graphics/gimp-app-devel/Makefile3
-rw-r--r--graphics/gimp-app-devel/files/patch-data_misc_gimp.desktop.in.in11
-rw-r--r--graphics/gimp-app-devel/pkg-plist2
-rw-r--r--graphics/gimp-app/Makefile3
-rw-r--r--graphics/gimp-app/files/patch-data_misc_gimp.desktop.in.in11
-rw-r--r--graphics/gimp-app/pkg-plist2
-rw-r--r--graphics/gimp-devel/Makefile3
-rw-r--r--graphics/gimp-devel/files/patch-data_misc_gimp.desktop.in.in11
-rw-r--r--graphics/gimp-devel/pkg-plist2
-rw-r--r--graphics/gimp/Makefile3
-rw-r--r--graphics/gimp/files/patch-data_misc_gimp.desktop.in.in11
-rw-r--r--graphics/gimp/pkg-plist2
-rw-r--r--graphics/gimpshop/Makefile3
-rw-r--r--graphics/gimpshop/files/patch-data_misc_gimp.desktop.in.in11
-rw-r--r--graphics/gimpshop/pkg-plist2
15 files changed, 75 insertions, 5 deletions
diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile
index 6077f19ee374..d84babbd6cfc 100644
--- a/graphics/gimp-app-devel/Makefile
+++ b/graphics/gimp-app-devel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gimp
PORTVERSION= 2.0.pre2
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= graphics gnome
MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -66,8 +67,10 @@ PLIST_SUB+= PYTHON:="@comment "
.if defined(WITHOUT_PRINT)
CONFIGURE_ARGS+= --disable-print
+PLIST_SUB+= PRINT="@comment "
.else
LIB_DEPENDS+= gimpprint.2:${PORTSDIR}/print/gimp-print
+PLIST_SUB+= PRINT=""
.endif
.include <bsd.port.pre.mk>
diff --git a/graphics/gimp-app-devel/files/patch-data_misc_gimp.desktop.in.in b/graphics/gimp-app-devel/files/patch-data_misc_gimp.desktop.in.in
new file mode 100644
index 000000000000..03a3e522d44f
--- /dev/null
+++ b/graphics/gimp-app-devel/files/patch-data_misc_gimp.desktop.in.in
@@ -0,0 +1,11 @@
+--- data/misc/gimp.desktop.in.in.orig Wed Jan 21 12:24:16 2004
++++ data/misc/gimp.desktop.in.in Wed Jan 21 12:27:36 2004
+@@ -3,7 +3,7 @@
+ _Name=The GIMP (unstable)
+ _Comment=Create and edit images or photographs
+ TryExec=gimp-1.3
+-Exec=gimp-remote-1.3 --new %U
++Exec=gimp-1.3
+ Icon=@gimpdatadir@/images/wilber-icon.png
+ Terminal=false
+ Type=Application
diff --git a/graphics/gimp-app-devel/pkg-plist b/graphics/gimp-app-devel/pkg-plist
index deba9c10f661..4f6f187c78f6 100644
--- a/graphics/gimp-app-devel/pkg-plist
+++ b/graphics/gimp-app-devel/pkg-plist
@@ -279,7 +279,7 @@ libexec/gimp/1.3/plug-ins/plugindetails
libexec/gimp/1.3/plug-ins/png
libexec/gimp/1.3/plug-ins/pnm
libexec/gimp/1.3/plug-ins/polar
-libexec/gimp/1.3/plug-ins/print
+%%PRINT%%libexec/gimp/1.3/plug-ins/print
libexec/gimp/1.3/plug-ins/ps
libexec/gimp/1.3/plug-ins/psd
libexec/gimp/1.3/plug-ins/psd_save
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index 6077f19ee374..d84babbd6cfc 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gimp
PORTVERSION= 2.0.pre2
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= graphics gnome
MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -66,8 +67,10 @@ PLIST_SUB+= PYTHON:="@comment "
.if defined(WITHOUT_PRINT)
CONFIGURE_ARGS+= --disable-print
+PLIST_SUB+= PRINT="@comment "
.else
LIB_DEPENDS+= gimpprint.2:${PORTSDIR}/print/gimp-print
+PLIST_SUB+= PRINT=""
.endif
.include <bsd.port.pre.mk>
diff --git a/graphics/gimp-app/files/patch-data_misc_gimp.desktop.in.in b/graphics/gimp-app/files/patch-data_misc_gimp.desktop.in.in
new file mode 100644
index 000000000000..03a3e522d44f
--- /dev/null
+++ b/graphics/gimp-app/files/patch-data_misc_gimp.desktop.in.in
@@ -0,0 +1,11 @@
+--- data/misc/gimp.desktop.in.in.orig Wed Jan 21 12:24:16 2004
++++ data/misc/gimp.desktop.in.in Wed Jan 21 12:27:36 2004
+@@ -3,7 +3,7 @@
+ _Name=The GIMP (unstable)
+ _Comment=Create and edit images or photographs
+ TryExec=gimp-1.3
+-Exec=gimp-remote-1.3 --new %U
++Exec=gimp-1.3
+ Icon=@gimpdatadir@/images/wilber-icon.png
+ Terminal=false
+ Type=Application
diff --git a/graphics/gimp-app/pkg-plist b/graphics/gimp-app/pkg-plist
index deba9c10f661..4f6f187c78f6 100644
--- a/graphics/gimp-app/pkg-plist
+++ b/graphics/gimp-app/pkg-plist
@@ -279,7 +279,7 @@ libexec/gimp/1.3/plug-ins/plugindetails
libexec/gimp/1.3/plug-ins/png
libexec/gimp/1.3/plug-ins/pnm
libexec/gimp/1.3/plug-ins/polar
-libexec/gimp/1.3/plug-ins/print
+%%PRINT%%libexec/gimp/1.3/plug-ins/print
libexec/gimp/1.3/plug-ins/ps
libexec/gimp/1.3/plug-ins/psd
libexec/gimp/1.3/plug-ins/psd_save
diff --git a/graphics/gimp-devel/Makefile b/graphics/gimp-devel/Makefile
index 6077f19ee374..d84babbd6cfc 100644
--- a/graphics/gimp-devel/Makefile
+++ b/graphics/gimp-devel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gimp
PORTVERSION= 2.0.pre2
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= graphics gnome
MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -66,8 +67,10 @@ PLIST_SUB+= PYTHON:="@comment "
.if defined(WITHOUT_PRINT)
CONFIGURE_ARGS+= --disable-print
+PLIST_SUB+= PRINT="@comment "
.else
LIB_DEPENDS+= gimpprint.2:${PORTSDIR}/print/gimp-print
+PLIST_SUB+= PRINT=""
.endif
.include <bsd.port.pre.mk>
diff --git a/graphics/gimp-devel/files/patch-data_misc_gimp.desktop.in.in b/graphics/gimp-devel/files/patch-data_misc_gimp.desktop.in.in
new file mode 100644
index 000000000000..03a3e522d44f
--- /dev/null
+++ b/graphics/gimp-devel/files/patch-data_misc_gimp.desktop.in.in
@@ -0,0 +1,11 @@
+--- data/misc/gimp.desktop.in.in.orig Wed Jan 21 12:24:16 2004
++++ data/misc/gimp.desktop.in.in Wed Jan 21 12:27:36 2004
+@@ -3,7 +3,7 @@
+ _Name=The GIMP (unstable)
+ _Comment=Create and edit images or photographs
+ TryExec=gimp-1.3
+-Exec=gimp-remote-1.3 --new %U
++Exec=gimp-1.3
+ Icon=@gimpdatadir@/images/wilber-icon.png
+ Terminal=false
+ Type=Application
diff --git a/graphics/gimp-devel/pkg-plist b/graphics/gimp-devel/pkg-plist
index deba9c10f661..4f6f187c78f6 100644
--- a/graphics/gimp-devel/pkg-plist
+++ b/graphics/gimp-devel/pkg-plist
@@ -279,7 +279,7 @@ libexec/gimp/1.3/plug-ins/plugindetails
libexec/gimp/1.3/plug-ins/png
libexec/gimp/1.3/plug-ins/pnm
libexec/gimp/1.3/plug-ins/polar
-libexec/gimp/1.3/plug-ins/print
+%%PRINT%%libexec/gimp/1.3/plug-ins/print
libexec/gimp/1.3/plug-ins/ps
libexec/gimp/1.3/plug-ins/psd
libexec/gimp/1.3/plug-ins/psd_save
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 6077f19ee374..d84babbd6cfc 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gimp
PORTVERSION= 2.0.pre2
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= graphics gnome
MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -66,8 +67,10 @@ PLIST_SUB+= PYTHON:="@comment "
.if defined(WITHOUT_PRINT)
CONFIGURE_ARGS+= --disable-print
+PLIST_SUB+= PRINT="@comment "
.else
LIB_DEPENDS+= gimpprint.2:${PORTSDIR}/print/gimp-print
+PLIST_SUB+= PRINT=""
.endif
.include <bsd.port.pre.mk>
diff --git a/graphics/gimp/files/patch-data_misc_gimp.desktop.in.in b/graphics/gimp/files/patch-data_misc_gimp.desktop.in.in
new file mode 100644
index 000000000000..03a3e522d44f
--- /dev/null
+++ b/graphics/gimp/files/patch-data_misc_gimp.desktop.in.in
@@ -0,0 +1,11 @@
+--- data/misc/gimp.desktop.in.in.orig Wed Jan 21 12:24:16 2004
++++ data/misc/gimp.desktop.in.in Wed Jan 21 12:27:36 2004
+@@ -3,7 +3,7 @@
+ _Name=The GIMP (unstable)
+ _Comment=Create and edit images or photographs
+ TryExec=gimp-1.3
+-Exec=gimp-remote-1.3 --new %U
++Exec=gimp-1.3
+ Icon=@gimpdatadir@/images/wilber-icon.png
+ Terminal=false
+ Type=Application
diff --git a/graphics/gimp/pkg-plist b/graphics/gimp/pkg-plist
index deba9c10f661..4f6f187c78f6 100644
--- a/graphics/gimp/pkg-plist
+++ b/graphics/gimp/pkg-plist
@@ -279,7 +279,7 @@ libexec/gimp/1.3/plug-ins/plugindetails
libexec/gimp/1.3/plug-ins/png
libexec/gimp/1.3/plug-ins/pnm
libexec/gimp/1.3/plug-ins/polar
-libexec/gimp/1.3/plug-ins/print
+%%PRINT%%libexec/gimp/1.3/plug-ins/print
libexec/gimp/1.3/plug-ins/ps
libexec/gimp/1.3/plug-ins/psd
libexec/gimp/1.3/plug-ins/psd_save
diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile
index 6077f19ee374..d84babbd6cfc 100644
--- a/graphics/gimpshop/Makefile
+++ b/graphics/gimpshop/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gimp
PORTVERSION= 2.0.pre2
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= graphics gnome
MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -66,8 +67,10 @@ PLIST_SUB+= PYTHON:="@comment "
.if defined(WITHOUT_PRINT)
CONFIGURE_ARGS+= --disable-print
+PLIST_SUB+= PRINT="@comment "
.else
LIB_DEPENDS+= gimpprint.2:${PORTSDIR}/print/gimp-print
+PLIST_SUB+= PRINT=""
.endif
.include <bsd.port.pre.mk>
diff --git a/graphics/gimpshop/files/patch-data_misc_gimp.desktop.in.in b/graphics/gimpshop/files/patch-data_misc_gimp.desktop.in.in
new file mode 100644
index 000000000000..03a3e522d44f
--- /dev/null
+++ b/graphics/gimpshop/files/patch-data_misc_gimp.desktop.in.in
@@ -0,0 +1,11 @@
+--- data/misc/gimp.desktop.in.in.orig Wed Jan 21 12:24:16 2004
++++ data/misc/gimp.desktop.in.in Wed Jan 21 12:27:36 2004
+@@ -3,7 +3,7 @@
+ _Name=The GIMP (unstable)
+ _Comment=Create and edit images or photographs
+ TryExec=gimp-1.3
+-Exec=gimp-remote-1.3 --new %U
++Exec=gimp-1.3
+ Icon=@gimpdatadir@/images/wilber-icon.png
+ Terminal=false
+ Type=Application
diff --git a/graphics/gimpshop/pkg-plist b/graphics/gimpshop/pkg-plist
index deba9c10f661..4f6f187c78f6 100644
--- a/graphics/gimpshop/pkg-plist
+++ b/graphics/gimpshop/pkg-plist
@@ -279,7 +279,7 @@ libexec/gimp/1.3/plug-ins/plugindetails
libexec/gimp/1.3/plug-ins/png
libexec/gimp/1.3/plug-ins/pnm
libexec/gimp/1.3/plug-ins/polar
-libexec/gimp/1.3/plug-ins/print
+%%PRINT%%libexec/gimp/1.3/plug-ins/print
libexec/gimp/1.3/plug-ins/ps
libexec/gimp/1.3/plug-ins/psd
libexec/gimp/1.3/plug-ins/psd_save
generated by cgit (git 2.34.1) at 2024-11-25 03:24:52 +0800