From owner-freebsd-questions@FreeBSD.ORG Fri Mar 28 17:54:43 2003 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 08E4837B401 for ; Fri, 28 Mar 2003 17:54:43 -0800 (PST) Received: from mail.clubplus.net (mail.clubplus.net [216.191.22.200]) by mx1.FreeBSD.org (Postfix) with ESMTP id CFB3D43FD7 for ; Fri, 28 Mar 2003 17:54:41 -0800 (PST) (envelope-from david@skytrackercanada.com) Received: from skytrackercanada.com (3s1.com [209.188.66.29]) by mail.clubplus.net (8.12.7/8.12.7) with ESMTP id h2T1uGDa010540 for ; Fri, 28 Mar 2003 20:56:19 -0500 Received: (from root@localhost) by skytrackercanada.com (8.12.6/8.12.6) id h2T1sbqV099623 for questions@freebsd.org; Fri, 28 Mar 2003 20:54:37 -0500 (EST) (envelope-from david@skytrackercanada.com) Received: from skytrackercanada.com (localhost [127.0.0.1]) by skytrackercanada.com (8.12.6/8.12.6) with ESMTP id h2T1sbwP099597 for ; Fri, 28 Mar 2003 20:54:37 -0500 (EST) (envelope-from david@skytrackercanada.com) Received: (from david@localhost) by skytrackercanada.com (8.12.6/8.12.6/Submit) id h2T1sXGW099596 for questions@freebsd.org; Fri, 28 Mar 2003 20:54:33 -0500 (EST) (envelope-from david) Date: Fri, 28 Mar 2003 20:54:33 -0500 From: David Banning To: questions@freebsd.org Message-ID: <20030328205433.A99562@skytrackercanada.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i X-scanner: scanned by Inflex 1.0.12.3 - (http://pldaniels.com/inflex/) X-RAVMilter-Version: 8.4.2(snapshot 20021217) (mail) Subject: adding a patch to a port X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Mar 2003 01:54:49 -0000 I was given a patch for the dillo port which I don't quite know how to configure. I wonder how I can take this format and turn it into something I can use in the port. It seems that most patches in the ports are separated as individual files while this one has them in one file. Is there a simple way to reconfigure it or is a test editor the only way? A sample of the patch follows; diff -pur dillo-0.7.1/dpi/bm_srv12.c dillo-0.7.1-mzz/dpi/bm_srv12.c --- dillo-0.7.1/dpi/bm_srv12.c 2003-03-07 23:59:03.000000000 +0200 +++ dillo-0.7.1-mzz/dpi/bm_srv12.c 2003-03-29 03:17:52.000000000 +0200 @@ -855,6 +855,7 @@ int Bms_save() BmSec *sec_node; GSList *list, *list2; GString *gstr = g_string_new(""); + gchar *BmTmp; struct stat BmStat; /* make a safety backup */ @@ -864,8 +865,9 @@ int Bms_save() g_free(BmFileBak); } + BmTmp = g_strconcat(BmFile, ".tmp", NULL); /* open bm file */ - if (!(BmTxt = fopen(BmFile, "w"))) { + if (!(BmTxt = fopen(BmTmp, "w"))) { perror("[fopen]"); return 1; } @@ -895,6 +897,8 @@ int Bms_save() g_string_free(gstr, TRUE); fclose(BmTxt); + rename(BmTmp, BmFile); + g_free(BmTmp); /* keep track of the timestamp */ stat(BmFile, &BmStat); diff -pur dillo-0.7.1/src/IO/IO.c dillo-0.7.1-mzz/src/IO/IO.c --- dillo-0.7.1/src/IO/IO.c 2003-03-09 17:25:53.000000000 +0200 +++ dillo-0.7.1-mzz/src/IO/IO.c 2003-03-29 03:17:52.000000000 +0200 @@ -572,7 +572,7 @@ void a_IO_ccc(int Op, int Branch, int Di { IOData_t *io = Data1; - a_Chain_debug_msg("a_IO_ccc", Op, Branch, Dir); +// a_Chain_debug_msg("a_IO_ccc", Op, Branch, Dir); if (Branch == 1) { if (Dir == BCK) { diff -pur dillo-0.7.1/src/IO/Url.c dillo-0.7.1-mzz/src/IO/Url.c --- dillo-0.7.1/src/IO/Url.c 2002-08-10 16:13:41.000000000 +0300 +++ dillo-0.7.1-mzz/src/IO/Url.c 2003-03-29 03:17:52.000000000 +0200 @@ -78,6 +78,7 @@ G_GNUC_UNUSED static gint Url_add_opener ChainFunction_t a_Url_get_ccc_funct(const DilloUrl *Url) { static UrlMethod2_t cccList[] = { {"http" , a_Http_ccc}, + {"https", a_Http_ccc}, {"file" , a_File_ccc}, {"about", a_About_ccc}, {"dpi" , a_Dpi_ccc} }; diff -pur dillo-0.7.1/src/IO/dpi.c dillo-0.7.1-mzz/src/IO/dpi.c --- dillo-0.7.1/src/IO/dpi.c 2003-02-28 21:43:06.000000000 +0200 +++ dillo-0.7.1-mzz/src/IO/dpi.c 2003-03-29 03:17:52.000000000 +0200 @@ -253,6 +253,11 @@ static void Dpi_parse_token(conn_data_t a_Chain_fcb(OpSend, conn->InfoRecv, msg, cmd);