Date: Tue, 23 Nov 2004 03:30:50 +0100 From: "Piotr Smyrak" <piotr.smyrak@heron.pl> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Cc: marcus@FreeBSD.org Subject: ports/74277: [patch] merge patches to deskutils/gruler from ports/72341 Message-ID: <1101177050.0@smyru.smyrak.com> Resent-Message-ID: <200411230240.iAN2eTgd088157@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 74277
>Category: ports
>Synopsis: [patch] merge patches to deskutils/gruler from ports/72341
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue Nov 23 02:40:29 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Piotr Smyrak
>Release: FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD 5.3-STABLE #0: Mon Nov 22 01:43:22 CET 2004
root@smyru.smyrak.com:/usr/obj/usr/src/sys/SMYRU
>Description:
My port got commited, but since another earlier PR ports/72341 by
Jean-Yves Lefort <jylefort@brutele.be> for the same application was
overlooked, this patch integrates some nice patches from it:
patch-gRuler.in
patch-src:Makefile.in
patch-Makefile.in partially
This would obsolete ports/72341
>How-To-Repeat:
N/A
>Fix:
--- gruler.patch begins here ---
diff -Naru gruler.orig/files/patch-Makefile.in gruler/files/patch-Makefile.in
--- gruler.orig/files/patch-Makefile.in Tue Nov 23 02:24:27 2004
+++ gruler/files/patch-Makefile.in Tue Nov 23 02:34:37 2004
@@ -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 -Naru gruler.orig/files/patch-gRuler.desktop.in gruler/files/patch-gRuler.desktop.in
--- gruler.orig/files/patch-gRuler.desktop.in Thu Jan 1 01:00:00 1970
+++ gruler/files/patch-gRuler.desktop.in Tue Nov 23 02:52:47 2004
@@ -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 -Naru gruler.orig/files/patch-src::Makefile.in gruler/files/patch-src::Makefile.in
--- gruler.orig/files/patch-src::Makefile.in Thu Jan 1 01:00:00 1970
+++ gruler/files/patch-src::Makefile.in Tue Nov 23 02:36:41 2004
@@ -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 -Naru gruler.orig/pkg-plist gruler/pkg-plist
--- gruler.orig/pkg-plist Tue Nov 23 02:24:27 2004
+++ gruler/pkg-plist Tue Nov 23 02:35:07 2004
@@ -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
--- gruler.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1101177050.0>