CVS commit: pkgsrc/misc/fep

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon May 15 08:38:34 UTC 2017

Modified Files:
        pkgsrc/misc/fep: Makefile distinfo
        pkgsrc/misc/fep/patches: patch-aa

Log Message:
Requires termcap.  Use the framework to find the correct library.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/misc/fep/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/misc/fep/distinfo
cvs rdiff -u -r1.10 -r1.11 pkgsrc/misc/fep/patches/patch-aa

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/misc/fep/Makefile
diff -u pkgsrc/misc/fep/Makefile:1.24 pkgsrc/misc/fep/Makefile:1.25
--- pkgsrc/misc/fep/Makefile:1.24       Thu Sep  8 14:44:44 2016
+++ pkgsrc/misc/fep/Makefile    Mon May 15 08:38:34 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2016/09/08 14:44:44 jperkin Exp $
+# $NetBSD: Makefile,v 1.25 2017/05/15 08:38:34 jperkin Exp $
 
 DISTNAME=      fep
 PKGNAME=       fep-1.0
@@ -30,4 +30,5 @@ pre-build:
                        ${MV} -f $${i}.new $${i}; \
                done
 
+.include "../../mk/termcap.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/misc/fep/distinfo
diff -u pkgsrc/misc/fep/distinfo:1.20 pkgsrc/misc/fep/distinfo:1.21
--- pkgsrc/misc/fep/distinfo:1.20       Thu Sep  8 14:44:44 2016
+++ pkgsrc/misc/fep/distinfo    Mon May 15 08:38:34 2017
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.20 2016/09/08 14:44:44 jperkin Exp $
+$NetBSD: distinfo,v 1.21 2017/05/15 08:38:34 jperkin Exp $
 
 SHA1 (fep.tar.gz) = 73fa55337b12dba3b91c9895e2c9adbbdfa9d960
 RMD160 (fep.tar.gz) = 2a8b9eeecd5c76bec5cdb524ae6c650f298ccbde
 SHA512 (fep.tar.gz) = a681743a5f4a8f96f8f445e68e7368e1d8b8130ade9021f64f5b8f00f2f25701d94150462072d7f72c51a58bc831423e22e650766b3408f0abdd0ee50f69e0a3
 Size (fep.tar.gz) = 40137 bytes
-SHA1 (patch-aa) = 17a6fb54130e504c3bb00afdae4b13b0053faf6b
+SHA1 (patch-aa) = 16fcdde2efd0da35447358bfbdc462474eb0db2b
 SHA1 (patch-ab) = 2b6f6cff25a21b374dce4b0162dc06a6d0b6c24f
 SHA1 (patch-ac) = ceebee84f6acbf834d3a38b6f8738dab98b091af
 SHA1 (patch-ad) = 78d5fd59d51542d304d3adcdde3a7ac48790d857

Index: pkgsrc/misc/fep/patches/patch-aa
diff -u pkgsrc/misc/fep/patches/patch-aa:1.10 pkgsrc/misc/fep/patches/patch-aa:1.11
--- pkgsrc/misc/fep/patches/patch-aa:1.10       Thu Sep  8 14:44:44 2016
+++ pkgsrc/misc/fep/patches/patch-aa    Mon May 15 08:38:34 2017
@@ -1,8 +1,10 @@
-$NetBSD: patch-aa,v 1.10 2016/09/08 14:44:44 jperkin Exp $
+$NetBSD: patch-aa,v 1.11 2017/05/15 08:38:34 jperkin Exp $
+
+Use pkgsrc flags.
 
 --- Makefile.orig      1993-06-10 02:51:22.000000000 +0000
 +++ Makefile
-@@ -15,17 +15,30 @@ OBJ        = fep_main.o fep_edit.o fep_hist.o f
+@@ -15,17 +15,20 @@ OBJ        = fep_main.o fep_edit.o fep_hist.o f
  DISTRIBUTION\
        = Makefile fep.1 $(HEADER) $(SRC) feprc.sample README
  
@@ -19,25 +21,16 @@ $NetBSD: patch-aa,v 1.10 2016/09/08 14:4
 +#DEBUG        = -O
  
 -CFLAGS        = $(DEBUG) $(CONFIG)
+-LDFLAGS = -ltermcap
 +CFLAGS        += $(DEBUG) $(CONFIG)
 +.if exists(/dev/ptmx)
 +CFLAGS        += -DHAVE_PTMX
 +.endif
-+.if exists(/usr/lib/libtermcap.a)
-+.if exists(/usr/lib/libcompat.a)
-+LDFLAGS = -ltermcap -lcompat
-+.else
- LDFLAGS = -ltermcap
-+.endif
-+.elif exists(/usr/lib/libncurses.a)
-+LDFLAGS = -lncurses
-+.else
-+LDFLAGS = -lcurses
-+.endif
++LDFLAGS += -ltermcap
  
  all: $(TARGET)
  
-@@ -36,8 +49,8 @@ argv: fep_com.c
+@@ -36,8 +39,8 @@ argv: fep_com.c
        $(CC) -o argv -DMKARGDEBUG fep_util.c
  
  install: $(TARGET)