4 files changed, 54 insertions, 81 deletions
diff --git a/editors/glimmer/Makefile b/editors/glimmer/Makefile
index bc357052a640..1c1c1bda6590 100644
--- a/editors/glimmer/Makefile
+++ b/editors/glimmer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	glimmer
 PORTVERSION=	1.2.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	editors gnome python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/editors/glimmer/files/patch-ab b/editors/glimmer/files/patch-ab
deleted file mode 100644
index 25d60da27721..000000000000
--- a/editors/glimmer/files/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/declarations.h	2000/09/23 17:26:18	1.1
-+++ src/declarations.h	2000/09/23 17:26:55
-@@ -48,8 +48,8 @@
- 
- #define MAX_FILES 30
- 
--#define PIXMAP_DIR (PREFIX "/share/pixmaps")
--#define LANG_DIR (PREFIX "/share/" PACKAGE "/languages")
-+#define PIXMAP_DIR (PREFIX "/share/gnome/pixmaps")
-+#define LANG_DIR (PREFIX "/share/gnome/" PACKAGE "/languages")
- 
- #define URL "http://glimmer.sourceforge.net"
- 
diff --git a/editors/glimmer/files/patch-ac b/editors/glimmer/files/patch-ac
deleted file mode 100644
index 4dc03f865ba9..000000000000
--- a/editors/glimmer/files/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- src/macro-language.c.orig	Thu Jan 10 19:53:09 2002
-+++ src/macro-language.c	Fri Jan 11 14:22:51 2002
-@@ -185,7 +185,7 @@
- {
-     gchar path[384];
- 
--    g_snprintf (path, sizeof (path), PREFIX "/share/" PACKAGE "/scripts");
-+    g_snprintf (path, sizeof (path), PREFIX "/share/gnome/" PACKAGE "/scripts");
-     build_menu_from_scripts_dir (path, "_Scripts/");
-     g_snprintf (path, sizeof (path), "%s/." PACKAGE "/scripts",
-                 g_get_home_dir ());
diff --git a/editors/glimmer/pkg-plist b/editors/glimmer/pkg-plist
index b0ea2c6e469f..c81ab7b219fd 100644
--- a/editors/glimmer/pkg-plist
+++ b/editors/glimmer/pkg-plist
@@ -1,52 +1,52 @@
 bin/glimmer
 bin/glimmerout
+%%DATADIR%%/docs/AUTHORS
+%%DATADIR%%/docs/COPYING
+%%DATADIR%%/docs/ChangeLog
+%%DATADIR%%/docs/NEWS
+%%DATADIR%%/docs/PROPS
+%%DATADIR%%/docs/README
+%%DATADIR%%/docs/TODO
+%%DATADIR%%/languages/ada.lang
+%%DATADIR%%/languages/asp.lang
+%%DATADIR%%/languages/bash.lang
+%%DATADIR%%/languages/c.lang
+%%DATADIR%%/languages/cpp.lang
+%%DATADIR%%/languages/dtml.lang
+%%DATADIR%%/languages/fortran.lang
+%%DATADIR%%/languages/html.lang
+%%DATADIR%%/languages/java.lang
+%%DATADIR%%/languages/js.lang
+%%DATADIR%%/languages/lang.lang
+%%DATADIR%%/languages/latex.lang
+%%DATADIR%%/languages/make.lang
+%%DATADIR%%/languages/ocaml.lang
+%%DATADIR%%/languages/oolong.lang
+%%DATADIR%%/languages/perl.lang
+%%DATADIR%%/languages/php.lang
+%%DATADIR%%/languages/po.lang
+%%DATADIR%%/languages/python.lang
+%%DATADIR%%/languages/ruby.lang
+%%DATADIR%%/languages/scheme.lang
+%%DATADIR%%/languages/sgml.lang
+%%DATADIR%%/languages/sql.lang
+%%DATADIR%%/languages/tcltk.lang
+%%DATADIR%%/languages/wml.lang
+%%DATADIR%%/languages/x86.lang
+%%DATADIR%%/languages/xhtml-trans.lang
+%%DATADIR%%/languages/xml.lang
+%%DATADIR%%/languages/z80.lang
+%%DATADIR%%/scripts/Bookmarks.py
+%%DATADIR%%/scripts/Delete_To_End.py
+%%DATADIR%%/scripts/Delete_To_Start.py
+%%DATADIR%%/scripts/FileSelector.py
+%%DATADIR%%/scripts/Global.py
+%%DATADIR%%/scripts/ISO2HTML.py
+%%DATADIR%%/scripts/Replace_Spaces.py
+%%DATADIR%%/scripts/Replace_Tabs.py
+%%DATADIR%%/scripts/To_Lower.py
+%%DATADIR%%/scripts/To_Upper.py
 share/gnome/apps/Development/glimmer.desktop
-share/gnome/glimmer/docs/AUTHORS
-share/gnome/glimmer/docs/COPYING
-share/gnome/glimmer/docs/ChangeLog
-share/gnome/glimmer/docs/NEWS
-share/gnome/glimmer/docs/PROPS
-share/gnome/glimmer/docs/README
-share/gnome/glimmer/docs/TODO
-share/gnome/glimmer/languages/ada.lang
-share/gnome/glimmer/languages/asp.lang
-share/gnome/glimmer/languages/bash.lang
-share/gnome/glimmer/languages/c.lang
-share/gnome/glimmer/languages/cpp.lang
-share/gnome/glimmer/languages/dtml.lang
-share/gnome/glimmer/languages/fortran.lang
-share/gnome/glimmer/languages/html.lang
-share/gnome/glimmer/languages/java.lang
-share/gnome/glimmer/languages/js.lang
-share/gnome/glimmer/languages/lang.lang
-share/gnome/glimmer/languages/latex.lang
-share/gnome/glimmer/languages/make.lang
-share/gnome/glimmer/languages/ocaml.lang
-share/gnome/glimmer/languages/oolong.lang
-share/gnome/glimmer/languages/perl.lang
-share/gnome/glimmer/languages/php.lang
-share/gnome/glimmer/languages/po.lang
-share/gnome/glimmer/languages/python.lang
-share/gnome/glimmer/languages/ruby.lang
-share/gnome/glimmer/languages/scheme.lang
-share/gnome/glimmer/languages/sgml.lang
-share/gnome/glimmer/languages/sql.lang
-share/gnome/glimmer/languages/tcltk.lang
-share/gnome/glimmer/languages/wml.lang
-share/gnome/glimmer/languages/x86.lang
-share/gnome/glimmer/languages/xhtml-trans.lang
-share/gnome/glimmer/languages/xml.lang
-share/gnome/glimmer/languages/z80.lang
-share/gnome/glimmer/scripts/Bookmarks.py
-share/gnome/glimmer/scripts/Delete_To_End.py
-share/gnome/glimmer/scripts/Delete_To_Start.py
-share/gnome/glimmer/scripts/FileSelector.py
-share/gnome/glimmer/scripts/Global.py
-share/gnome/glimmer/scripts/ISO2HTML.py
-share/gnome/glimmer/scripts/Replace_Spaces.py
-share/gnome/glimmer/scripts/Replace_Tabs.py
-share/gnome/glimmer/scripts/To_Lower.py
-share/gnome/glimmer/scripts/To_Upper.py
 share/gnome/help/glimmer/C/bugs.html
 share/gnome/help/glimmer/C/customize.html
 share/gnome/help/glimmer/C/faq.html
@@ -58,16 +58,16 @@ share/gnome/help/glimmer/C/preferences.html
 share/gnome/help/glimmer/C/properties.html
 share/gnome/help/glimmer/C/sessions.html
 share/gnome/help/glimmer/C/topic.dat
-share/gnome/pixmaps/glimmer-icon.png
-share/gnome/pixmaps/glimmer-splash.png
-share/gnome/pixmaps/glimmer-title.png
 share/locale/de/LC_MESSAGES/glimmer.mo
 share/locale/es/LC_MESSAGES/glimmer.mo
 share/locale/ja/LC_MESSAGES/glimmer.mo
 share/locale/sv/LC_MESSAGES/glimmer.mo
+share/pixmaps/glimmer-icon.png
+share/pixmaps/glimmer-splash.png
+share/pixmaps/glimmer-title.png
 @dirrm share/gnome/help/glimmer/C
 @dirrm share/gnome/help/glimmer
-@dirrm share/gnome/glimmer/scripts
-@dirrm share/gnome/glimmer/languages
-@dirrm share/gnome/glimmer/docs
-@dirrm share/gnome/glimmer
+@dirrm %%DATADIR%%/scripts
+@dirrm %%DATADIR%%/languages
+@dirrm %%DATADIR%%/docs
+@dirrm %%DATADIR%%