Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 13 Feb 2016 12:18:11 +0000 (UTC)
From:      John Marino <marino@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r408789 - in head/japanese/lipsf: . files
Message-ID:  <201602131218.u1DCIB26002286@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marino
Date: Sat Feb 13 12:18:10 2016
New Revision: 408789
URL: https://svnweb.freebsd.org/changeset/ports/408789

Log:
  japanese/lipsf: USES+= ncurses, respect LDFLAGS
  
  Also link with ncurses, not curses or termcap

Added:
  head/japanese/lipsf/files/patch-machine.h   (contents, props changed)
Modified:
  head/japanese/lipsf/Makefile
  head/japanese/lipsf/files/patch-Makefile.in

Modified: head/japanese/lipsf/Makefile
==============================================================================
--- head/japanese/lipsf/Makefile	Sat Feb 13 12:01:16 2016	(r408788)
+++ head/japanese/lipsf/Makefile	Sat Feb 13 12:18:10 2016	(r408789)
@@ -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

Modified: head/japanese/lipsf/files/patch-Makefile.in
==============================================================================
--- head/japanese/lipsf/files/patch-Makefile.in	Sat Feb 13 12:01:16 2016	(r408788)
+++ head/japanese/lipsf/files/patch-Makefile.in	Sat Feb 13 12:18:10 2016	(r408789)
@@ -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)

Added: head/japanese/lipsf/files/patch-machine.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/lipsf/files/patch-machine.h	Sat Feb 13 12:18:10 2016	(r408789)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602131218.u1DCIB26002286>