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. # -LIB = `$(GTK_CONFIG) --libs` +LIB = `$(GTK_CONFIG) --libs` -lSystemStubs -lz -lbz2 # Library Directories: # @@ -116,7 +116,7 @@ # Build Rules: # $(BIN): $(OBJ_C) $(OBJ_CPP) - $(CC) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIB) $(LIB_DIR) + $(CPP) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIB) $(LIB_DIR) all: $(BIN) $(BIN).1.out 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 #include #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 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 ME_CMD_MANPAGE_INTERPRETER (PREFIX "/bin/manwrap %p %f") #endif /* !__FreeBSD__ */ 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 */ # else -# include +/* # include */ # endif #endif #include @@ -1230,94 +1230,38 @@ } +#include +#include +#include /* * Returns a list of strings describing the drive paths. */ static GList *FileBrowserGetDrivePaths(void) { -#if defined(_WIN32) - gchar drive_letter = 'a', - drive_name[10]; - GList *paths_list = NULL; - - for(drive_letter = 'a'; drive_letter <= 'g'; drive_letter++) - { - g_snprintf( - drive_name, sizeof(drive_name), - "%c:\\", - toupper(drive_letter) - ); - paths_list = g_list_append( - paths_list, - STRDUP(drive_name) - ); - } - - return(paths_list); -#elif defined(__FreeBSD__) - return(NULL); -#else /* UNIX */ - GList *paths_list = NULL; -#ifdef __SOLARIS__ - struct vfstab *vfs_ptr = NULL; - int mtback; -#else - struct mntent *mt_ptr; -#endif - - /* Open system devices list file */ -#ifdef __SOLARIS__ - FILE *fp = fopen("/etc/vfstab", "rb"); -#else - FILE *fp = setmntent("/etc/fstab", "rb"); -#endif - if(fp == NULL) - return(NULL); - - /* Begin reading system devices list file */ -#ifdef __SOLARIS__ - vfs_ptr = (struct vfstab *)g_malloc(sizeof(struct vfstab)); - mtback = getvfsent(fp, vfs_ptr); - while(mtback != 0) -#else - mt_ptr = getmntent(fp); - while(mt_ptr != NULL) -#endif - { - /* Get mount path as the drive path */ -#ifdef __SOLARIS__ - paths_list = g_list_append( - paths_list, - STRDUP(vfs_ptr->vfs_mountp) - ); -#else - paths_list = g_list_append( - paths_list, - STRDUP(mt_ptr->mnt_dir) - ); -#endif - - /* Read next mount entry */ -#ifdef __SOLARIS__ - mtback = getmntent(fp, vfs_ptr); -#else - mt_ptr = getmntent(fp); -#endif - } - - - /* Close the system devices list file */ -#ifdef __SOLARIS__ - fclose(fp); - fp = NULL; - vfs_ptr = NULL; -#else - endmntent(fp); - fp = NULL; -#endif - - return(paths_list); -#endif + int n_mnts, i; + struct statfs* mnts; + GList *paths_list = NULL; + + n_mnts = getmntinfo(&mnts, MNT_WAIT); + if(n_mnts == 0) + { + return(NULL); + } + + for (i = 0; i < n_mnts; ++i, ++mnts) { + if ( strcmp(mnts->f_fstypename, "volfs") == 0 || + strcmp(mnts->f_fstypename, "fdesc") == 0 || + strcmp(mnts->f_fstypename, "devfs") == 0 || + mnts->f_blocks == 0 ) + continue; + + paths_list = g_list_append( + paths_list, + STRDUP(mnts->f_mntonname) + ); + } + + return(paths_list); } 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 #include #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( pid, - &sp + SIGINFO ) == 0) return(1); else 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 $2 +@PREFIX@/bin/manedit --viewer $1 $2