Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6867
Modified Files:
manedit.info manedit.patch
Log Message:
"new" version
Index: manedit.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/manedit.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- manedit.info 7 Nov 2008 05:59:29 -0000 1.3
+++ manedit.info 7 Nov 2008 06:43:06 -0000 1.4
@@ -1,19 +1,18 @@
Package: manedit
-Version: 0.6.1
-Revision: 1012
+Version: 1.2.1
+Revision: 1
Description: Graphical editor for manpages
License: GPL
Maintainer: Dave Vasilevsky <[EMAIL PROTECTED]>
-BuildDepends: gtk+, glib, bzip2-dev, gettext-dev, x11-dev
+BuildDepends: fink (>= 0.24.12-1), gtk+, glib, bzip2-dev, gettext-dev, x11-dev
Depends: gtk+-shlibs, glib-shlibs, bzip2-shlibs, gettext, x11
GCC: 4.0
-Source: http://wolfpack.twu.net/users/wolfpack/%n-%v.tar.bz2
-Source-MD5: 99d9be8009c58808e9ab288bd9dff303
+Source: http://wolfsinger.com/~wolfpack/packages/%n-%v.tar.bz2
+Source-MD5: a7ee1835e32ed3c9279412af7caf13ef
+PatchFile: %n.patch
+PatchFile-MD5: 7210ee831b3b1d8c50a5280ca9826005
PatchScript: <<
-sed -e 's|@PREFIX@|%p|g' < %a/%n.patch | patch -p1
-
-# 10.3 doesn't have this lib, 10.4 needs to link against it
-#perl -pi -e 's/-lSystemStubs//' manedit/Makefile.FreeBSD
+ sed -e 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
<<
DocFiles: AUTHORS INSTALL LICENSE README
SetCFLAGS: -g -DHAVE_GZIP -DHAVE_BZIP2
@@ -21,7 +20,7 @@
make -C manedit -f Makefile.FreeBSD all PREFIX=%p
<<
InstallScript: <<
- make -C manedit -f Makefile.FreeBSD install INSTALL=install PREFIX=%i
BIN=manedit MAN_DIR=%i/share/man/man1
+ make -C manedit -f Makefile.FreeBSD install INSTALL=install PREFIX=%i
BIN=manedit MAN_DIR=%i/share/man/man1 MAN=manedit.1
<<
DescDetail: <<
ManEdit is a UNIX manual page editor and viewer, it is designed specifically
Index: manedit.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/manedit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- manedit.patch 20 Jan 2006 20:32:32 -0000 1.1
+++ manedit.patch 7 Nov 2008 06:43:06 -0000 1.2
@@ -1,6 +1,6 @@
-diff -Naur manedit-old/manedit/Makefile.FreeBSD
manedit-new/manedit/Makefile.FreeBSD
---- manedit-old/manedit/Makefile.FreeBSD 2005-03-16 02:33:14.000000000
-0500
-+++ manedit-new/manedit/Makefile.FreeBSD 2005-06-01 19:25:57.000000000
-0400
+diff -Nurd -x'*~' manedit-1.2.1.orig/manedit/Makefile.FreeBSD
manedit-1.2.1/manedit/Makefile.FreeBSD
+--- manedit-1.2.1.orig/manedit/Makefile.FreeBSD 2008-10-11
19:00:00.000000000 -0400
++++ manedit-1.2.1/manedit/Makefile.FreeBSD 2008-11-07 01:05:41.000000000
-0500
@@ -70,7 +70,7 @@
# to the LIB line depending on what you have set in the CFLAGS line
# farther above.
@@ -19,22 +19,30 @@
all: $(BIN) $(BIN).1.out
-diff -Naur manedit-old/manedit/config.h manedit-new/manedit/config.h
---- manedit-old/manedit/config.h 2005-03-16 02:33:15.000000000 -0500
-+++ manedit-new/manedit/config.h 2005-06-01 17:19:05.000000000 -0400
-@@ -226,7 +226,7 @@
+diff -Nurd -x'*~' manedit-1.2.1.orig/manedit/ca_string.c
manedit-1.2.1/manedit/ca_string.c
+--- manedit-1.2.1.orig/manedit/ca_string.c 2008-10-11 19:00:00.000000000
-0400
++++ manedit-1.2.1/manedit/ca_string.c 2008-11-07 01:26:47.000000000 -0500
+@@ -1,3 +1,4 @@
++#include <string.h>
+ #include <glib.h>
+ #include "ca_string.h"
+
+diff -Nurd -x'*~' manedit-1.2.1.orig/manedit/config.h
manedit-1.2.1/manedit/config.h
+--- manedit-1.2.1.orig/manedit/config.h 2008-10-11 19:00:00.000000000
-0400
++++ manedit-1.2.1/manedit/config.h 2008-11-07 01:07:23.000000000 -0500
+@@ -236,7 +236,7 @@
* %p = optional parameters
*/
#if !defined(__FreeBSD__)
--#define MEDIT_CMD_MANPAGE_TO_OUTPUT (PREFIX "/bin/man %p %f")
-+#define MEDIT_CMD_MANPAGE_TO_OUTPUT ("/usr/bin/groff -Wall -mtty-char
-Tascii -mandoc -c %p %f")
+-#define ME_CMD_MANPAGE_INTERPRETER (PREFIX "/bin/man %p %f")
++#define ME_CMD_MANPAGE_INTERPRETER ("/usr/bin/groff -Wall -mtty-char
-Tascii -mandoc -c %p %f")
#else
- #define MEDIT_CMD_MANPAGE_TO_OUTPUT (PREFIX "/bin/manwrap %p %f")
+ #define ME_CMD_MANPAGE_INTERPRETER (PREFIX "/bin/manwrap %p %f")
#endif /* !__FreeBSD__ */
-diff -Naur manedit-old/manedit/fb.c manedit-new/manedit/fb.c
---- manedit-old/manedit/fb.c 2005-03-16 02:33:14.000000000 -0500
-+++ manedit-new/manedit/fb.c 2005-06-01 17:39:59.000000000 -0400
-@@ -17,7 +17,7 @@
+diff -Nurd -x'*~' manedit-1.2.1.orig/manedit/fb.c manedit-1.2.1/manedit/fb.c
+--- manedit-1.2.1.orig/manedit/fb.c 2008-10-11 19:00:00.000000000 -0400
++++ manedit-1.2.1/manedit/fb.c 2008-11-07 01:28:31.000000000 -0500
+@@ -18,7 +18,7 @@
# elif defined(__FreeBSD__)
/* # include <mntent.h> */
# else
@@ -43,21 +51,22 @@
# endif
#endif
#include <gtk/gtk.h>
-@@ -794,124 +794,51 @@
+@@ -1230,94 +1230,38 @@
}
--/*
-- * Returns a list of strings describing the drive paths.
-- */
--static gchar **FileBrowserGetDrivePaths(gint *n)
--{
++#include <sys/param.h>
++#include <sys/ucred.h>
++#include <sys/mount.h>
+ /*
+ * Returns a list of strings describing the drive paths.
+ */
+ static GList *FileBrowserGetDrivePaths(void)
+ {
-#if defined(_WIN32)
-- /* Win32 */
-- gchar drive_letter = 'a';
-- gchar drive_name[10];
-- gint i, strc = 0;
-- gchar **strv = NULL;
+- gchar drive_letter = 'a',
+- drive_name[10];
+- GList *paths_list = NULL;
-
- for(drive_letter = 'a'; drive_letter <= 'g'; drive_letter++)
- {
@@ -66,33 +75,17 @@
- "%c:\\",
- toupper(drive_letter)
- );
-- i = strc;
-- strc = i + 1;
-- strv = (gchar **)g_realloc(
-- strv, strc * sizeof(gchar *)
+- paths_list = g_list_append(
+- paths_list,
+- STRDUP(drive_name)
- );
-- if(strv == NULL)
-- {
-- strc = 0;
-- break;
-- }
--
-- strv[i] = STRDUP(drive_name);
- }
-
-- if(n != NULL)
-- *n = strc;
--
-- return(strv);
+- return(paths_list);
-#elif defined(__FreeBSD__)
-- /* FreeBSD */
-- if(n != NULL )
-- *n = 0;
- return(NULL);
--#else
-- /* UNIX */
-- gint i, strc = 0;
-- gchar **strv = NULL;
+-#else /* UNIX */
+- GList *paths_list = NULL;
-#ifdef __SOLARIS__
- struct vfstab *vfs_ptr = NULL;
- int mtback;
@@ -102,16 +95,12 @@
-
- /* Open system devices list file */
-#ifdef __SOLARIS__
-- FILE *fp = FOpen("/etc/vfstab", "rb");
+- FILE *fp = fopen("/etc/vfstab", "rb");
-#else
- FILE *fp = setmntent("/etc/fstab", "rb");
-#endif
- if(fp == NULL)
-- {
-- if(n != NULL)
-- *n = strc;
-- return(strv);
-- }
+- return(NULL);
-
- /* Begin reading system devices list file */
-#ifdef __SOLARIS__
@@ -123,22 +112,17 @@
- while(mt_ptr != NULL)
-#endif
- {
-- i = strc;
-- strc = i + 1;
-- strv = (gchar **)g_realloc(
-- strv, strc * sizeof(gchar *)
-- );
-- if(strv == NULL)
-- {
-- strc = 0;
-- break;
-- }
--
- /* Get mount path as the drive path */
-#ifdef __SOLARIS__
-- strv[i] = STRDUP(vfs_ptr->vfs_mountp);
+- paths_list = g_list_append(
+- paths_list,
+- STRDUP(vfs_ptr->vfs_mountp)
+- );
-#else
-- strv[i] = STRDUP(mt_ptr->mnt_dir);
+- paths_list = g_list_append(
+- paths_list,
+- STRDUP(mt_ptr->mnt_dir)
+- );
-#endif
-
- /* Read next mount entry */
@@ -150,9 +134,9 @@
- }
-
-
-- /* Close system devices list file */
+- /* Close the system devices list file */
-#ifdef __SOLARIS__
-- FClose(fp);
+- fclose(fp);
- fp = NULL;
- vfs_ptr = NULL;
-#else
@@ -160,30 +144,16 @@
- fp = NULL;
-#endif
-
-- if(n != NULL)
-- *n = strc;
--
-- return(strv);
+- return(paths_list);
-#endif
-+#include <sys/param.h>
-+#include <sys/ucred.h>
-+#include <sys/mount.h>
-+
-+ /*
-+ * Returns a list of strings describing the drive paths.
-+ */
-+static gchar **FileBrowserGetDrivePaths(gint *n) {
+ int n_mnts, i;
+ struct statfs* mnts;
-+ gint strc = 0;
-+ gchar **strv = NULL;
++ GList *paths_list = NULL;
+
+ n_mnts = getmntinfo(&mnts, MNT_WAIT);
+ if(n_mnts == 0)
+ {
-+ if(n != NULL)
-+ *n = strc;
-+ return(strv);
++ return(NULL);
+ }
+
+ for (i = 0; i < n_mnts; ++i, ++mnts) {
@@ -192,33 +162,31 @@
+ strcmp(mnts->f_fstypename, "devfs") == 0 ||
+ mnts->f_blocks == 0 )
+ continue;
-+ ++strc;
-+ strv = (gchar **)g_realloc(
-+ strv, strc * sizeof(gchar *)
-+ );
-+ if(strv == NULL)
-+ {
-+ strc = 0;
-+ break;
-+ }
+
-+ strv[strc - 1] = STRDUP(mnts->f_mntonname);
++ paths_list = g_list_append(
++ paths_list,
++ STRDUP(mnts->f_mntonname)
++ );
+ }
+
-+ /* Update total return value */
-+ if(n != NULL)
-+ *n = strc;
-+
-+ return(strv);
++ return(paths_list);
}
-diff -Naur manedit-old/manedit/prochandle.cpp
manedit-new/manedit/prochandle.cpp
---- manedit-old/manedit/prochandle.cpp 2005-03-16 02:33:15.000000000 -0500
-+++ manedit-new/manedit/prochandle.cpp 2005-06-01 19:01:40.000000000 -0400
-@@ -285,9 +285,9 @@
- if(pid == 0)
+diff -Nurd -x'*~' manedit-1.2.1.orig/manedit/manpage_view.c
manedit-1.2.1/manedit/manpage_view.c
+--- manedit-1.2.1.orig/manedit/manpage_view.c 2008-10-11 19:00:00.000000000
-0400
++++ manedit-1.2.1/manedit/manpage_view.c 2008-11-07 01:31:13.000000000
-0500
+@@ -1,3 +1,4 @@
++#include <string.h>
+ #include <gtk/gtk.h>
+
+ #include "guiutils.h"
+diff -Nurd -x'*~' manedit-1.2.1.orig/manedit/prochandle.cpp
manedit-1.2.1/manedit/prochandle.cpp
+--- manedit-1.2.1.orig/manedit/prochandle.cpp 2008-10-11 19:00:00.000000000
-0400
++++ manedit-1.2.1/manedit/prochandle.cpp 2008-11-07 01:05:42.000000000
-0500
+@@ -295,9 +295,9 @@
return(0);
+ }
- if(sched_getparam(
+ if(kill(
@@ -228,12 +196,12 @@
) == 0)
return(1);
else
-diff -Naur manedit-old/manedit/utils/manview.sh
manedit-new/manedit/utils/manview.sh
---- manedit-old/manedit/utils/manview.sh 2005-03-16 02:33:15.000000000
-0500
-+++ manedit-new/manedit/utils/manview.sh 2005-06-01 17:18:34.000000000
-0400
+diff -Nurd -x'*~' manedit-1.2.1.orig/manedit/utils/manview.sh
manedit-1.2.1/manedit/utils/manview.sh
+--- manedit-1.2.1.orig/manedit/utils/manview.sh 2008-10-11
19:00:00.000000000 -0400
++++ manedit-1.2.1/manedit/utils/manview.sh 2008-11-07 01:06:14.000000000
-0500
@@ -2,4 +2,4 @@
#
# Script to call manedit in viewer mode.
#
--/usr/bin/manedit --viewer $1
[EMAIL PROTECTED]@/bin/manedit --viewer $1
+-/usr/bin/manedit --viewer $1 $2
[EMAIL PROTECTED]@/bin/manedit --viewer $1 $2
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
