aboutsummaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authortheraven <theraven@FreeBSD.org>2013-08-29 02:26:01 +0800
committertheraven <theraven@FreeBSD.org>2013-08-29 02:26:01 +0800
commit93403bfd81b1d886476fb8cff35443caf1f078ed (patch)
treeab5064afd823ae17563635026226e53774a6614d /graphics
parent423247221bb4172753a74ac9b8e532553e2d4f7c (diff)
downloadfreebsd-ports-gnome-93403bfd81b1d886476fb8cff35443caf1f078ed.tar.gz
freebsd-ports-gnome-93403bfd81b1d886476fb8cff35443caf1f078ed.tar.zst
freebsd-ports-gnome-93403bfd81b1d886476fb8cff35443caf1f078ed.zip
Update to latest GNUstep core libraries.
Update dependent packages with more recent releases. Remove old and bit-rotted ones. Switch to using clang 3.3 and libobjc2 1.7 by default, so modern Objective-C features work out of the box and remove a lot of configurable options for sub-optimal (and, often, unsupported / deprecated upstream) configurations. Take maintainership of GNUstep-related ports. Several of the ports left in have scary warnings which mean that they are likely broken in lots of cases. Future commits will fix them. Approved by: bapt
Diffstat (limited to 'graphics')
-rw-r--r--graphics/cenon/Makefile15
-rw-r--r--graphics/cenon/distinfo8
-rw-r--r--graphics/cenon/pkg-plist64
-rw-r--r--graphics/gnustep-slideshow/Makefile4
-rw-r--r--graphics/gnustep-slideshow/files/patch-Controller.m41
-rw-r--r--graphics/preview/files/patch-Document.m9
6 files changed, 78 insertions, 63 deletions
diff --git a/graphics/cenon/Makefile b/graphics/cenon/Makefile
index 9cda1f1d678b..3887fa7fbe9a 100644
--- a/graphics/cenon/Makefile
+++ b/graphics/cenon/Makefile
@@ -1,12 +1,9 @@
-# New ports collection makefile for: Cenon
-# Date created: 16 Nov 2005
-# Whom: Alexey Dokuchaev <danfe@FreeBSD.org>
-#
+# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
# $FreeBSD$
#
PORTNAME= cenon
-PORTVERSION= 3.95
+PORTVERSION= 4.0.2
CATEGORIES= graphics gnustep
MASTER_SITES= http://www.vhf-group.com/vhf-interservice/download/source/
DISTNAME= Cenon-${MAINVERSION}
@@ -14,7 +11,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
DIST_SUBDIR= ${PORTNAME}
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= theraven@FreeBSD.org
COMMENT= A vector graphics tool for GNUstep
USE_BZIP2= yes
@@ -24,12 +21,12 @@ USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
WRKSRC= ${WRKDIR}/Cenon
-MAINVERSION= 3.9.5
-FULLVERSION= 3.9.4
+MAINVERSION= 4.0.2
+FULLVERSION= 4.0.0
CENON_LIB_DIR= ${GNUSTEP_LOCAL_ROOT}/Library/Cenon
OPTIONS_DEFINE= FULL_LIBRARY
-FULL_LIBRARY_DESC= Install complete Cenon Library
+FULL_LIBRARY_DESC= Install complete Cenon Library
.include <bsd.port.options.mk>
diff --git a/graphics/cenon/distinfo b/graphics/cenon/distinfo
index f4f55434e90b..e021ac05ce56 100644
--- a/graphics/cenon/distinfo
+++ b/graphics/cenon/distinfo
@@ -1,4 +1,4 @@
-SHA256 (cenon/Cenon-3.9.5.tar.bz2) = 523049066f88e9e022127c017633b0431a29b9eda847e875c8c82d1f976f4977
-SIZE (cenon/Cenon-3.9.5.tar.bz2) = 2003607
-SHA256 (cenon/CenonLibrary-3.9.4-1.tar.bz2) = eecb3c588f65cbe68db902e2c29264904a04b1042f74b598695667cd9aeea761
-SIZE (cenon/CenonLibrary-3.9.4-1.tar.bz2) = 2058146
+SHA256 (cenon/Cenon-4.0.2.tar.bz2) = 8c8906225e188747bf80499886c289786ffc27c6e051dafe12567542f9ef0693
+SIZE (cenon/Cenon-4.0.2.tar.bz2) = 4143462
+SHA256 (cenon/CenonLibrary-4.0.0-1.tar.bz2) = b329331a4b5b40d93eeeddd98f6922a53401b6e4f437538cd98392f8828cbb44
+SIZE (cenon/CenonLibrary-4.0.0-1.tar.bz2) = 2131692
diff --git a/graphics/cenon/pkg-plist b/graphics/cenon/pkg-plist
index b7b75519baa8..9766476e3b73 100644
--- a/graphics/cenon/pkg-plist
+++ b/graphics/cenon/pkg-plist
@@ -92,14 +92,6 @@ GNUstep/Local/Applications/Cenon.app/Resources/English.lproj/LayerDetails.nib/cl
GNUstep/Local/Applications/Cenon.app/Resources/English.lproj/LayerDetails.nib/info.nib
GNUstep/Local/Applications/Cenon.app/Resources/English.lproj/LayerDetails.nib/keyedobjects.nib
GNUstep/Local/Applications/Cenon.app/Resources/English.lproj/Localizable.strings
-GNUstep/Local/Applications/Cenon.app/Resources/English.lproj/Main.nib/classes.nib
-GNUstep/Local/Applications/Cenon.app/Resources/English.lproj/Main.nib/info.nib
-GNUstep/Local/Applications/Cenon.app/Resources/English.lproj/Main.nib/keyedobjects.nib
-GNUstep/Local/Applications/Cenon.app/Resources/English.lproj/Main.nib/sortColLLUR.tiff
-GNUstep/Local/Applications/Cenon.app/Resources/English.lproj/Main.nib/sortColULLR.tiff
-GNUstep/Local/Applications/Cenon.app/Resources/English.lproj/Main.nib/sortColURLL.tiff
-GNUstep/Local/Applications/Cenon.app/Resources/English.lproj/Main.nib/sortRowLLUR.tiff
-GNUstep/Local/Applications/Cenon.app/Resources/English.lproj/Main.nib/sortRowULLR.tiff
GNUstep/Local/Applications/Cenon.app/Resources/English.lproj/Operations.strings
GNUstep/Local/Applications/Cenon.app/Resources/English.lproj/PSFontInfo.nib/classes.nib
GNUstep/Local/Applications/Cenon.app/Resources/English.lproj/PSFontInfo.nib/info.nib
@@ -110,9 +102,6 @@ GNUstep/Local/Applications/Cenon.app/Resources/English.lproj/PSInfo.nib/keyedobj
GNUstep/Local/Applications/Cenon.app/Resources/English.lproj/PSSettings.nib/classes.nib
GNUstep/Local/Applications/Cenon.app/Resources/English.lproj/PSSettings.nib/info.nib
GNUstep/Local/Applications/Cenon.app/Resources/English.lproj/PSSettings.nib/keyedobjects.nib
-GNUstep/Local/Applications/Cenon.app/Resources/English.lproj/PreferencesPanel.nib/classes.nib
-GNUstep/Local/Applications/Cenon.app/Resources/English.lproj/PreferencesPanel.nib/info.nib
-GNUstep/Local/Applications/Cenon.app/Resources/English.lproj/PreferencesPanel.nib/keyedobjects.nib
GNUstep/Local/Applications/Cenon.app/Resources/English.lproj/PrintPanelAccessory.nib/classes.nib
GNUstep/Local/Applications/Cenon.app/Resources/English.lproj/PrintPanelAccessory.nib/info.nib
GNUstep/Local/Applications/Cenon.app/Resources/English.lproj/PrintPanelAccessory.nib/keyedobjects.nib
@@ -253,14 +242,6 @@ GNUstep/Local/Applications/Cenon.app/Resources/German.lproj/LayerDetails.nib/cla
GNUstep/Local/Applications/Cenon.app/Resources/German.lproj/LayerDetails.nib/info.nib
GNUstep/Local/Applications/Cenon.app/Resources/German.lproj/LayerDetails.nib/keyedobjects.nib
GNUstep/Local/Applications/Cenon.app/Resources/German.lproj/Localizable.strings
-GNUstep/Local/Applications/Cenon.app/Resources/German.lproj/Main.nib/classes.nib
-GNUstep/Local/Applications/Cenon.app/Resources/German.lproj/Main.nib/info.nib
-GNUstep/Local/Applications/Cenon.app/Resources/German.lproj/Main.nib/keyedobjects.nib
-GNUstep/Local/Applications/Cenon.app/Resources/German.lproj/Main.nib/sortColLLUR.tiff
-GNUstep/Local/Applications/Cenon.app/Resources/German.lproj/Main.nib/sortColULLR.tiff
-GNUstep/Local/Applications/Cenon.app/Resources/German.lproj/Main.nib/sortColURLL.tiff
-GNUstep/Local/Applications/Cenon.app/Resources/German.lproj/Main.nib/sortRowLLUR.tiff
-GNUstep/Local/Applications/Cenon.app/Resources/German.lproj/Main.nib/sortRowULLR.tiff
GNUstep/Local/Applications/Cenon.app/Resources/German.lproj/Operations.strings
GNUstep/Local/Applications/Cenon.app/Resources/German.lproj/PSInfo.nib/classes.nib
GNUstep/Local/Applications/Cenon.app/Resources/German.lproj/PSInfo.nib/info.nib
@@ -268,9 +249,6 @@ GNUstep/Local/Applications/Cenon.app/Resources/German.lproj/PSInfo.nib/keyedobje
GNUstep/Local/Applications/Cenon.app/Resources/German.lproj/PSSettings.nib/classes.nib
GNUstep/Local/Applications/Cenon.app/Resources/German.lproj/PSSettings.nib/info.nib
GNUstep/Local/Applications/Cenon.app/Resources/German.lproj/PSSettings.nib/keyedobjects.nib
-GNUstep/Local/Applications/Cenon.app/Resources/German.lproj/PreferencesPanel.nib/classes.nib
-GNUstep/Local/Applications/Cenon.app/Resources/German.lproj/PreferencesPanel.nib/info.nib
-GNUstep/Local/Applications/Cenon.app/Resources/German.lproj/PreferencesPanel.nib/objects.nib
GNUstep/Local/Applications/Cenon.app/Resources/German.lproj/PrintPanelAccessory.nib/classes.nib
GNUstep/Local/Applications/Cenon.app/Resources/German.lproj/PrintPanelAccessory.nib/info.nib
GNUstep/Local/Applications/Cenon.app/Resources/German.lproj/PrintPanelAccessory.nib/keyedobjects.nib
@@ -332,12 +310,7 @@ GNUstep/Local/Applications/Cenon.app/Resources/Import.prefs/Resources/Info-gnust
GNUstep/Local/Applications/Cenon.app/Resources/Import.prefs/Resources/prefsImport.tiff
GNUstep/Local/Applications/Cenon.app/Resources/Import.prefs/stamp.make
GNUstep/Local/Applications/Cenon.app/Resources/Info-gnustep.plist
-GNUstep/Local/Applications/Cenon.app/Resources/Info.nib/._keyedobjects.nib
-GNUstep/Local/Applications/Cenon.app/Resources/Info.nib/classes.nib
-GNUstep/Local/Applications/Cenon.app/Resources/Info.nib/info.nib
-GNUstep/Local/Applications/Cenon.app/Resources/Info.nib/keyedobjects.nib
GNUstep/Local/Applications/Cenon.app/Resources/Info.tiff
-GNUstep/Local/Applications/Cenon.app/Resources/InspectorPanel.nib/._keyedobjects.nib
GNUstep/Local/Applications/Cenon.app/Resources/InspectorPanel.nib/buttonFilling.tiff
GNUstep/Local/Applications/Cenon.app/Resources/InspectorPanel.nib/buttonLayers.tiff
GNUstep/Local/Applications/Cenon.app/Resources/InspectorPanel.nib/buttonStroke.tiff
@@ -346,21 +319,6 @@ GNUstep/Local/Applications/Cenon.app/Resources/InspectorPanel.nib/classes.nib
GNUstep/Local/Applications/Cenon.app/Resources/InspectorPanel.nib/info.nib
GNUstep/Local/Applications/Cenon.app/Resources/InspectorPanel.nib/keyedobjects.nib
GNUstep/Local/Applications/Cenon.app/Resources/SinkingMetrics.plist
-GNUstep/Local/Applications/Cenon.app/Resources/ToolPanel.nib/classes.nib
-GNUstep/Local/Applications/Cenon.app/Resources/ToolPanel.nib/info.nib
-GNUstep/Local/Applications/Cenon.app/Resources/ToolPanel.nib/keyedobjects.nib
-GNUstep/Local/Applications/Cenon.app/Resources/ToolPanel.nib/toolArc.tiff
-GNUstep/Local/Applications/Cenon.app/Resources/ToolPanel.nib/toolArrow.tiff
-GNUstep/Local/Applications/Cenon.app/Resources/ToolPanel.nib/toolCurve.tiff
-GNUstep/Local/Applications/Cenon.app/Resources/ToolPanel.nib/toolCutter.tiff
-GNUstep/Local/Applications/Cenon.app/Resources/ToolPanel.nib/toolLine.tiff
-GNUstep/Local/Applications/Cenon.app/Resources/ToolPanel.nib/toolMark.tiff
-GNUstep/Local/Applications/Cenon.app/Resources/ToolPanel.nib/toolPolyLine.tiff
-GNUstep/Local/Applications/Cenon.app/Resources/ToolPanel.nib/toolRectangle.tiff
-GNUstep/Local/Applications/Cenon.app/Resources/ToolPanel.nib/toolRotate.tiff
-GNUstep/Local/Applications/Cenon.app/Resources/ToolPanel.nib/toolSinking.tiff
-GNUstep/Local/Applications/Cenon.app/Resources/ToolPanel.nib/toolText.tiff
-GNUstep/Local/Applications/Cenon.app/Resources/ToolPanel.nib/toolWeb.tiff
GNUstep/Local/Applications/Cenon.app/Resources/alignHCenter.tiff
GNUstep/Local/Applications/Cenon.app/Resources/alignHLeft.tiff
GNUstep/Local/Applications/Cenon.app/Resources/alignHRight.tiff
@@ -469,7 +427,6 @@ GNUstep/Local/Applications/Cenon.app/Resources/typeHPGL_128x128.tiff
GNUstep/Local/Applications/Cenon.app/Resources/typeHPGL_48x48.tiff
GNUstep/Local/Applications/Cenon.app/Resources/typePS.tiff
GNUstep/Local/Applications/Cenon.app/stamp.make
-%%LITE%%GNUstep/Local/Library/Cenon/._README
GNUstep/Local/Library/Cenon/.dir.tiff
GNUstep/Local/Library/Cenon/COPYRIGHT
GNUstep/Local/Library/Cenon/Devices/.dir.tiff
@@ -638,6 +595,21 @@ GNUstep/Local/Tools/Cenon
%%FULL%%@dirrm GNUstep/Local/Library/Cenon/Examples
%%FULL%%@dirrm GNUstep/Local/Library/Cenon/Documentation/SinkingMetrics.cenon
%%FULL%%@dirrm GNUstep/Local/Library/Cenon/Documentation
+GNUstep/Local/Applications/Cenon.app/Resources/English.lproj/Main.xib
+GNUstep/Local/Applications/Cenon.app/Resources/English.lproj/PreferencesPanel.xib
+GNUstep/Local/Applications/Cenon.app/Resources/English.lproj/Vectorizer.xib
+GNUstep/Local/Applications/Cenon.app/Resources/German.lproj/Main.xib
+GNUstep/Local/Applications/Cenon.app/Resources/German.lproj/PreferencesPanel.xib
+GNUstep/Local/Applications/Cenon.app/Resources/German.lproj/Vectorizer.xib
+GNUstep/Local/Applications/Cenon.app/Resources/Info.xib
+GNUstep/Local/Applications/Cenon.app/Resources/ToolPanel.xib
+GNUstep/Local/Applications/Cenon.app/Resources/psImportAI3_old.prolog
+GNUstep/Local/Applications/Cenon.app/Resources/typeICut.tiff
+GNUstep/Local/Applications/Cenon.app/Resources/typeICut_%%MAJORVERSION%%8x%%MAJORVERSION%%8.tiff
+GNUstep/Local/Applications/Cenon.app/Resources/typeICut_128x128.tiff
+GNUstep/Local/Applications/Cenon.app/Resources/typePDF.tiff
+@dirrm GNUstep/Local/Applications/Cenon.app/Resources/German.lproj
+@dirrm GNUstep/Local/Applications/Cenon.app/Resources/English.lproj
@dirrm GNUstep/Local/Library/Cenon/Projects/Cenon.cenon
@dirrm GNUstep/Local/Library/Cenon/Projects
@dirrm GNUstep/Local/Library/Cenon/Devices/hpgl
@@ -645,9 +617,7 @@ GNUstep/Local/Tools/Cenon
@dirrm GNUstep/Local/Library/Cenon/Devices/din
@dirrm GNUstep/Local/Library/Cenon/Devices
@dirrm GNUstep/Local/Library/Cenon
-@dirrm GNUstep/Local/Applications/Cenon.app/Resources/ToolPanel.nib
@dirrm GNUstep/Local/Applications/Cenon.app/Resources/InspectorPanel.nib
-@dirrm GNUstep/Local/Applications/Cenon.app/Resources/Info.nib
@dirrm GNUstep/Local/Applications/Cenon.app/Resources/Import.prefs/Resources/German.lproj/Import.nib
@dirrm GNUstep/Local/Applications/Cenon.app/Resources/Import.prefs/Resources/German.lproj
@dirrm GNUstep/Local/Applications/Cenon.app/Resources/Import.prefs/Resources/English.lproj/Import.nib
@@ -664,10 +634,8 @@ GNUstep/Local/Tools/Cenon
@dirrm GNUstep/Local/Applications/Cenon.app/Resources/German.lproj/TPAlign.nib
@dirrm GNUstep/Local/Applications/Cenon.app/Resources/German.lproj/ProjectSettingsPanel.nib
@dirrm GNUstep/Local/Applications/Cenon.app/Resources/German.lproj/PrintPanelAccessory.nib
-@dirrm GNUstep/Local/Applications/Cenon.app/Resources/German.lproj/PreferencesPanel.nib
@dirrm GNUstep/Local/Applications/Cenon.app/Resources/German.lproj/PSSettings.nib
@dirrm GNUstep/Local/Applications/Cenon.app/Resources/German.lproj/PSInfo.nib
-@dirrm GNUstep/Local/Applications/Cenon.app/Resources/German.lproj/Main.nib
@dirrm GNUstep/Local/Applications/Cenon.app/Resources/German.lproj/LayerDetails.nib
@dirrm GNUstep/Local/Applications/Cenon.app/Resources/German.lproj/IntersectionPanel.nib
@dirrm GNUstep/Local/Applications/Cenon.app/Resources/German.lproj/IPWeb.nib
@@ -716,11 +684,9 @@ GNUstep/Local/Tools/Cenon
@dirrm GNUstep/Local/Applications/Cenon.app/Resources/English.lproj/TPAlign.nib
@dirrm GNUstep/Local/Applications/Cenon.app/Resources/English.lproj/ProjectSettingsPanel.nib
@dirrm GNUstep/Local/Applications/Cenon.app/Resources/English.lproj/PrintPanelAccessory.nib
-@dirrm GNUstep/Local/Applications/Cenon.app/Resources/English.lproj/PreferencesPanel.nib
@dirrm GNUstep/Local/Applications/Cenon.app/Resources/English.lproj/PSSettings.nib
@dirrm GNUstep/Local/Applications/Cenon.app/Resources/English.lproj/PSInfo.nib
@dirrm GNUstep/Local/Applications/Cenon.app/Resources/English.lproj/PSFontInfo.nib
-@dirrm GNUstep/Local/Applications/Cenon.app/Resources/English.lproj/Main.nib
@dirrm GNUstep/Local/Applications/Cenon.app/Resources/English.lproj/LayerDetails.nib
@dirrm GNUstep/Local/Applications/Cenon.app/Resources/English.lproj/IntersectionPanel.nib
@dirrm GNUstep/Local/Applications/Cenon.app/Resources/English.lproj/IPWeb.nib
diff --git a/graphics/gnustep-slideshow/Makefile b/graphics/gnustep-slideshow/Makefile
index 27e1effe36dc..efe09decdc4f 100644
--- a/graphics/gnustep-slideshow/Makefile
+++ b/graphics/gnustep-slideshow/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES= http://download.gna.org/gsimageapps/
PKGNAMEPREFIX= gnustep-
DISTNAME= SlideShow-${PORTVERSION}
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= theraven@FreeBSD.org
COMMENT= SlideShow Viewer
LICENSE= GPLv2
@@ -20,6 +20,8 @@ USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
USE_GNUSTEP_LOCAL_LIBS+= SlideShow:${SLIDESHOWKIT_PORT}
+OBJCFLAGS+= -Dsel_eq=sel_isEqual
+
SLIDESHOWKIT_PORT?= graphics/gnustep-slideshowkit
.include <bsd.port.mk>
diff --git a/graphics/gnustep-slideshow/files/patch-Controller.m b/graphics/gnustep-slideshow/files/patch-Controller.m
new file mode 100644
index 000000000000..5bb9d7359b90
--- /dev/null
+++ b/graphics/gnustep-slideshow/files/patch-Controller.m
@@ -0,0 +1,41 @@
+--- Controller.m.orig 2013-08-20 15:46:28.000000000 +0000
++++ Controller.m 2013-08-20 15:46:48.000000000 +0000
+@@ -1021,32 +1021,32 @@
+ {
+ SEL action = [menuItem action];
+
+- if ( sel_eq(action,@selector(removeImages:)) )
++ if ( sel_isEqual(action,@selector(removeImages:)) )
+ {
+ if (( [_backend count] == 0 ) || ( ! [browser selectedCells] ) )
+ return NO;
+ }
+- if ( sel_eq(action,@selector(showNextImage:)) )
++ if ( sel_isEqual(action,@selector(showNextImage:)) )
+ {
+ if ( ( ( _current + 1 ) == [_backend count] ) || ( [_backend count] == 0 ) )
+ return NO;
+ }
+- else if ( sel_eq(action,@selector(showPreviousImage:)) )
++ else if ( sel_isEqual(action,@selector(showPreviousImage:)) )
+ {
+ if ( [_backend count] == 0 )
+ return NO;
+ }
+- else if ( sel_eq(action,@selector(fullscreenAction:)) )
++ else if ( sel_isEqual(action,@selector(fullscreenAction:)) )
+ {
+ if ( [_backend count] == 0 )
+ return NO;
+ }
+- else if ( sel_eq(action,@selector(addMarkAction:)) )
++ else if ( sel_isEqual(action,@selector(addMarkAction:)) )
+ {
+ if ( ( [self showState] == ShowOnlyMarked ) || ([_backend count] == 0 ) )
+ return NO;
+ }
+- else if ( sel_eq(action,@selector(showMarkAction:)) )
++ else if ( sel_isEqual(action,@selector(showMarkAction:)) )
+ {
+ if ( [_backend count] == 0 )
+ return NO;
diff --git a/graphics/preview/files/patch-Document.m b/graphics/preview/files/patch-Document.m
index 1addc9efc342..01dc80174875 100644
--- a/graphics/preview/files/patch-Document.m
+++ b/graphics/preview/files/patch-Document.m
@@ -8,3 +8,12 @@
#include <AppKit/NSApplication.h>
#include <AppKit/NSAffineTransform.h>
#include <AppKit/NSClipView.h>
+@@ -592,7 +592,7 @@
+ {
+ SEL action = [menuItem action];
+
+- if ( sel_eq(action,@selector(resize:)) )
++ if ( sel_isEqual(action,@selector(resize:)) )
+ {
+ if ( [menuItem tag] == [self _currentItem] )
+ return NO;