Date: Tue, 18 Nov 2003 12:38:37 +0100 From: Simon Barner <barner@in.tum.de> To: Kirill Ponomarew <krion@FreeBSD.org> Cc: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/59413: mail/faces: Fix build Message-ID: <20031118113837.GD20471@zi025.glhnet.mhn.de> In-Reply-To: <200311181104.hAIB4HoJ059261@freefall.freebsd.org> References: <200311181104.hAIB4HoJ059261@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
> I couldn't apply cleanly your patches. Could you
> please check it again ?
Done. Please find a revised version of the patch at the bottom of this
message. (I am switching to a CVS based ports collection at the
present, and it seems that I did something wrong. The attached patch
was produced with my proven and tested conventional method)
diff -ruN faces.orig/files/patch-ca faces/files/patch-ca
--- faces.orig/files/patch-ca Sun Jan 19 20:07:23 2003
+++ faces/files/patch-ca Tue Nov 18 12:32:13 2003
@@ -1,28 +1,6 @@
*** compface/arith.c Tue Jan 15 23:58:46 2002
--- /home/lkoeller/tmp/ports/mail/faces/work/faces/compface/arith.c Thu Oct 24 03:28:07 1991
***************
-*** 1,10 ****
--
- /*
-- * $Header: /cvs/faces/faces/compface/arith.c,v 1.2 2002/01/15 22:58:46 devface Exp $
-- *
- * Compface - 48x48x1 image compression and decompression
- *
-! * Copyright (c) 1990-2002 James Ashton - Sydney University
- *
- * Permission is given to distribute these sources, as long as the
- * copyright messages are not removed, and no monies are exchanged.
---- 1,9 ----
- /*
- * Compface - 48x48x1 image compression and decompression
- *
-! * Copyright (c) James Ashton - Sydney University - June 1990.
-! *
-! * Written 11th November 1989.
- *
- * Permission is given to distribute these sources, as long as the
- * copyright messages are not removed, and no monies are exchanged.
-***************
*** 17,33 ****
#include "compface.h"
diff -ruN faces.orig/files/patch-cb faces/files/patch-cb
--- faces.orig/files/patch-cb Sun Jan 19 20:07:23 2003
+++ faces/files/patch-cb Tue Nov 18 12:32:09 2003
@@ -1,29 +1,6 @@
*** compface/cmain.c Thu Feb 21 16:42:54 2002
--- /home/lkoeller/tmp/ports/mail/faces/work/faces/compface/cmain.c Thu Oct 24 03:28:07 1991
***************
-*** 1,9 ****
-
-! /* $Header: /cvs/faces/faces/compface/cmain.c,v 1.3 2002/02/21 15:42:54 devface Exp $
- *
- * Compface - 48x48x1 image compression.
- *
-! * Copyright (c) 1990-2002 James Ashton - Sydney University
- *
- * Permission is given to distribute these sources, as long as the
- * copyright messages are not removed, and no monies are exchanged.
---- 1,11 ----
-
-! /* @(#)cmain.c 1.7 91/10/24
- *
- * Compface - 48x48x1 image compression.
- *
-! * Copyright (c) James Ashton - Sydney University - June 1990.
-! *
-! * Written 11th November 1889.
- *
- * Permission is given to distribute these sources, as long as the
- * copyright messages are not removed, and no monies are exchanged.
-***************
*** 13,89 ****
* to me, then an attempt will be made to fix them.
*/
diff -ruN faces.orig/files/patch-cc faces/files/patch-cc
--- faces.orig/files/patch-cc Sun Jan 19 20:07:23 2003
+++ faces/files/patch-cc Tue Nov 18 12:32:04 2003
@@ -1,28 +1,6 @@
*** compface/compface.1 Tue Jan 15 23:58:46 2002
--- /home/lkoeller/tmp/ports/mail/faces/work/faces/compface/compface.1 Sun Jan 19 19:35:35 2003
***************
-*** 1,4 ****
-! .TH COMPFACE 1 "15 January 2002"
- .SH NAME
- compface, uncompface \- compress and expand 48x48x1 face image files
- .SH SYNOPSIS
---- 1,4 ----
-! .TH COMPFACE 1 "25 January 1990"
- .SH NAME
- compface, uncompface \- compress and expand 48x48x1 face image files
- .SH SYNOPSIS
-***************
-*** 12,17 ****
---- 12,19 ----
- .LP
- .B uncompface
- [
-+ .B \-X
-+ ] [
- .I infile
- [
- .I outfile
-***************
*** 56,61 ****
--- 58,69 ----
.I compface
diff -ruN faces.orig/files/patch-cd faces/files/patch-cd
--- faces.orig/files/patch-cd Sun Jan 19 20:07:23 2003
+++ faces/files/patch-cd Tue Nov 18 12:32:00 2003
@@ -1,28 +1,6 @@
*** compface/compface.c Thu Feb 21 16:42:54 2002
--- /home/lkoeller/tmp/ports/mail/faces/work/faces/compface/compface.c Wed Jun 19 08:29:12 1991
***************
-*** 1,10 ****
--
- /*
-- * $Header: /cvs/faces/faces/compface/compface.c,v 1.3 2002/02/21 15:42:54 devface Exp $
-- *
- * Compface - 48x48x1 image compression and decompression
- *
-! * Copyright (c) 1990-2002 James Ashton - Sydney University
- *
- * Permission is given to distribute these sources, as long as the
- * copyright messages are not removed, and no monies are exchanged.
---- 1,9 ----
- /*
- * Compface - 48x48x1 image compression and decompression
- *
-! * Copyright (c) James Ashton - Sydney University - June 1990.
-! *
-! * Written 11th November 1989.
- *
- * Permission is given to distribute these sources, as long as the
- * copyright messages are not removed, and no monies are exchanged.
-***************
*** 14,29 ****
* to me, then an attempt will be made to fix them.
*/
diff -ruN faces.orig/files/patch-ce faces/files/patch-ce
--- faces.orig/files/patch-ce Sun Jan 19 20:07:23 2003
+++ faces/files/patch-ce Tue Nov 18 12:31:55 2003
@@ -1,28 +1,6 @@
*** compface/compface.h Thu Feb 21 16:42:54 2002
--- /home/lkoeller/tmp/ports/mail/faces/work/faces/compface/compface.h Thu Sep 5 07:24:42 1991
***************
-*** 1,10 ****
--
- /*
-- * $Header: /cvs/faces/faces/compface/compface.h,v 1.3 2002/02/21 15:42:54 devface Exp $
-- *
- * Compface - 48x48x1 image compression and decompression
- *
-! * Copyright (c) 1990-2002 James Ashton - Sydney University
- *
- * Permission is given to distribute these sources, as long as the
- * copyright messages are not removed, and no monies are exchanged.
---- 1,9 ----
- /*
- * Compface - 48x48x1 image compression and decompression
- *
-! * Copyright (c) James Ashton - Sydney University - June 1990.
-! *
-! * Written 11th November 1989.
- *
- * Permission is given to distribute these sources, as long as the
- * copyright messages are not removed, and no monies are exchanged.
-***************
*** 14,45 ****
* to me, then an attempt will be made to fix them.
*/
diff -ruN faces.orig/files/patch-cf faces/files/patch-cf
--- faces.orig/files/patch-cf Sun Jan 19 20:07:23 2003
+++ faces/files/patch-cf Tue Nov 18 12:31:49 2003
@@ -1,28 +1,6 @@
*** compface/compress.c Tue Jan 15 23:58:46 2002
--- /home/lkoeller/tmp/ports/mail/faces/work/faces/compface/compress.c Wed Jun 19 08:29:13 1991
***************
-*** 1,10 ****
--
- /*
-- * $Header: /cvs/faces/faces/compface/compress.c,v 1.2 2002/01/15 22:58:46 devface Exp $
-- *
- * Compface - 48x48x1 image compression and decompression
- *
-! * Copyright (c) 1990-2002 James Ashton - Sydney University
- *
- * Permission is given to distribute these sources, as long as the
- * copyright messages are not removed, and no monies are exchanged.
---- 1,9 ----
- /*
- * Compface - 48x48x1 image compression and decompression
- *
-! * Copyright (c) James Ashton - Sydney University - June 1990.
-! *
-! * Written 11th November 1989.
- *
- * Permission is given to distribute these sources, as long as the
- * copyright messages are not removed, and no monies are exchanged.
-***************
*** 17,113 ****
#include "compface.h"
diff -ruN faces.orig/files/patch-cg faces/files/patch-cg
--- faces.orig/files/patch-cg Sun Jan 19 20:07:23 2003
+++ faces/files/patch-cg Thu Jan 1 01:00:00 1970
@@ -1,25 +0,0 @@
-*** compface/data.h Tue Jan 15 23:58:46 2002
---- /home/lkoeller/tmp/ports/mail/faces/work/faces/compface/data.h Tue Jun 19 04:01:41 1990
-***************
-*** 1,10 ****
-
- /*
-- * $Header: /cvs/faces/faces/compface/data.h,v 1.2 2002/01/15 22:58:46 devface Exp $
-- *
- * Compface - 48x48x1 image compression and decompression
- *
-! * Copyright (c) 1990-2002 James Ashton - Sydney University
- *
- * Permission is given to distribute these sources, as long as the
- * copyright messages are not removed, and no monies are exchanged.
---- 1,10 ----
-
- /*
- * Compface - 48x48x1 image compression and decompression
- *
-! * Copyright (c) James Ashton - Sydney University - June 1990.
-! *
-! * Written 11th November 1989.
- *
- * Permission is given to distribute these sources, as long as the
- * copyright messages are not removed, and no monies are exchanged.
diff -ruN faces.orig/files/patch-ch faces/files/patch-ch
--- faces.orig/files/patch-ch Sun Jan 19 20:07:23 2003
+++ faces/files/patch-ch Tue Nov 18 12:31:32 2003
@@ -1,28 +1,6 @@
*** compface/file.c Tue Jan 15 23:58:46 2002
--- /home/lkoeller/tmp/ports/mail/faces/work/faces/compface/file.c Sun Jan 19 19:35:35 2003
***************
-*** 1,10 ****
--
- /*
-- * $Header: /cvs/faces/faces/compface/file.c,v 1.2 2002/01/15 22:58:46 devface Exp $
-- *
- * Compface - 48x48x1 image compression and decompression
- *
-! * Copyright (c) 1990-2002 James Ashton - Sydney University
- *
- * Permission is given to distribute these sources, as long as the
- * copyright messages are not removed, and no monies are exchanged.
---- 1,9 ----
- /*
- * Compface - 48x48x1 image compression and decompression
- *
-! * Copyright (c) James Ashton - Sydney University - June 1990.
-! *
-! * Written 11th November 1989.
- *
- * Permission is given to distribute these sources, as long as the
- * copyright messages are not removed, and no monies are exchanged.
-***************
*** 16,147 ****
#include "compface.h"
diff -ruN faces.orig/files/patch-ci faces/files/patch-ci
--- faces.orig/files/patch-ci Sun Jan 19 20:07:23 2003
+++ faces/files/patch-ci Tue Nov 18 12:31:26 2003
@@ -1,28 +1,6 @@
*** compface/gen.c Tue Jan 15 23:58:46 2002
--- /home/lkoeller/tmp/ports/mail/faces/work/faces/compface/gen.c Wed Jun 19 08:29:13 1991
***************
-*** 1,10 ****
--
- /*
-- * $Header: /cvs/faces/faces/compface/gen.c,v 1.2 2002/01/15 22:58:46 devface Exp $
-- *
- * Compface - 48x48x1 image compression and decompression
- *
-! * Copyright (c) 1990-2002 James Ashton - Sydney University
- *
- * Permission is given to distribute these sources, as long as the
- * copyright messages are not removed, and no monies are exchanged.
---- 1,9 ----
- /*
- * Compface - 48x48x1 image compression and decompression
- *
-! * Copyright (c) James Ashton - Sydney University - June 1990.
-! *
-! * Written 11th November 1989.
- *
- * Permission is given to distribute these sources, as long as the
- * copyright messages are not removed, and no monies are exchanged.
-***************
*** 18,79 ****
#define GEN(g) F[h] ^= G.g[k]; break
diff -ruN faces.orig/files/patch-cj faces/files/patch-cj
--- faces.orig/files/patch-cj Sun Jan 19 20:07:23 2003
+++ faces/files/patch-cj Tue Nov 18 12:31:21 2003
@@ -1,29 +1,6 @@
*** compface/uncmain.c Thu Feb 21 16:42:54 2002
--- /home/lkoeller/tmp/ports/mail/faces/work/faces/compface/uncmain.c Sun Jan 19 19:35:35 2003
***************
-*** 1,9 ****
-
-! /* $Header: /cvs/faces/faces/compface/uncmain.c,v 1.3 2002/02/21 15:42:54 devface Exp $
- *
- * Uncompface - 48x48x1 image decompression.
- *
-! * Copyright (c) 1990-2002 James Ashton - Sydney University
- *
- * Permission is given to distribute these sources, as long as the
- * copyright messages are not removed, and no monies are exchanged.
---- 1,11 ----
-
-! /* @(#)uncmain.c 1.4 91/10/24
- *
- * Uncompface - 48x48x1 image decompression.
- *
-! * Copyright (c) James Ashton - Sydney University - June 1990.
-! *
-! * Written 11th November 1889.
- *
- * Permission is given to distribute these sources, as long as the
- * copyright messages are not removed, and no monies are exchanged.
-***************
*** 13,28 ****
* to me, then an attempt will be made to fix them.
*/
diff -ruN faces.orig/files/patch-ck faces/files/patch-ck
--- faces.orig/files/patch-ck Sun Jan 19 20:07:23 2003
+++ faces/files/patch-ck Tue Nov 18 12:31:13 2003
@@ -1,28 +1,6 @@
*** compface/uncompface.c Thu Feb 21 16:42:54 2002
--- /home/lkoeller/tmp/ports/mail/faces/work/faces/compface/uncompface.c Wed Jun 19 08:29:14 1991
***************
-*** 1,10 ****
--
- /*
-- * $Header: /cvs/faces/faces/compface/uncompface.c,v 1.3 2002/02/21 15:42:54 devface Exp $
-- *
- * Compface - 48x48x1 image compression and decompression
- *
-! * Copyright (c) 1990-2002 James Ashton - Sydney University
- *
- * Permission is given to distribute these sources, as long as the
- * copyright messages are not removed, and no monies are exchanged.
---- 1,9 ----
- /*
- * Compface - 48x48x1 image compression and decompression
- *
-! * Copyright (c) James Ashton - Sydney University - June 1990.
-! *
-! * Written 11th November 1989.
- *
- * Permission is given to distribute these sources, as long as the
- * copyright messages are not removed, and no monies are exchanged.
-***************
*** 14,29 ****
* to me, then an attempt will be made to fix them.
*/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20031118113837.GD20471>