Upgrade to 0.6.8.

8 files changed, 52 insertions, 22 deletions

diff --git a/graphics/skencil/Makefile b/graphics/skencil/Makefile
index f4fc71c10771..fd146cbc729c 100644
--- a/graphics/skencil/Makefile
+++ b/graphics/skencil/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sketch
-PORTVERSION=	0.6.7
+PORTVERSION=	0.6.8
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/skencil/distinfo b/graphics/skencil/distinfo
index 1ea895f37ed2..1116983e284f 100644
--- a/graphics/skencil/distinfo
+++ b/graphics/skencil/distinfo
@@ -1 +1 @@
-MD5 (sketch-0.6.7.tar.gz) = 1f8ed8722ac7e7eae596393c49168034
+MD5 (sketch-0.6.8.tar.gz) = 1d1cde15d0fcf62f4f29c229cbea56ac
diff --git a/graphics/skencil/files/patch-aa b/graphics/skencil/files/patch-aa
index 47aa57fada9c..3d49ae62f123 100644
--- a/graphics/skencil/files/patch-aa
+++ b/graphics/skencil/files/patch-aa
@@ -1,12 +1,25 @@
---- setup.py.orig	Thu Feb 10 19:01:49 2000
-+++ setup.py	Thu Apr 27 15:56:03 2000
-@@ -233,8 +233,7 @@
-         flags['sketch']['imaging-include'] = '-I' + dir
- 
-     if setup == None:
--        setup = os.path.join(sys.prefix, 'lib/python' + sys.version[:3],
--                             'config/Setup')
-+        setup = '%%PORTSDIR%%/x11-toolkits/py-tkinter/files/Setup'
+--- setup.py.orig	Tue Jun 27 01:06:41 2000
++++ setup.py	Thu Aug 17 19:16:43 2000
+@@ -238,8 +238,10 @@
+                                  'python' + sys.version[:3], 'config')
+         setup = os.path.join(configdir, 'Setup')
+         setup_local = os.path.join(configdir, 'Setup.local')
++        setup_tkinter = '%%PORTSDIR%%/x11-toolkits/py-tkinter/files/Setup'
+     else:
+         setup_local = ''
++        setup_tkinter = ''
      print 'reading configuration from', setup, '...',
      configs = extract_config(setup)
      print 'done'
+@@ -247,6 +249,11 @@
+     if setup_local:
+         print 'reading additional configuration from', setup_local, '...',
+         configs = extract_config(setup_local, configs)
++        print 'done'
++
++    if setup_tkinter:
++        print 'reading additional configuration from', setup_tkinter, '...',
++        configs = extract_config(setup_tkinter, configs)
+         print 'done'
+ 
+     if not configs.has_key('_tkinter'):
diff --git a/graphics/skencil/pkg-plist b/graphics/skencil/pkg-plist
index 17741b156e1b..bc224c2ddda8 100644
--- a/graphics/skencil/pkg-plist
+++ b/graphics/skencil/pkg-plist
@@ -123,6 +123,8 @@ share/sketch/Plugins/Filters/cmxloader.py
 share/sketch/Plugins/Filters/cmxloader.pyc
 share/sketch/Plugins/Filters/gziploader.py
 share/sketch/Plugins/Filters/gziploader.pyc
+share/sketch/Plugins/Filters/pdfgensaver.py
+share/sketch/Plugins/Filters/pdfgensaver.pyc
 share/sketch/Plugins/Filters/skloader.py
 share/sketch/Plugins/Filters/skloader.pyc
 share/sketch/Plugins/Filters/sksaver.py
diff --git a/graphics/sketch/Makefile b/graphics/sketch/Makefile
index f4fc71c10771..fd146cbc729c 100644
--- a/graphics/sketch/Makefile
+++ b/graphics/sketch/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sketch
-PORTVERSION=	0.6.7
+PORTVERSION=	0.6.8
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/sketch/distinfo b/graphics/sketch/distinfo
index 1ea895f37ed2..1116983e284f 100644
--- a/graphics/sketch/distinfo
+++ b/graphics/sketch/distinfo
@@ -1 +1 @@
-MD5 (sketch-0.6.7.tar.gz) = 1f8ed8722ac7e7eae596393c49168034
+MD5 (sketch-0.6.8.tar.gz) = 1d1cde15d0fcf62f4f29c229cbea56ac
diff --git a/graphics/sketch/files/patch-aa b/graphics/sketch/files/patch-aa
index 47aa57fada9c..3d49ae62f123 100644
--- a/graphics/sketch/files/patch-aa
+++ b/graphics/sketch/files/patch-aa
@@ -1,12 +1,25 @@
---- setup.py.orig	Thu Feb 10 19:01:49 2000
-+++ setup.py	Thu Apr 27 15:56:03 2000
-@@ -233,8 +233,7 @@
-         flags['sketch']['imaging-include'] = '-I' + dir
- 
-     if setup == None:
--        setup = os.path.join(sys.prefix, 'lib/python' + sys.version[:3],
--                             'config/Setup')
-+        setup = '%%PORTSDIR%%/x11-toolkits/py-tkinter/files/Setup'
+--- setup.py.orig	Tue Jun 27 01:06:41 2000
++++ setup.py	Thu Aug 17 19:16:43 2000
+@@ -238,8 +238,10 @@
+                                  'python' + sys.version[:3], 'config')
+         setup = os.path.join(configdir, 'Setup')
+         setup_local = os.path.join(configdir, 'Setup.local')
++        setup_tkinter = '%%PORTSDIR%%/x11-toolkits/py-tkinter/files/Setup'
+     else:
+         setup_local = ''
++        setup_tkinter = ''
      print 'reading configuration from', setup, '...',
      configs = extract_config(setup)
      print 'done'
+@@ -247,6 +249,11 @@
+     if setup_local:
+         print 'reading additional configuration from', setup_local, '...',
+         configs = extract_config(setup_local, configs)
++        print 'done'
++
++    if setup_tkinter:
++        print 'reading additional configuration from', setup_tkinter, '...',
++        configs = extract_config(setup_tkinter, configs)
+         print 'done'
+ 
+     if not configs.has_key('_tkinter'):
diff --git a/graphics/sketch/pkg-plist b/graphics/sketch/pkg-plist
index 17741b156e1b..bc224c2ddda8 100644
--- a/graphics/sketch/pkg-plist
+++ b/graphics/sketch/pkg-plist
@@ -123,6 +123,8 @@ share/sketch/Plugins/Filters/cmxloader.py
 share/sketch/Plugins/Filters/cmxloader.pyc
 share/sketch/Plugins/Filters/gziploader.py
 share/sketch/Plugins/Filters/gziploader.pyc
+share/sketch/Plugins/Filters/pdfgensaver.py
+share/sketch/Plugins/Filters/pdfgensaver.pyc
 share/sketch/Plugins/Filters/skloader.py
 share/sketch/Plugins/Filters/skloader.pyc
 share/sketch/Plugins/Filters/sksaver.py