diff options
| author | jperkin <jperkin@pkgsrc.org> | 2017-05-15 08:38:34 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2017-05-15 08:38:34 +0000 |
| commit | 5e2305091dfd905e9c6d1612beae6cae7a02d649 (patch) | |
| tree | 803d27fceeff7582f5e7731b0811581e276346c0 | |
| parent | e229800b4f44716cc9dc1ab33e29e7351c39fdd8 (diff) | |
| download | pkgsrc-5e2305091dfd905e9c6d1612beae6cae7a02d649.tar.gz | |
Requires termcap. Use the framework to find the correct library.
| -rw-r--r-- | misc/fep/Makefile | 3 | ||||
| -rw-r--r-- | misc/fep/distinfo | 4 | ||||
| -rw-r--r-- | misc/fep/patches/patch-aa | 21 |
3 files changed, 11 insertions, 17 deletions
diff --git a/misc/fep/Makefile b/misc/fep/Makefile index 597664bd68d..c2fd2222f44 100644 --- a/misc/fep/Makefile +++ b/misc/fep/Makefile @@ -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" diff --git a/misc/fep/distinfo b/misc/fep/distinfo index 8bb310ff2cb..aee0f4f9975 100644 --- a/misc/fep/distinfo +++ b/misc/fep/distinfo @@ -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 diff --git a/misc/fep/patches/patch-aa b/misc/fep/patches/patch-aa index 8bf66caaba1..16e61c54270 100644 --- a/misc/fep/patches/patch-aa +++ b/misc/fep/patches/patch-aa @@ -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:44:44 jperkin Exp $ +#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) |