From 3495f665d63063602bfe37724a12bd686a8cb85a Mon Sep 17 00:00:00 2001 From: agc Date: Sat, 20 Mar 2004 22:08:10 +0000 Subject: Make this compilable by gcc3 - no more multi-line string constants, link with the correct compiler invocation. --- editors/manedit/distinfo | 4 +- editors/manedit/patches/patch-ae | 136 +++++++++++++++++++++++++++++++++++++++ editors/manedit/patches/patch-af | 13 ++++ 3 files changed, 152 insertions(+), 1 deletion(-) create mode 100644 editors/manedit/patches/patch-ae create mode 100644 editors/manedit/patches/patch-af (limited to 'editors/manedit') diff --git a/editors/manedit/distinfo b/editors/manedit/distinfo index 034b40f89db..40ad0fcab5e 100644 --- a/editors/manedit/distinfo +++ b/editors/manedit/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2002/12/30 00:00:17 kristerw Exp $ +$NetBSD: distinfo,v 1.6 2004/03/20 22:08:10 agc Exp $ SHA1 (manedit-0.5.6.tar.bz2) = 1a6f413f614e5f3620fd9fae16d754eb722984e6 Size (manedit-0.5.6.tar.bz2) = 425714 bytes @@ -6,3 +6,5 @@ SHA1 (patch-aa) = 9ace1dfdc027cbda50e2c06f08db6c16e2c27b63 SHA1 (patch-ab) = 80a4e693601b353c271d1fbd9afb31bace75f75e SHA1 (patch-ac) = 05b59bc0315256dc9486f361699e1fa1688a3a04 SHA1 (patch-ad) = c59ff342f72f33834b1a25e300a36d2579330686 +SHA1 (patch-ae) = 9cb79121a5c271d240b4362c91ad59bed499c571 +SHA1 (patch-af) = 8ff383b82b3813778aefa0e5ec72a76246089fbc diff --git a/editors/manedit/patches/patch-ae b/editors/manedit/patches/patch-ae new file mode 100644 index 00000000000..fcf2cf0e15e --- /dev/null +++ b/editors/manedit/patches/patch-ae @@ -0,0 +1,136 @@ +$NetBSD: patch-ae,v 1.3 2004/03/20 22:08:11 agc 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. */ + 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'.", + 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.", +-"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 @@ + CDialogGetResponse( + "No item selected!", + "No item selected to search through.", +-"You have not selected an item with text\n\ +-to search through.", ++"You have not selected an item with text\n" ++"to search through.", + 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-af b/editors/manedit/patches/patch-af new file mode 100644 index 00000000000..7323c28a22e --- /dev/null +++ b/editors/manedit/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.3 2004/03/20 22:08:11 agc Exp $ + +--- Makefile.FreeBSD 2004/03/20 22:04:43 1.1 ++++ Makefile.FreeBSD 2004/03/20 22:04:48 +@@ -116,7 +116,7 @@ + # Build Rules: + # + $(BIN): $(OBJ_C) $(OBJ_CPP) +- $(CC) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIB) $(LIB_DIR) ++ $(CXX) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIB) $(LIB_DIR) + + all: $(BIN) $(BIN).1.out + -- cgit v1.2.3