diff options
| author | John Marino <marino@FreeBSD.org> | 2016-02-13 12:18:10 +0000 |
|---|---|---|
| committer | John Marino <marino@FreeBSD.org> | 2016-02-13 12:18:10 +0000 |
| commit | 42770a946e1d64157478c550171a0ed98521b37c (patch) | |
| tree | b55edb8ef06b08262862e08726725d89ce4f1b6d /japanese | |
| parent | - Update to 4.41 (diff) | |
japanese/lipsf: USES+= ncurses, respect LDFLAGS
Also link with ncurses, not curses or termcap
Notes
Notes:
svn path=/head/; revision=408789
Diffstat (limited to 'japanese')
| -rw-r--r-- | japanese/lipsf/Makefile | 1 | ||||
| -rw-r--r-- | japanese/lipsf/files/patch-Makefile.in | 12 | ||||
| -rw-r--r-- | japanese/lipsf/files/patch-machine.h | 14 |
3 files changed, 22 insertions, 5 deletions
diff --git a/japanese/lipsf/Makefile b/japanese/lipsf/Makefile index 441c1183ea3d..52b4b952daf7 100644 --- a/japanese/lipsf/Makefile +++ b/japanese/lipsf/Makefile @@ -11,6 +11,7 @@ DISTNAME= ${PORTNAME}${PORTVERSION:S/.//} MAINTAINER= ports@FreeBSD.org COMMENT= Text to LIPS filter +USES= ncurses WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.//} PLIST_FILES= bin/lipsf bin/pols man/ja/man1/lipsf.1.gz man/ja/man1/pols.1.gz diff --git a/japanese/lipsf/files/patch-Makefile.in b/japanese/lipsf/files/patch-Makefile.in index c90d97f68c4c..302e91703781 100644 --- a/japanese/lipsf/files/patch-Makefile.in +++ b/japanese/lipsf/files/patch-Makefile.in @@ -1,5 +1,5 @@ ---- Makefile.in.orig Sat Nov 18 00:00:00 2000 -+++ Makefile.in Thu Apr 5 04:47:50 2001 +--- Makefile.in.orig 2002-05-27 15:00:00 UTC ++++ Makefile.in @@ -3,13 +3,13 @@ # @@ -18,16 +18,18 @@ CHMOD = chmod LSRC = lipsf.c output.c print.c control.c args.c var.c -@@ -43,7 +43,7 @@ +@@ -42,8 +42,8 @@ POLSB = $(POLS)__EXE__ + POBJ1 = pols__OBJ__ term__OBJ__ input__OBJ__ file__OBJ__ style__OBJ__ __DOSOBJ__ POBJ2 = output__OBJ__ print__OBJ__ control__OBJ__ args__OBJ__ var__OBJ__ __DOSOBJS__ KNJOBJ = pols__OBJ__ input__OBJ__ file__OBJ__ style__OBJ__ - LDFLAGS = __TERMLIBS__ __OTHERLIBS__ +-LDFLAGS = __TERMLIBS__ __OTHERLIBS__ -CFLAGS = -D__OSTYPE__ __CCOPTIONS__ ++LDFLAGS += __TERMLIBS__ __OTHERLIBS__ +CFLAGS += -D__OSTYPE__ .SUFFIXES: .h .c __OBJ__ __EXE__ -@@ -115,14 +115,10 @@ +@@ -115,14 +115,10 @@ config.h: config.hin # to install all install: $(LIPSFB) $(POLSB) $(LIPSF).$(MANSEC) $(POLS).$(MANSEC) diff --git a/japanese/lipsf/files/patch-machine.h b/japanese/lipsf/files/patch-machine.h new file mode 100644 index 000000000000..86b641d7df81 --- /dev/null +++ b/japanese/lipsf/files/patch-machine.h @@ -0,0 +1,14 @@ +--- machine.h.orig 2002-05-27 15:00:00 UTC ++++ machine.h +@@ -841,9 +841,9 @@ typedef long off_t; + #endif + #ifndef TERMCAPLIB + # ifdef USETERMINFO +-# define TERMCAPLIB "-lcurses" ++# define TERMCAPLIB "-lncurses" + # else +-# define TERMCAPLIB "-ltermlib" ++# define TERMCAPLIB "-lncurses" + # endif + #endif + #ifndef REGEXPLIB |