diff options
author | rillig <rillig> | 2007-10-14 07:49:54 +0000 |
---|---|---|
committer | rillig <rillig> | 2007-10-14 07:49:54 +0000 |
commit | 92787fb8eee18f42858fe4c8aec60103295ab314 (patch) | |
tree | b922a343d839339dca0b954315266a9b1eaceadc /editors | |
parent | 2d60bd4d68b15474896e37a57f2bfaf8e28ee854 (diff) | |
download | pkgsrc-92787fb8eee18f42858fe4c8aec60103295ab314.tar.gz |
Updated manedit to 0.8.1.
Release Notes
-------------
Fixed a bug that caused a crash whenever a string was added
to the selection.
Added new select and copy functions to the Viewer's menu.
Improved the Editor's copy/paste ownership widget behavior.
Fixed a GtkSelection bug in which redundant GtkSignals were
being connected.
Added pointer roller scroll support.
Fixed a bug in the mapping of popup menus.
Diffstat (limited to 'editors')
-rw-r--r-- | editors/manedit/Makefile | 16 | ||||
-rw-r--r-- | editors/manedit/distinfo | 19 | ||||
-rw-r--r-- | editors/manedit/patches/patch-aa | 21 | ||||
-rw-r--r-- | editors/manedit/patches/patch-ab | 3 | ||||
-rw-r--r-- | editors/manedit/patches/patch-ac | 25 | ||||
-rw-r--r-- | editors/manedit/patches/patch-ad | 3 | ||||
-rw-r--r-- | editors/manedit/patches/patch-ae | 477 | ||||
-rw-r--r-- | editors/manedit/patches/patch-ag | 22 |
8 files changed, 430 insertions, 156 deletions
diff --git a/editors/manedit/Makefile b/editors/manedit/Makefile index ee10a89a6ab..7d2bf08676e 100644 --- a/editors/manedit/Makefile +++ b/editors/manedit/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.27 2007/01/07 09:13:52 rillig Exp $ +# $NetBSD: Makefile,v 1.28 2007/10/14 07:49:54 rillig Exp $ # -DISTNAME= manedit-0.5.6 -PKGREVISION= 4 +DISTNAME= manedit-0.8.1 CATEGORIES= editors MASTER_SITES= ftp://wolfpack.twu.net/users/wolfpack/ EXTRACT_SUFX= .tar.bz2 @@ -20,22 +19,19 @@ MAKE_ENV+= CPP=${CXX:Q} # The FreeBSD makefile may be used as "generic UNIX". MAKE_FILE= Makefile.FreeBSD -INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man7 +INSTALLATION_DIRS_FROM_PLIST= yes do-install: ${INSTALL_PROGRAM} ${WRKSRC}/manedit ${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/utils/manview.sh ${PREFIX}/bin/manview ${INSTALL_SCRIPT} ${WRKSRC}/utils/manwrap.sh ${PREFIX}/bin/manwrap - ${INSTALL_DATA_DIR} ${PREFIX}/share/manedit \ - ${PREFIX}/share/manedit/templates \ - ${PREFIX}/share/manedit/icons ${INSTALL_MAN} ${WRKSRC}/manedit.1 ${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_MAN} ${WRKSRC}/help/manpage_writing_procedures \ ${PREFIX}/${PKGMANDIR}/man7/manpage_writing_procedures.7 - ${INSTALL_MAN} ${WRKSRC}/help/manpage_xml_referance \ + ${INSTALL_MAN} ${WRKSRC}/help/manpage_xml_reference \ ${PREFIX}/${PKGMANDIR}/man7/manpage_xml_reference.7 - cd ${WRKSRC}/templates && ${INSTALL_DATA} api.mpt config.mpt \ - intro.mpt program.mpt ${PREFIX}/share/manedit/templates + cd ${WRKSRC}/templates && ${INSTALL_DATA} *.mpt \ + ${PREFIX}/share/manedit/templates cd ${WRKSRC} && ${INSTALL_DATA} manedit.xpm \ ${PREFIX}/share/manedit/icons diff --git a/editors/manedit/distinfo b/editors/manedit/distinfo index 35f9049598a..fdd60d74b40 100644 --- a/editors/manedit/distinfo +++ b/editors/manedit/distinfo @@ -1,11 +1,12 @@ -$NetBSD: distinfo,v 1.7 2005/02/23 17:15:11 agc Exp $ +$NetBSD: distinfo,v 1.8 2007/10/14 07:49:54 rillig Exp $ -SHA1 (manedit-0.5.6.tar.bz2) = 1a6f413f614e5f3620fd9fae16d754eb722984e6 -RMD160 (manedit-0.5.6.tar.bz2) = 7c380b19d08f67390eada485d910a8d020631561 -Size (manedit-0.5.6.tar.bz2) = 425714 bytes -SHA1 (patch-aa) = 9ace1dfdc027cbda50e2c06f08db6c16e2c27b63 -SHA1 (patch-ab) = 80a4e693601b353c271d1fbd9afb31bace75f75e -SHA1 (patch-ac) = 05b59bc0315256dc9486f361699e1fa1688a3a04 -SHA1 (patch-ad) = c59ff342f72f33834b1a25e300a36d2579330686 -SHA1 (patch-ae) = 9cb79121a5c271d240b4362c91ad59bed499c571 +SHA1 (manedit-0.8.1.tar.bz2) = 0b1705383840598ae7ced22ce5eb7f111008885b +RMD160 (manedit-0.8.1.tar.bz2) = 17d378fad7a0dbe8d7b4c09b334dfc0768b0932e +Size (manedit-0.8.1.tar.bz2) = 514226 bytes +SHA1 (patch-aa) = b6b2443fca5fcab3367c49a011945b36a771ac74 +SHA1 (patch-ab) = f676d624b6df1474e69f829cee45bd5b4f76d63a +SHA1 (patch-ac) = d88728e2932270b320c07be7fc5a327c0b8650d2 +SHA1 (patch-ad) = 56d64a76684534bde76ed2fda13bcd94b00cb125 +SHA1 (patch-ae) = 418b0d379626b7eb6176ba15e7c228e985262005 SHA1 (patch-af) = 8ff383b82b3813778aefa0e5ec72a76246089fbc +SHA1 (patch-ag) = c4629c9787fc2e0125692b7f480433feb76b4de8 diff --git a/editors/manedit/patches/patch-aa b/editors/manedit/patches/patch-aa index 83501618fda..1618bcba4de 100644 --- a/editors/manedit/patches/patch-aa +++ b/editors/manedit/patches/patch-aa @@ -1,19 +1,20 @@ -$NetBSD: patch-aa,v 1.4 2002/12/30 00:00:18 kristerw Exp $ ---- prochandle.cpp.orig Sun Dec 29 23:24:30 2002 -+++ prochandle.cpp Sun Dec 29 23:31:23 2002 -@@ -230,6 +230,7 @@ +$NetBSD: patch-aa,v 1.5 2007/10/14 07:49:54 rillig Exp $ +--- prochandle.cpp.orig 2007-02-11 09:00:00.000000000 +0100 ++++ prochandle.cpp 2007-10-14 09:38:21.000000000 +0200 +@@ -270,6 +270,7 @@ char **ExecExplodeCommand(const char *cm /* - * Returns true if the process is still running. + * Returns true if the process is still running. */ +#if 0 int ExecProcessExists(pid_t pid) { - struct sched_param sp; -@@ -247,6 +248,7 @@ - else - return(0); + #ifdef __linux__ +@@ -294,7 +295,7 @@ int ExecProcessExists(pid_t pid) + return(0); + #endif } +- +#endif - /* + * Returns the CPU load as a coefficient value from 0.0 to 1.0. diff --git a/editors/manedit/patches/patch-ab b/editors/manedit/patches/patch-ab index bab15d80e2f..843a6ade80b 100644 --- a/editors/manedit/patches/patch-ab +++ b/editors/manedit/patches/patch-ab @@ -1,4 +1,5 @@ -$NetBSD: patch-ab,v 1.4 2002/12/30 00:00:18 kristerw Exp $ +$NetBSD: patch-ab,v 1.5 2007/10/14 07:49:54 rillig Exp $ + --- config.h.orig Mon Dec 30 00:43:48 2002 +++ config.h Mon Dec 30 00:42:47 2002 @@ -135,7 +135,7 @@ diff --git a/editors/manedit/patches/patch-ac b/editors/manedit/patches/patch-ac index 9768dba46c5..c8d35083937 100644 --- a/editors/manedit/patches/patch-ac +++ b/editors/manedit/patches/patch-ac @@ -1,7 +1,8 @@ -$NetBSD: patch-ac,v 1.3 2002/12/30 00:00:18 kristerw Exp $ ---- pref.c.orig Mon Dec 30 00:45:32 2002 -+++ pref.c Mon Dec 30 00:46:21 2002 -@@ -1725,7 +1725,7 @@ +$NetBSD: patch-ac,v 1.4 2007/10/14 07:49:54 rillig Exp $ + +--- pref.c.orig 2007-02-11 09:00:00.000000000 +0100 ++++ pref.c 2007-10-14 09:27:47.000000000 +0200 +@@ -1705,7 +1705,7 @@ static void PrefCreatePanelLocations(pre * first index of the text array (that's text[0]). */ @@ -10,21 +11,21 @@ $NetBSD: patch-ac,v 1.3 2002/12/30 00:00:18 kristerw Exp $ text[0] = "/usr/share/man"; #else text[0] = "/usr/man"; -@@ -1733,7 +1733,7 @@ +@@ -1713,7 +1713,7 @@ static void PrefCreatePanelLocations(pre text[1] = "Global"; gtk_clist_append(GTK_CLIST(w), text); -#if defined(__FreeBSD__) +#if defined(__FreeBSD__) || defined(__NetBSD__) - text[0] = LOCALBASE "/man"; + text[0] = LOCALBASE "/man"; #else - text[0] = "/usr/local/man"; -@@ -1741,7 +1741,7 @@ - text[1] = "Local"; - gtk_clist_append(GTK_CLIST(w), text); + text[0] = "/usr/local/man"; +@@ -1721,7 +1721,7 @@ static void PrefCreatePanelLocations(pre + text[1] = "Local"; + gtk_clist_append(GTK_CLIST(w), text); -#if defined(__FreeBSD__) +#if defined(__FreeBSD__) || defined(__NetBSD__) - text[0] = X11BASE"/man"; + text[0] = X11BASE"/man"; #else - text[0] = "/usr/X11R6/man"; + text[0] = "/usr/X11R6/man"; diff --git a/editors/manedit/patches/patch-ad b/editors/manedit/patches/patch-ad index 4f64309d8b9..4efe218fca3 100644 --- a/editors/manedit/patches/patch-ad +++ b/editors/manedit/patches/patch-ad @@ -1,4 +1,5 @@ -$NetBSD: patch-ad,v 1.3 2002/12/30 00:00:18 kristerw Exp $ +$NetBSD: patch-ad,v 1.4 2007/10/14 07:49:54 rillig Exp $ + --- prefcb.c.orig Mon Dec 30 00:47:35 2002 +++ prefcb.c Mon Dec 30 00:47:46 2002 @@ -704,7 +704,7 @@ diff --git a/editors/manedit/patches/patch-ae b/editors/manedit/patches/patch-ae index fcf2cf0e15e..fd096152334 100644 --- a/editors/manedit/patches/patch-ae +++ b/editors/manedit/patches/patch-ae @@ -1,42 +1,382 @@ -$NetBSD: patch-ae,v 1.3 2004/03/20 22:08:11 agc Exp $ +$NetBSD: patch-ae,v 1.4 2007/10/14 07:49:54 rillig Exp $ ---- editorcb.c 2004/03/20 21:48:19 1.1 -+++ editorcb.c 2004/03/20 22:01:19 -@@ -4257,13 +4257,13 @@ - /* Confirm before replace. */ +--- editorcb.c.orig 2007-02-11 09:00:00.000000000 +0100 ++++ editorcb.c 2007-10-14 09:30:48.000000000 +0200 +@@ -793,8 +793,8 @@ void EditorManualOpenCB(GtkWidget *widge + CDialogSetTransientFor(toplevel); + CDialogGetResponse( + "Manual Page Read-Only", +-"This manual page is set read-only,\n\ +-you will not be able to save it.", ++"This manual page is set read-only,\n" ++"you will not be able to save it.", + NULL, + CDIALOG_ICON_WARNING, + CDIALOG_BTNFLAG_OK, +@@ -922,12 +922,12 @@ void EditorManualNewFromTemplateCB(GtkWi + CDialogGetResponse( + "Unable To Find Directory", + msg, +-"The specified Manual Page templates directory\n\ +-could not be found. This directory contains all\n\ +-Manual Page template files for this program.\n\ +-Verify that the specified paths for this program\n\ +-are defined properly in the preferences, go to\n\ +-edit->preferences->locations.", ++"The specified Manual Page templates directory\n" ++"could not be found. This directory contains all\n" ++"Manual Page template files for this program.\n" ++"Verify that the specified paths for this program\n" ++"are defined properly in the preferences, go to\n" ++"edit->preferences->locations.", + CDIALOG_ICON_WARNING, + CDIALOG_BTNFLAG_OK | CDIALOG_BTNFLAG_HELP, + CDIALOG_BTNFLAG_OK +@@ -1074,8 +1074,8 @@ void EditorManualSaveCB(GtkWidget *widge + CDialogSetTransientFor(toplevel); + CDialogGetResponse( + "Non-Critical Internal Error!", +-"Unable to find the toplevel trunk branch for the\n\ +-selected branch.", ++"Unable to find the toplevel trunk branch for the\n" ++"selected branch.", + NULL, + CDIALOG_ICON_ERROR, + CDIALOG_BTNFLAG_OK, +@@ -1129,9 +1129,9 @@ selected branch.", + CDialogGetResponse( + "Save Manual Page Failed", + msg, +-"The specified manual page file could not be written\n\ +-to, please verify that the specified path exists and has\n\ +-write permissions set.", ++"The specified manual page file could not be written\n" ++"to, please verify that the specified path exists and has\n" ++"write permissions set.", + CDIALOG_ICON_ERROR, + CDIALOG_BTNFLAG_OK | CDIALOG_BTNFLAG_HELP, + CDIALOG_BTNFLAG_OK +@@ -1230,8 +1230,8 @@ void EditorManualSaveAsCB(GtkWidget *wid + CDialogSetTransientFor(toplevel); + CDialogGetResponse( + "Non-Critical Internal Error!", +-"Could not find the toplevel trunk branch for the\n\ +-selected branch.", ++"Could not find the toplevel trunk branch for the\n" ++"selected branch.", + NULL, + CDIALOG_ICON_ERROR, + CDIALOG_BTNFLAG_OK, +@@ -1309,9 +1309,9 @@ selected branch.", + CDialogGetResponse( + "Save Manual Page Failed", + msg, +-"The specified manual page file could not be written\n\ +-to, please verify that the given path exists and has\n\ +-write permissions set.", ++"The specified manual page file could not be written\n" ++"to, please verify that the given path exists and has\n" ++"write permissions set.", + CDIALOG_ICON_ERROR, + CDIALOG_BTNFLAG_OK | CDIALOG_BTNFLAG_HELP, + CDIALOG_BTNFLAG_OK +@@ -1414,8 +1414,8 @@ void EditorManualRevertCB(GtkWidget *wid + CDialogSetTransientFor(toplevel); + CDialogGetResponse( + "Non-Critical Internal Error!", +-"Could not find the item data for the selected\n\ +-Manual Page.", ++"Could not find the item data for the selected\n" ++"Manual Page.", + NULL, + CDIALOG_ICON_ERROR, + CDIALOG_BTNFLAG_OK, +@@ -1434,9 +1434,9 @@ Manual Page.", + CDialogSetTransientFor(toplevel); + CDialogGetResponse( + "No file data to revert to!", +-"The selected Manual Page has no associated file,\n\ +-which implies that it has never been saved before.\n\ +-There is no file data to revert to.", ++"The selected Manual Page has no associated file,\n" ++"which implies that it has never been saved before.\n" ++"There is no file data to revert to.", + NULL, + CDIALOG_ICON_WARNING, + CDIALOG_BTNFLAG_OK, +@@ -1530,9 +1530,9 @@ There is no file data to revert to.", + CDialogSetTransientFor(toplevel); + CDialogGetResponse( + "Revert Failed", +-"The orignal file containing the manual page data\n\ +-could not be found. It may have been moved or deleted,\n\ +-try opening it manually by going to File->Open.", ++"The orignal file containing the manual page data\n" ++"could not be found. It may have been moved or deleted,\n" ++"try opening it manually by going to File->Open.", + NULL, + CDIALOG_ICON_ERROR, + CDIALOG_BTNFLAG_OK, +@@ -1545,8 +1545,8 @@ try opening it manually by going to File + CDialogSetTransientFor(toplevel); + CDialogGetResponse( + "Revert Failed", +-"An error occured while reloading the selected manual\n\ +-page. Try reloading manual by going to File->Open.", ++"An error occured while reloading the selected manual\n" ++"page. Try reloading manual by going to File->Open.", + NULL, + CDIALOG_ICON_ERROR, + CDIALOG_BTNFLAG_OK, +@@ -1815,15 +1815,15 @@ void EditorManualAddHeaderCB(GtkWidget * + CDialogSetTransientFor(toplevel); + CDialogGetResponse( + "Add Header Failed", +-"You need to select the insert position of\n\ +-where you want to add the new header. This\n\ +-can be a manual page reference or an existing\n\ +-header or section to add under.", +-"You have requested to add a new header but\n\ +-you have not specified a manual page or\n\ +-header or section to add it under. You must\n\ +-selected a manual page or an existing header\n\ +-or section to add the new header under.", ++"You need to select the insert position of\n" ++"where you want to add the new header. This\n" ++"can be a manual page reference or an existing\n" ++"header or section to add under.", ++"You have requested to add a new header but\n" ++"you have not specified a manual page or\n" ++"header or section to add it under. You must\n" ++"selected a manual page or an existing header\n" ++"or section to add the new header under.", + CDIALOG_ICON_WARNING, + CDIALOG_BTNFLAG_OK | CDIALOG_BTNFLAG_HELP, + CDIALOG_BTNFLAG_OK +@@ -1835,11 +1835,11 @@ or section to add the new header under." + CDialogSetTransientFor(toplevel); + CDialogGetResponse( + "Add Header Failed", +-"There are no manual pages opened to add\n\ +-a new header to.", +-"You must either create a new manual page or\n\ +-open an existing manual page to add a new header\n\ +-to.", ++"There are no manual pages opened to add\n" ++"a new header to.", ++"You must either create a new manual page or\n" ++"open an existing manual page to add a new header\n" ++"to.", + CDIALOG_ICON_WARNING, + CDIALOG_BTNFLAG_OK | CDIALOG_BTNFLAG_HELP, + CDIALOG_BTNFLAG_OK +@@ -1857,14 +1857,14 @@ to.", + CDialogSetTransientFor(toplevel); + CDialogGetResponse( + "Add Header Failed", +-"Could not find the parent trunk for the selected\n\ +-layout branch.", +-"An internal error has occured in which the parent\n\ +-trunk for the currently selected branch could not\n\ +-be found. There may be some inconsistancy in the\n\ +-loaded data. You should save this manual page to\n\ +-a new file (use `save as') and close this application\n\ +-to prevent and further data loss.\n", ++"Could not find the parent trunk for the selected\n" ++"layout branch.", ++"An internal error has occured in which the parent\n" ++"trunk for the currently selected branch could not\n" ++"be found. There may be some inconsistancy in the\n" ++"loaded data. You should save this manual page to\n" ++"a new file (use `save as') and close this application\n" ++"to prevent and further data loss.\n", + CDIALOG_ICON_ERROR, + CDIALOG_BTNFLAG_OK | CDIALOG_BTNFLAG_HELP, + CDIALOG_BTNFLAG_OK +@@ -2065,15 +2065,15 @@ void EditorManualAddSectionCB(GtkWidget + CDialogSetTransientFor(toplevel); + CDialogGetResponse( + "Add Section Failed", +-"You need to select the insert position of\n\ +-where you want to add the new section. This\n\ +-can be a manual page reference or an existing\n\ +-header or section to add under.", +-"You have requested to add a new section but\n\ +-you have not specified a manual page or\n\ +-header or section to add it under. You must\n\ +-selected a manual page or an existing header\n\ +-or section to add the new section under.", ++"You need to select the insert position of\n" ++"where you want to add the new section. This\n" ++"can be a manual page reference or an existing\n" ++"header or section to add under.", ++"You have requested to add a new section but\n" ++"you have not specified a manual page or\n" ++"header or section to add it under. You must\n" ++"selected a manual page or an existing header\n" ++"or section to add the new section under.", + CDIALOG_ICON_WARNING, + CDIALOG_BTNFLAG_OK | CDIALOG_BTNFLAG_HELP, + CDIALOG_BTNFLAG_OK +@@ -2085,11 +2085,11 @@ or section to add the new section under. + CDialogSetTransientFor(toplevel); + CDialogGetResponse( + "Add Section Failed", +-"There are no manual pages opened to add\n\ +-a new section to.", +-"You must either create a new manual page or\n\ +-open an existing manual page to add a new section\n\ +-to.", ++"There are no manual pages opened to add\n" ++"a new section to.", ++"You must either create a new manual page or\n" ++"open an existing manual page to add a new section\n" ++"to.", + CDIALOG_ICON_WARNING, + CDIALOG_BTNFLAG_OK | CDIALOG_BTNFLAG_HELP, + CDIALOG_BTNFLAG_OK +@@ -2107,14 +2107,14 @@ to.", + CDialogSetTransientFor(toplevel); + CDialogGetResponse( + "Add Section Failed", +-"Unable to find the parent trunk for the selected\n\ +-layout branch.", +-"An internal error has occured in which the parent\n\ +-trunk for the currently selected branch could not\n\ +-be found. There may be some inconsistancy in the\n\ +-loaded data. You should save this manual page to\n\ +-a new file (use `save as') and close this application\n\ +-to prevent and further data loss.\n", ++"Unable to find the parent trunk for the selected\n" ++"layout branch.", ++"An internal error has occured in which the parent\n" ++"trunk for the currently selected branch could not\n" ++"be found. There may be some inconsistancy in the\n" ++"loaded data. You should save this manual page to\n" ++"a new file (use `save as') and close this application\n" ++"to prevent and further data loss.\n", + CDIALOG_ICON_ERROR, + CDIALOG_BTNFLAG_OK | CDIALOG_BTNFLAG_HELP, + CDIALOG_BTNFLAG_OK +@@ -2327,8 +2327,8 @@ void EditorManualRemoveSectionCB(GtkWidg + CDialogSetTransientFor(toplevel); + status = CDialogGetResponse( + "Confirm Remove Header", +-"Are you sure you want to remove the header\n\ +-from the manual page?", ++"Are you sure you want to remove the header\n" ++"from the manual page?", + NULL, + CDIALOG_ICON_WARNING, + CDIALOG_BTNFLAG_YES | CDIALOG_BTNFLAG_YES_TO_ALL | +@@ -2567,17 +2567,17 @@ void EditorManualSyntaxHighlightToggleCB + CDialogSetTransientFor(toplevel); + CDialogGetResponse( + "Subsystems Warning", +-"Enabling syntax highlighting may cause crashes!\n\ +-\n\ +-Click on `help' for explaination!", +-"This program makes use of the GTK+ GtkText widget\n\ +-it has known bugs which cause applications to crash\n\ +-under certain circumstances such as syntax highlighting.\n\ +-You are advised not to use syntax highlighting, however\n\ +-if you do and a crash does occure then this program will\n\ +-try its best (no gaurantees) to emergency save any opened\n\ +-documents into the program's tempory directory before\n\ +-exiting.", ++"Enabling syntax highlighting may cause crashes!\n" ++"\n" ++"Click on `help' for explaination!", ++"This program makes use of the GTK+ GtkText widget\n" ++"it has known bugs which cause applications to crash\n" ++"under certain circumstances such as syntax highlighting.\n" ++"You are advised not to use syntax highlighting, however\n" ++"if you do and a crash does occure then this program will\n" ++"try its best (no gaurantees) to emergency save any opened\n" ++"documents into the program's tempory directory before\n" ++"exiting.", + CDIALOG_ICON_WARNING, + CDIALOG_BTNFLAG_OK | CDIALOG_BTNFLAG_HELP, + CDIALOG_BTNFLAG_OK +@@ -2660,8 +2660,8 @@ void EditorUndoCB(GtkWidget *widget, gpo + CDialogGetResponse( + "Undo Failed", + "The undo process could not be performed.", +-"Circumstances or an error prevented the undo\n\ +-operation from being performed.", ++"Circumstances or an error prevented the undo\n" ++"operation from being performed.", + CDIALOG_ICON_ERROR, + CDIALOG_BTNFLAG_OK | CDIALOG_BTNFLAG_HELP, + CDIALOG_BTNFLAG_OK +@@ -2720,8 +2720,8 @@ void EditorRedoCB(GtkWidget *widget, gpo + CDialogGetResponse( + "Redo Failed", + "The redo process could not be performed.", +-"Circumstances or an error prevented the redo\n\ +-operation from being performed.", ++"Circumstances or an error prevented the redo\n" ++"operation from being performed.", + CDIALOG_ICON_ERROR, + CDIALOG_BTNFLAG_OK | CDIALOG_BTNFLAG_HELP, + CDIALOG_BTNFLAG_OK +@@ -3465,12 +3465,12 @@ void EditorStripTagsCB(GtkWidget *widget + CDialogGetResponse( + "No Text Selected", + "No text selected to strip tags from.", +-"You have not selected any text in which to strip\n\ +-tags from. If you wish to strip tags from the\n\ +-entire section then you must first go to\n\ +-edit->select all and then strip tags otherwise\n\ +-use the pointer to select the section of text you\n\ +-want to strip tags from and then strip tags.", ++"You have not selected any text in which to strip\n" ++"tags from. If you wish to strip tags from the\n" ++"entire section then you must first go to\n" ++"edit->select all and then strip tags otherwise\n" ++"use the pointer to select the section of text you\n" ++"want to strip tags from and then strip tags.", + CDIALOG_ICON_WARNING, + CDIALOG_BTNFLAG_OK | CDIALOG_BTNFLAG_HELP, + CDIALOG_BTNFLAG_OK +@@ -3668,8 +3668,8 @@ void EditorFindBarReplaceAllCB(GtkWidget + CDialogGetResponse( + "No Item Selected", + "No item selected to search and replace through.", +-"You have not selected an item with text\n\ +-to search and replace through.", ++"You have not selected an item with text\n" ++"to search and replace through.", + CDIALOG_ICON_WARNING, + CDIALOG_BTNFLAG_OK | CDIALOG_BTNFLAG_HELP, + CDIALOG_BTNFLAG_OK +@@ -3842,9 +3842,9 @@ void EditorFindBarReplaceEntirePageCB(Gt + CDialogSetTransientFor(toplevel); status = CDialogGetResponse( "Confirm Replace Entire Page", -"You will not be able to undo this operation,\n\ -are you sure you want to find and replace the\n\ -entire selected Manual Page?", --"You are about the search and replace through --the entire selected Manual Page, you will not --be able to undo this operation. If you are --unsure say `cancel'.", +"You will not be able to undo this operation,\n" +"are you sure you want to find and replace the\n" +"entire selected Manual Page?", -+"You are about the search and replace through\n" -+"the entire selected Manual Page, you will not\n" -+"be able to undo this operation. If you are\n" -+"unsure say `cancel'.", + NULL, CDIALOG_ICON_WARNING, - CDIALOG_BTNFLAG_YES | CDIALOG_BTNFLAG_CANCEL | - CDIALOG_BTNFLAG_HELP, -@@ -4292,8 +4292,8 @@ - CDialogGetResponse( - "No Manual Page selected!", - "No Manual Page selected to search and replace through.", + CDIALOG_BTNFLAG_YES | CDIALOG_BTNFLAG_CANCEL, +@@ -3875,8 +3875,8 @@ entire selected Manual Page?", + CDialogGetResponse( + "No Manual Page Selected", + "No manual page selected to search and replace through.", -"You have not selected a manual page to search and\n\ -replace through.", +"You have not selected a manual page to search and\n" +"replace through.", - CDIALOG_ICON_WARNING, - CDIALOG_BTNFLAG_OK | CDIALOG_BTNFLAG_HELP, - CDIALOG_BTNFLAG_OK -@@ -4555,8 +4555,8 @@ + CDIALOG_ICON_WARNING, + CDIALOG_BTNFLAG_OK | CDIALOG_BTNFLAG_HELP, + CDIALOG_BTNFLAG_OK +@@ -4132,8 +4132,8 @@ static void EditorDoFindCB( CDialogGetResponse( - "No item selected!", + "No Item Selected", "No item selected to search through.", -"You have not selected an item with text\n\ -to search through.", @@ -45,92 +385,3 @@ $NetBSD: patch-ae,v 1.3 2004/03/20 22:08:11 agc Exp $ CDIALOG_ICON_WARNING, CDIALOG_BTNFLAG_OK | CDIALOG_BTNFLAG_HELP, CDIALOG_BTNFLAG_OK -@@ -4607,9 +4607,9 @@ - CDialogGetResponse( - "Search wrapped!", - "Search wrapped!", --"The matched string was found before the last\n\ --cursor position, implying that no further text\n\ --was matched after the cursor position.", -+"The matched string was found before the last\n" -+"cursor position, implying that no further text\n" -+"was matched after the cursor position.", - CDIALOG_ICON_INFO, - CDIALOG_BTNFLAG_OK | CDIALOG_BTNFLAG_HELP, - CDIALOG_BTNFLAG_OK -@@ -4620,9 +4620,9 @@ - CDialogGetResponse( - "String not found!", - "String not found!", --"The given string to be searched was not found\n\ --in the text, implying that the search string\n\ --does not exist in the text.", -+"The given string to be searched was not found\n" -+"in the text, implying that the search string\n" -+"does not exist in the text.", - CDIALOG_ICON_WARNING, - CDIALOG_BTNFLAG_OK | CDIALOG_BTNFLAG_HELP, - CDIALOG_BTNFLAG_OK -@@ -4661,9 +4661,9 @@ - CDialogGetResponse( - "Search wrapped!", - "Search wrapped!", --"The matched string was found before the last\n\ --cursor position, implying that no further text\n\ --was matched after the cursor position.", -+"The matched string was found before the last\n" -+"cursor position, implying that no further text\n" -+"was matched after the cursor position.", - CDIALOG_ICON_INFO, - CDIALOG_BTNFLAG_OK | CDIALOG_BTNFLAG_HELP, - CDIALOG_BTNFLAG_OK -@@ -4674,9 +4674,9 @@ - CDialogGetResponse( - "String not found!", - "String not found!", --"The given string to be searched was not found\n\ --in the text, implying that the search string\n\ --does not exist in the text.", -+"The given string to be searched was not found\n" -+"in the text, implying that the search string\n" -+"does not exist in the text.", - CDIALOG_ICON_WARNING, - CDIALOG_BTNFLAG_OK | CDIALOG_BTNFLAG_HELP, - CDIALOG_BTNFLAG_OK -@@ -4725,8 +4725,8 @@ - CDialogGetResponse( - "No item selected!", - "No item selected to search and replacethrough.", --"You have not selected an item with text\n\ --to search and replace through.", -+"You have not selected an item with text\n" -+"to search and replace through.", - CDIALOG_ICON_WARNING, - CDIALOG_BTNFLAG_OK | CDIALOG_BTNFLAG_HELP, - CDIALOG_BTNFLAG_OK -@@ -4784,9 +4784,9 @@ - CDialogGetResponse( - "String not found!", - "String not found!", --"The given string to be searched and replaced\n\ --was not found in the text, implying that the\n\ --search string does not exist in the text.", -+"The given string to be searched and replaced\n" -+"was not found in the text, implying that the\n" -+"search string does not exist in the text.", - CDIALOG_ICON_WARNING, - CDIALOG_BTNFLAG_OK | CDIALOG_BTNFLAG_HELP, - CDIALOG_BTNFLAG_OK -@@ -4826,9 +4826,9 @@ - CDialogGetResponse( - "String not found!", - "String not found!", --"The given string to be searched and replaced\n\ --was not found in the text, implying that the\n\ --search string does not exist in the text.", -+"The given string to be searched and replaced\n" -+"was not found in the text, implying that the\n" -+"search string does not exist in the text.", - CDIALOG_ICON_WARNING, - CDIALOG_BTNFLAG_OK | CDIALOG_BTNFLAG_HELP, - CDIALOG_BTNFLAG_OK diff --git a/editors/manedit/patches/patch-ag b/editors/manedit/patches/patch-ag new file mode 100644 index 00000000000..483e1119526 --- /dev/null +++ b/editors/manedit/patches/patch-ag @@ -0,0 +1,22 @@ +$NetBSD: patch-ag,v 1.1 2007/10/14 07:49:54 rillig Exp $ + +--- fb.c.orig 2007-02-11 09:00:00.000000000 +0100 ++++ fb.c 2007-10-14 09:39:47.000000000 +0200 +@@ -14,7 +14,7 @@ + # if defined(__SOLARIS__) + # include <sys/mnttab.h> + # include <sys/vfstab.h> +-# elif defined(__FreeBSD__) ++# elif defined(__FreeBSD__) || defined(__NetBSD__) + /* # include <mntent.h> */ + # else + # include <mntent.h> +@@ -819,7 +819,7 @@ static GList *FileBrowserGetDrivePaths(v + } + + return(paths_list); +-#elif defined(__FreeBSD__) ++#elif defined(__FreeBSD__) || defined(__NetBSD__) + return(NULL); + #else /* UNIX */ + GList *paths_list = NULL; |