svn commit: r343685 - in head/textproc/par: . files

[Mark Murray]

Author: markm (src committer)
Date: Mon Feb 10 21:31:14 2014
New Revision: 343685
URL: http://svnweb.freebsd.org/changeset/ports/343685
QAT: https://qat.redports.org/buildarchive/r343685/

Log:
  Fix to add staging support.
  While I'm here, fix compilation; subtracting 2 pointers on a 64-bit
  machine gives something the same size as a size_t.
  Refactor the patches by using 'make makepatch'.
  
  PR:             186604
  Submitted by:   Mikhail - mp39590 gmail com

Added:
  head/textproc/par/files/patch-protoMakefile   (contents, props changed)
  head/textproc/par/files/patch-reformat.c   (contents, props changed)
Deleted:
  head/textproc/par/files/patch-aa
Modified:
  head/textproc/par/Makefile
  head/textproc/par/files/patch-par.c

Modified: head/textproc/par/Makefile
==============================================================================
--- head/textproc/par/Makefile	Mon Feb 10 21:10:27 2014	(r343684)
+++ head/textproc/par/Makefile	Mon Feb 10 21:31:14 2014	(r343685)
@@ -8,21 +8,21 @@ CATEGORIES=	textproc
 MASTER_SITES=	http://www.nicemice.net/par/
 DISTNAME=	Par${PORTVERSION:S|.||}
 
-MAINTAINER=	mark at grondar.za
+MAINTAINER=	markm at FreeBSD.org
 COMMENT=	Paragraph reformatter for email
 
 CONFLICTS=	quake-par-[0-9]*
 
 ALL_TARGET=	#
 MAN1=		par.1
-PLIST_FILES=	bin/par
+PLIST_FILES=	bin/par \
+		man/man1/par.1.gz
 
-NO_STAGE=	yes
 do-configure:
 	(cd ${WRKSRC}; ${CP} protoMakefile Makefile)
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/par ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/par.1 ${MANPREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/par ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/par.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
 .include <bsd.port.mk>

Modified: head/textproc/par/files/patch-par.c
==============================================================================
--- head/textproc/par/files/patch-par.c	Mon Feb 10 21:10:27 2014	(r343684)
+++ head/textproc/par/files/patch-par.c	Mon Feb 10 21:31:14 2014	(r343685)
@@ -1,5 +1,5 @@
---- par.c.orig	Sun Mar 28 16:00:15 2004
-+++ par.c	Sun Mar 28 16:04:00 2004
+--- ./par.c.orig	2001-04-02 05:25:57.000000000 +0100
++++ ./par.c	2014-02-10 21:14:29.000000000 +0000
 @@ -403,7 +403,8 @@
          }
          continue;

Added: head/textproc/par/files/patch-protoMakefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/par/files/patch-protoMakefile	Mon Feb 10 21:31:14 2014	(r343685)
@@ -0,0 +1,11 @@
+--- ./protoMakefile.orig	2001-03-09 00:53:25.000000000 +0000
++++ ./protoMakefile	2014-02-10 21:14:29.000000000 +0000
+@@ -47,7 +47,7 @@
+ # Example (for Solaris 2.x with SPARCompiler C):
+ # CC = cc -c -O -s -Xc -DDONTFREE
+ 
+-CC = cc -c
++CC = cc -c ${CFLAGS}
+ 
+ # Define LINK1 and LINK2 so that the command
+ #

Added: head/textproc/par/files/patch-reformat.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/par/files/patch-reformat.c	Mon Feb 10 21:31:14 2014	(r343685)
@@ -0,0 +1,11 @@
+--- ./reformat.c.orig	2014-02-10 21:14:43.000000000 +0000
++++ ./reformat.c	2014-02-10 21:17:35.000000000 +0000
+@@ -335,7 +335,7 @@
+     for (end = *line;  *end;  ++end);
+     if (end - *line < affix) {
+       sprintf(errmsg,
+-              "Line %d shorter than <prefix> + <suffix> = %d + %d = %d\n",
++              "Line %zd shorter than <prefix> + <suffix> = %d + %d = %d\n",
+               line - inlines + 1, prefix, suffix, affix);
+       goto rfcleanup;
+     }