- Don't install includes, fix location of menu item and reword menu item

PR:		ports/74277
Submitted by:	Piotr Smyrak <piotr.smyrak@heron.pl> (maintainer)

5 files changed, 41 insertions, 14 deletions

diff --git a/deskutils/gruler/Makefile b/deskutils/gruler/Makefile
index 1e965a4e94f1..66de8ca4d134 100644
--- a/deskutils/gruler/Makefile
+++ b/deskutils/gruler/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gruler
 PORTVERSION=	0.4
+PORTREVISION=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://linuxadvocate.org/projects/gruler/downloads/
 DISTNAME=${PORTNAME:S/gr/gR/}-${PORTVERSION}
diff --git a/deskutils/gruler/files/patch-Makefile.in b/deskutils/gruler/files/patch-Makefile.in
index 71a191f0c041..c1a517134242 100644
--- a/deskutils/gruler/files/patch-Makefile.in
+++ b/deskutils/gruler/files/patch-Makefile.in
@@ -1,9 +1,11 @@
---- Makefile.in.orig	Tue Nov 16 00:54:04 2004
-+++ Makefile.in	Tue Nov 16 01:14:24 2004
-@@ -157,24 +157,12 @@
- 
- SUBDIRS = intl po macros include src
+--- Makefile.in.orig	Tue Nov 23 02:26:57 2004
++++ Makefile.in	Tue Nov 23 02:29:44 2004
+@@ -155,26 +155,14 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
  
+-SUBDIRS = intl po macros include src
+-
 -grulerdocdir = ${prefix}/doc/gRuler
 -grulerdoc_DATA = \
 -	README\
@@ -15,10 +17,12 @@
 -	TODO\
 -	ABOUT-NLS
 -
--
++SUBDIRS = intl po macros src
+ 
  EXTRA_DIST = $(grulerdoc_DATA)
  
- gnomemenudir = $(prefix)/@NO_PREFIX_PACKAGE_MENU_DIR@/Utilities
+-gnomemenudir = $(prefix)/@NO_PREFIX_PACKAGE_MENU_DIR@/Utilities
++gnomemenudir = $(datadir)/applications
  gnomemenu_DATA = gRuler.desktop
  
 -gruler_glade_filedir = $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@/@PACKAGE@/glade
diff --git a/deskutils/gruler/files/patch-gRuler.desktop.in b/deskutils/gruler/files/patch-gRuler.desktop.in
new file mode 100644
index 000000000000..1f217ffe2905
--- /dev/null
+++ b/deskutils/gruler/files/patch-gRuler.desktop.in
@@ -0,0 +1,16 @@
+--- gRuler.desktop.in.orig	Tue Nov 23 02:50:31 2004
++++ gRuler.desktop.in	Tue Nov 23 02:52:00 2004
+@@ -1,10 +1,8 @@
+-
+ [Desktop Entry]
+-Name=gRuler Version 0.1
+-Comment=gRuler Version 0.1
++Name=Screen Ruler
++Comment=gRuler 0.1 measures screen distances
+ Exec=gruler
+-Icon=@PACKAGE_PIXMAPS_DIR@/ 
++TryExec=gruler
+ Terminal=false
+-MultipleArgs=false
+ Type=Application
+ 
diff --git a/deskutils/gruler/files/patch-src::Makefile.in b/deskutils/gruler/files/patch-src::Makefile.in
new file mode 100644
index 000000000000..b0478cce32d9
--- /dev/null
+++ b/deskutils/gruler/files/patch-src::Makefile.in
@@ -0,0 +1,12 @@
+--- src/Makefile.in.orig	Tue Oct  5 05:18:57 2004
++++ src/Makefile.in	Tue Oct  5 05:19:02 2004
+@@ -159,9 +159,6 @@
+ 	$(GNOME_CFLAGS)
+ 
+ 
+-AM_CFLAGS = \
+-	 -Wall\
+-	 -O2
+ 
+ 
+ bin_PROGRAMS = gruler
diff --git a/deskutils/gruler/pkg-plist b/deskutils/gruler/pkg-plist
index e1329d7abd47..9c8e78601b24 100644
--- a/deskutils/gruler/pkg-plist
+++ b/deskutils/gruler/pkg-plist
@@ -1,11 +1,5 @@
 bin/gruler
-include/gRuler/draw.h
-include/gRuler/gui.h
-include/gRuler/gui_callbacks.h
-include/gRuler/main.h
-include/gRuler/prefs.h
 share/gRuler/glade/gRuler.glade
-share/gnome/apps/Utilities/gRuler.desktop
+share/gnome/applications/gRuler.desktop
 @dirrm share/gRuler/glade
 @dirrm share/gRuler
-@dirrm include/gRuler