[118661] trunk/dports/palm/jpilot

macsforever2000 at macports.org macsforever2000 at macports.org
Mon Apr 7 12:01:16 PDT 2014


Revision: 118661
          https://trac.macports.org/changeset/118661
Author:   macsforever2000 at macports.org
Date:     2014-04-07 12:01:16 -0700 (Mon, 07 Apr 2014)
Log Message:
-----------
jpilot: Update to version 1.8.1. Add license. Remove old gtk1 variant. (#43242)

Modified Paths:
--------------
    trunk/dports/palm/jpilot/Portfile

Added Paths:
-----------
    trunk/dports/palm/jpilot/files/patch-utils.h.diff

Removed Paths:
-------------
    trunk/dports/palm/jpilot/files/patch-plugins.c
    trunk/dports/palm/jpilot/files/patch-weekday.c

Modified: trunk/dports/palm/jpilot/Portfile
===================================================================
--- trunk/dports/palm/jpilot/Portfile	2014-04-07 18:26:36 UTC (rev 118660)
+++ trunk/dports/palm/jpilot/Portfile	2014-04-07 19:01:16 UTC (rev 118661)
@@ -1,31 +1,26 @@
 # $Id$
 
 PortSystem		1.0
+
 name			jpilot
-version			0.99.9
-revision		2
+version			1.8.1
+license			GPL-2
 description		A Palm Pilot desktop for Unix
 long_description	J-Pilot is a desktop organizer application for the palm pilot and other\
 			Palm OS devices.  It is similar in functionality to the one that\
-			3Com/Palm distributes.
+			3Com/Palm distributed.
 categories		palm
 homepage		http://www.jpilot.org/
 platforms		darwin
 maintainers		korseby.net:kristian.peters
 master_sites 		http://www.jpilot.org/
-checksums		md5 c39df29aeed57b84a674524856ebc290
-patchfiles		patch-plugins.c \
-			patch-weekday.c
-configure.args  	--with-libiconv-prefix=${prefix} \
-			--with-pilot-prefix=${prefix} \
-			--mandir=${prefix}/share/man
+checksums           md5     ac59a5708f37e30d39e85b1fcedd266f \
+                    rmd160  4b40d625d4582994eeb5acfa296ed0925a59b7bd \
+                    sha256  682838e8f9634102e5721e779fa0f00ec4be747776a575794137f1ce9420291f
+
+patchfiles		patch-utils.h.diff
+configure.args  	--prefix=${prefix} \
+					--with-libiconv-prefix=${prefix} \
+					--with-pilot-prefix=${prefix}
 depends_build		port:intltool port:pkgconfig
 depends_lib		port:libiconv port:gtk2 port:pilot-link
-
-# enable gtk1 support
-variant	gtk1 {
-	configure.args-append	--disable-gtk2
-	depends_lib-delete	port:gtk2
-	depends_lib-append	port:gtk1
-}
-

Deleted: trunk/dports/palm/jpilot/files/patch-plugins.c
===================================================================
--- trunk/dports/palm/jpilot/files/patch-plugins.c	2014-04-07 18:26:36 UTC (rev 118660)
+++ trunk/dports/palm/jpilot/files/patch-plugins.c	2014-04-07 19:01:16 UTC (rev 118661)
@@ -1,59 +0,0 @@
---- plugins.c.orig	2005-05-08 11:57:31.000000000 -0400
-+++ plugins.c	2006-11-20 09:30:28.000000000 -0500
-@@ -22,6 +22,7 @@
- 
- #include "config.h"
- #ifdef  ENABLE_PLUGINS
-+#include <sys/types.h>
- #include <dirent.h>
- #include <stdio.h>
- #include <stdlib.h>
-@@ -81,6 +82,8 @@
-    struct dirent *dirent;
-    char full_name[FILENAME_MAX];
-    struct plugin_s temp_plugin, *new_plugin;
-+   GList *plugin_names = NULL; /* keep a list of plugins found so far */
-+   GList *temp_list = NULL;
- 
-    count = 0;
-    for (i=0; (dirent = readdir(dir)); i++) {
-@@ -90,7 +93,8 @@
-       }
-       /* If the filename has either of these extensions then plug it in */
-       if ((strcmp(&(dirent->d_name[strlen(dirent->d_name)-3]), ".so")) &&
--	  (strcmp(&(dirent->d_name[strlen(dirent->d_name)-3]), ".sl"))) {
-+	  (strcmp(&(dirent->d_name[strlen(dirent->d_name)-3]), ".sl")) &&
-+	  (strcmp(&(dirent->d_name[strlen(dirent->d_name)-6]), ".dylib"))) {
- 	 continue;
-       } else {
- 	 jp_logf(JP_LOG_DEBUG, "found plugin %s\n", dirent->d_name);
-@@ -103,6 +107,7 @@
- 	    if (temp_plugin.name) {
- 	       jp_logf(JP_LOG_DEBUG, "plugin name is [%s]\n", temp_plugin.name);
- 	    }
-+	    if (g_list_find_custom(plugin_names, temp_plugin.name, (GCompareFunc)strcmp) == NULL) {
- 	    new_plugin = malloc(sizeof(struct plugin_s));
- 	    if (!new_plugin) {
- 	       jp_logf(JP_LOG_WARN, "load plugins(): %s\n", _("Out of memory"));
-@@ -113,13 +118,21 @@
- 	     * we want to avoid that slowness, prepend works for that
- 	     * in this case since we have the head */
- 	    plugins = g_list_prepend(plugins, new_plugin);
-+	    plugin_names = g_list_prepend(plugin_names, g_strdup(temp_plugin.name));
- 	    count++;
- 	    (*number)++;
- 	 }
-       }
-+      } 
-    }
- 
-    plugins = g_list_sort(plugins, plugin_sort);
-+   for (temp_list = plugin_names; temp_list; temp_list = temp_list->next) {
-+      if (temp_list->data) {
-+	g_free(temp_list->data);
-+      }
-+    }
-+   g_list_free(plugin_names);
- 
-    return count;
- }

