[20750] trunk/dports/palm/jpilot
source_changes at macosforge.org
source_changes at macosforge.org
Sat Nov 25 14:06:01 PST 2006
Revision: 20750
http://trac.macosforge.org/projects/macports/changeset/20750
Author: markd at macports.org
Date: 2006-11-25 14:06:01 -0800 (Sat, 25 Nov 2006)
Log Message:
-----------
Closes #11053. Add/modify patches.
Modified Paths:
--------------
trunk/dports/palm/jpilot/Portfile
trunk/dports/palm/jpilot/files/patch-plugins.c
Added Paths:
-----------
trunk/dports/palm/jpilot/files/patch-weekday.c
Modified: trunk/dports/palm/jpilot/Portfile
===================================================================
--- trunk/dports/palm/jpilot/Portfile 2006-11-25 22:01:52 UTC (rev 20749)
+++ trunk/dports/palm/jpilot/Portfile 2006-11-25 22:06:01 UTC (rev 20750)
@@ -3,28 +3,28 @@
PortSystem 1.0
name jpilot
version 0.99.9
+revision 1
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.
+ Palm OS devices. It is similar in functionality to the one that\
+ 3Com/Palm distributes.
categories palm
homepage http://www.jpilot.org/
platforms darwin
maintainers kristian.peters at korseby.net
master_sites http://www.jpilot.org/
checksums md5 c39df29aeed57b84a674524856ebc290
-patchfiles patch-plugins.c
+patchfiles patch-plugins.c \
+ patch-weekday.c
configure.args --with-libiconv-prefix=${prefix} \
--with-pilot-prefix=${prefix} \
- --mandir=${prefix}/share/man \
- --disable-gtk2
-depends_lib lib:libiconv:libiconv lib:libgtk.a:gtk1 lib:libpisock.a:pilot-link
+ --mandir=${prefix}/share/man
+depends_lib port:libiconv port:gtk2 port:pilot-link
-# adds gtk2-support
-variant gtk2 {
- configure.args-delete --disable-gtk2
- configure.args-append --enable-gtk2
- depends_lib-delete lib:libgtk.a:gtk1
- depends_lib-append lib:libgtk.2:gtk2
+# enable gtk1 support
+variant gtk1 {
+ configure.args-append --disable-gtk2
+ depends_lib-delete port:gtk2
+ depends_lib-append port:gtk1
}
Modified: trunk/dports/palm/jpilot/files/patch-plugins.c
===================================================================
--- trunk/dports/palm/jpilot/files/patch-plugins.c 2006-11-25 22:01:52 UTC (rev 20749)
+++ trunk/dports/palm/jpilot/files/patch-plugins.c 2006-11-25 22:06:01 UTC (rev 20750)
@@ -1,7 +1,6 @@
-diff -rauN plugins.c.orig plugins.c
---- plugins.c.orig Mon Sep 1 05:54:10 2003
-+++ plugins.c Sun Mar 21 14:12:26 2004
-@@ -19,6 +19,7 @@
+--- 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
@@ -9,3 +8,52 @@
#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-weekday.c
===================================================================
--- trunk/dports/palm/jpilot/files/patch-weekday.c (rev 0)
+++ trunk/dports/palm/jpilot/files/patch-weekday.c 2006-11-25 22:06:01 UTC (rev 20750)
@@ -0,0 +1,11 @@
+--- 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: http://lists.macosforge.org/pipermail/macports-changes/attachments/20061125/9282e3f3/attachment.html
More information about the macports-changes
mailing list