svn commit: r358362 - in head/misc/jive: . files

[John Marino]

Author: marino
Date: Thu Jun 19 07:59:14 2014
New Revision: 358362
URL: http://svnweb.freebsd.org/changeset/ports/358362
QAT: https://qat.redports.org/buildarchive/r358362/

Log:
  misc/jive: Stage support and unbreak on F10+
  
  In addition to stage changes:
    * use LOCAL/ instead of MASTER_SITE_LOCAL and MASTER_SITE_SUBDIR
    * narrow CONFLICTS to please portlint
    * Fix flex issues for FreeBSD 10+
    * removed unnecessary patch-aa by setting CC in MAKE_ARGS
  
  Approved by:	staging blanket

Added:
  head/misc/jive/files/patch-jive.l   (contents, props changed)
  head/misc/jive/files/patch-main.c   (contents, props changed)
Deleted:
  head/misc/jive/files/patch-aa
Modified:
  head/misc/jive/Makefile
  head/misc/jive/pkg-plist

Modified: head/misc/jive/Makefile
==============================================================================
--- head/misc/jive/Makefile	Thu Jun 19 07:22:56 2014	(r358361)
+++ head/misc/jive/Makefile	Thu Jun 19 07:59:14 2014	(r358362)
@@ -4,21 +4,18 @@
 PORTNAME=	jive
 PORTVERSION=	1.1
 CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_LOCAL} \
-		ftp://nuxi.ucdavis.edu/pub/misc/
-MASTER_SITE_SUBDIR=	obrien
+MASTER_SITES=	LOCAL/obrien ftp://nuxi.ucdavis.edu/pub/misc/
 
 MAINTAINER=	obrien at FreeBSD.org
 COMMENT=	Filter that converts English text to Jive
 
-CONFLICTS=	filters-* talkfilters-*
+CONFLICTS=	filters-2* talkfilters-2*
 
 WRKSRC=		${WRKDIR}/jive
-MAN1=		jive.1
+MAKE_ARGS+=	CC=${CC:Q} CFLAGS=${CFLAGS:Q}
 
-NO_STAGE=	yes
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/jive ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/${MAN1} ${PREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/jive ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/jive.1 ${STAGEDIR}${PREFIX}/man/man1
 
 .include <bsd.port.mk>

Added: head/misc/jive/files/patch-jive.l
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/misc/jive/files/patch-jive.l	Thu Jun 19 07:59:14 2014	(r358362)
@@ -0,0 +1,11 @@
+--- jive.l.orig	1997-02-03 11:04:51.000000000 +0000
++++ jive.l
+@@ -8,7 +8,7 @@ BW [ 	]
+ EW [ 	.,;!?]
+ 
+ %{
+-#define YY_DECL char * yylex YY_PROTO(( void ))
++#define YY_DECL char * yylex ( void )
+ 	char buf[128];
+ %}
+ 

Added: head/misc/jive/files/patch-main.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/misc/jive/files/patch-main.c	Thu Jun 19 07:59:14 2014	(r358362)
@@ -0,0 +1,11 @@
+--- main.c.orig	1997-02-03 10:59:32.000000000 +0000
++++ main.c
+@@ -7,7 +7,7 @@ char *yylex();
+ int main()
+ {
+ 	char *line;
+-	while(line = yylex()){
++	while((line = yylex())){
+ 		printf("%s", line);
+ 	}
+ 	return 0;

Modified: head/misc/jive/pkg-plist
==============================================================================
--- head/misc/jive/pkg-plist	Thu Jun 19 07:22:56 2014	(r358361)
+++ head/misc/jive/pkg-plist	Thu Jun 19 07:59:14 2014	(r358362)
@@ -1 +1,2 @@
 bin/jive
+man/man1/jive.1.gz