Added: trunk/dports/palm/jpilot/files/patch-utils.h.diff
===================================================================
--- trunk/dports/palm/jpilot/files/patch-utils.h.diff	                        (rev 0)
+++ trunk/dports/palm/jpilot/files/patch-utils.h.diff	2014-04-07 19:01:16 UTC (rev 118661)
@@ -0,0 +1,11 @@
+--- utils.h_orig	2011-04-05 21:12:20.000000000 +0200
++++ utils.h	2014-04-06 16:17:45.000000000 +0200
+@@ -349,7 +349,7 @@
+ 
+ void clist_clear(GtkCList *clist);
+ 
+-inline void set_tooltip(int show_tooltip, 
++void set_tooltip(int show_tooltip, 
+                         GtkTooltips *tooltips,
+                         GtkWidget *widget,
+                         const gchar *tip_text,

Deleted: trunk/dports/palm/jpilot/files/patch-weekday.c
===================================================================
--- trunk/dports/palm/jpilot/files/patch-weekday.c	2014-04-07 18:26:36 UTC (rev 118660)
+++ trunk/dports/palm/jpilot/files/patch-weekday.c	2014-04-07 19:01:16 UTC (rev 118661)
@@ -1,11 +0,0 @@
---- jpilot.c.orig	2006-06-09 16:42:57.000000000 -0400
-+++ jpilot.c	2006-11-19 21:11:19.000000000 -0500
-@@ -2180,7 +2180,7 @@
- 
-    /* Extract first day of week preference from locale in GTK2 */
- #  ifdef ENABLE_GTK2
--#     ifdef HAVE_LANGINFO_H
-+#     if defined(HAVE_LANGINFO_H) && defined(_NL_TIME_FIRST_WEEKDAY)
- 	 /* GTK 2.8 libraries */
- 	 week_start = nl_langinfo (_NL_TIME_FIRST_WEEKDAY);
- 	 pref_fdow = *((unsigned char *) week_start) - 1;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140407/d74c4d17/attachment.html>


More information about the macports-changes mailing list