diff options
| author | marino <marino@FreeBSD.org> | 2014-06-19 15:59:14 +0800 |
|---|---|---|
| committer | marino <marino@FreeBSD.org> | 2014-06-19 15:59:14 +0800 |
| commit | 1e86c544df6f1a57a52735a8dcb9df9d23516d73 (patch) | |
| tree | 78184e98a24acebefa516f65f6f4c956df83d826 /misc/jive | |
| parent | 9bd9c4cffda437945c9b418d398b4dfbfc762fb8 (diff) | |
| download | freebsd-ports-gnome-1e86c544df6f1a57a52735a8dcb9df9d23516d73.tar.gz freebsd-ports-gnome-1e86c544df6f1a57a52735a8dcb9df9d23516d73.tar.zst freebsd-ports-gnome-1e86c544df6f1a57a52735a8dcb9df9d23516d73.zip | |
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
Diffstat (limited to 'misc/jive')
| -rw-r--r-- | misc/jive/Makefile | 13 | ||||
| -rw-r--r-- | misc/jive/files/patch-aa | 10 | ||||
| -rw-r--r-- | misc/jive/files/patch-jive.l | 11 | ||||
| -rw-r--r-- | misc/jive/files/patch-main.c | 11 | ||||
| -rw-r--r-- | misc/jive/pkg-plist | 1 |
5 files changed, 28 insertions, 18 deletions
diff --git a/misc/jive/Makefile b/misc/jive/Makefile index 4959fb474097..230a9211ee98 100644 --- a/misc/jive/Makefile +++ b/misc/jive/Makefile @@ -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@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> diff --git a/misc/jive/files/patch-aa b/misc/jive/files/patch-aa deleted file mode 100644 index 0cc9a72f671a..000000000000 --- a/misc/jive/files/patch-aa +++ /dev/null @@ -1,10 +0,0 @@ ---- Makefile.orig Fri Apr 5 18:55:29 2002 -+++ Makefile Fri Apr 5 18:55:40 2002 -@@ -1,5 +1,5 @@ --CC = gcc --CFLAGS = -O2 -fomit-frame-pointer -+#CC = gcc -+#CFLAGS = -O2 -fomit-frame-pointer - LDFLAGS = -s - LEX = flex - LEXLIB = -lfl diff --git a/misc/jive/files/patch-jive.l b/misc/jive/files/patch-jive.l new file mode 100644 index 000000000000..7cbd83f426ce --- /dev/null +++ b/misc/jive/files/patch-jive.l @@ -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]; + %} + diff --git a/misc/jive/files/patch-main.c b/misc/jive/files/patch-main.c new file mode 100644 index 000000000000..31bd1052016b --- /dev/null +++ b/misc/jive/files/patch-main.c @@ -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; diff --git a/misc/jive/pkg-plist b/misc/jive/pkg-plist index 923eae62ab17..9fb7f303f765 100644 --- a/misc/jive/pkg-plist +++ b/misc/jive/pkg-plist @@ -1 +1,2 @@ bin/jive +man/man1/jive.1.gz |