Requires termcap. Fix compiler/linker flags.diff -r1.15 -r1.16 pkgsrc/editors/beav/Makefile
(jperkin)
@@ -1,28 +1,29 @@ | @@ -1,28 +1,29 @@ | |||
1 | # $NetBSD: Makefile,v 1.15 2014/09/12 03:54:13 dholland Exp $ | 1 | # $NetBSD: Makefile,v 1.16 2017/05/09 14:51:36 jperkin Exp $ | |
2 | 2 | |||
3 | DISTNAME= beav_1.40.orig | 3 | DISTNAME= beav_1.40.orig | |
4 | PKGNAME= beav-1.40.18 | 4 | PKGNAME= beav-1.40.18 | |
5 | PKGREVISION= 1 | 5 | PKGREVISION= 1 | |
6 | CATEGORIES= editors | 6 | CATEGORIES= editors | |
7 | MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/b/beav/} | 7 | MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/b/beav/} | |
8 | 8 | |||
9 | PATCHFILES= beav_1.40-18.diff.gz | 9 | PATCHFILES= beav_1.40-18.diff.gz | |
10 | PATCH_SITES= ${MASTER_SITE_DEBIAN:=pool/main/b/beav/} | 10 | PATCH_SITES= ${MASTER_SITE_DEBIAN:=pool/main/b/beav/} | |
11 | PATCH_DIST_STRIP= -p1 | 11 | PATCH_DIST_STRIP= -p1 | |
12 | 12 | |||
13 | MAINTAINER= bad@NetBSD.org | 13 | MAINTAINER= bad@NetBSD.org | |
14 | COMMENT= Binary Editor And Viewer, a full featured binary file editor | 14 | COMMENT= Binary Editor And Viewer, a full featured binary file editor | |
15 | 15 | |||
16 | INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 | 16 | INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 | |
17 | 17 | |||
18 | WRKSRC= ${WRKDIR}/beav-140 | 18 | WRKSRC= ${WRKDIR}/beav-140 | |
19 | MAKE_ENV+= SED=${SED:Q} | 19 | MAKE_ENV+= SED=${SED:Q} | |
20 | BUILD_TARGET= beav | 20 | BUILD_TARGET= beav | |
21 | 21 | |||
22 | SUBST_CLASSES+= docpath | 22 | SUBST_CLASSES+= docpath | |
23 | SUBST_FILES.docpath= beav.1 | 23 | SUBST_FILES.docpath= beav.1 | |
24 | SUBST_STAGE.docpath= post-build | 24 | SUBST_STAGE.docpath= post-build | |
25 | SUBST_SED.docpath= -e 's,/usr/share/doc/,${PREFIX}/share/doc,' | 25 | SUBST_SED.docpath= -e 's,/usr/share/doc/,${PREFIX}/share/doc,' | |
26 | SUBST_MESSAGE.docpath= Fixing path in documentation. | 26 | SUBST_MESSAGE.docpath= Fixing path in documentation. | |
27 | 27 | |||
28 | .include "../../mk/termcap.buildlink3.mk" | |||
28 | .include "../../mk/bsd.pkg.mk" | 29 | .include "../../mk/bsd.pkg.mk" |
@@ -1,18 +1,18 @@ | @@ -1,18 +1,18 @@ | |||
1 | $NetBSD: distinfo,v 1.12 2016/03/30 10:03:46 jperkin Exp $ | 1 | $NetBSD: distinfo,v 1.13 2017/05/09 14:51:36 jperkin Exp $ | |
2 | 2 | |||
3 | SHA1 (beav_1.40-18.diff.gz) = 9cd82a3b8de391e1f001d241be1c2c3fadb3efb9 | 3 | SHA1 (beav_1.40-18.diff.gz) = 9cd82a3b8de391e1f001d241be1c2c3fadb3efb9 | |
4 | RMD160 (beav_1.40-18.diff.gz) = 0e7b19fdc7ea16e1e24e8302d81dfb247e947603 | 4 | RMD160 (beav_1.40-18.diff.gz) = 0e7b19fdc7ea16e1e24e8302d81dfb247e947603 | |
5 | SHA512 (beav_1.40-18.diff.gz) = eccae04c798f28b1a66e3efd084d5d73159369ee0eefd96f4c5343fa147f887b6ae17196012fc2b5eaa65e3d66bd273c96e7b12dd85cc6b996701b91204fc02c | 5 | SHA512 (beav_1.40-18.diff.gz) = eccae04c798f28b1a66e3efd084d5d73159369ee0eefd96f4c5343fa147f887b6ae17196012fc2b5eaa65e3d66bd273c96e7b12dd85cc6b996701b91204fc02c | |
6 | Size (beav_1.40-18.diff.gz) = 14218 bytes | 6 | Size (beav_1.40-18.diff.gz) = 14218 bytes | |
7 | SHA1 (beav_1.40.orig.tar.gz) = c610a0c3581c681c26726c8e1e19bf7e38ca8a6a | 7 | SHA1 (beav_1.40.orig.tar.gz) = c610a0c3581c681c26726c8e1e19bf7e38ca8a6a | |
8 | RMD160 (beav_1.40.orig.tar.gz) = 621df359860a8ec9205413520961d4366b1ad8ea | 8 | RMD160 (beav_1.40.orig.tar.gz) = 621df359860a8ec9205413520961d4366b1ad8ea | |
9 | SHA512 (beav_1.40.orig.tar.gz) = 560a35b9b3a6adeef5ccd41a6bca7055feeb2110eb7f931b5e6fc30a83ca7e49532420f96fa929025e096e598d03230fa8eb8247c71bf8963f4549c8b41e4e01 | 9 | SHA512 (beav_1.40.orig.tar.gz) = 560a35b9b3a6adeef5ccd41a6bca7055feeb2110eb7f931b5e6fc30a83ca7e49532420f96fa929025e096e598d03230fa8eb8247c71bf8963f4549c8b41e4e01 | |
10 | Size (beav_1.40.orig.tar.gz) = 128103 bytes | 10 | Size (beav_1.40.orig.tar.gz) = 128103 bytes | |
11 | SHA1 (patch-aa) = 14bb0e27736ea7f49311a7fd32dc030201c90c3e | 11 | SHA1 (patch-aa) = e34b65106711be85c886a27d7fc7b52498079566 | |
12 | SHA1 (patch-ab) = 3d18ee1e757e96392acc554c131e9174276252b2 | 12 | SHA1 (patch-ab) = 3d18ee1e757e96392acc554c131e9174276252b2 | |
13 | SHA1 (patch-ac) = d232aa9fdd53c42e4e12408605fd82f28ca90843 | 13 | SHA1 (patch-ac) = d232aa9fdd53c42e4e12408605fd82f28ca90843 | |
14 | SHA1 (patch-ad) = a39834bab7717be78aa04a6ebd013294e75e5e00 | 14 | SHA1 (patch-ad) = a39834bab7717be78aa04a6ebd013294e75e5e00 | |
15 | SHA1 (patch-ae) = 3a7bc7db106b98900a4ef5e72f197ac165b17712 | 15 | SHA1 (patch-ae) = 3a7bc7db106b98900a4ef5e72f197ac165b17712 | |
16 | SHA1 (patch-af) = 21f776110105711fee0c6c9f898fa02efa0d2ffa | 16 | SHA1 (patch-af) = 21f776110105711fee0c6c9f898fa02efa0d2ffa | |
17 | SHA1 (patch-ag) = cb142eb1b59e5914dba7a08c6fe925131db5063c | 17 | SHA1 (patch-ag) = cb142eb1b59e5914dba7a08c6fe925131db5063c | |
18 | SHA1 (patch-ai) = ccdc5d2d7ef230a4a0e30d64f8516935cc221588 | 18 | SHA1 (patch-ai) = ccdc5d2d7ef230a4a0e30d64f8516935cc221588 |
@@ -1,32 +1,32 @@ | @@ -1,32 +1,32 @@ | |||
1 | $NetBSD: patch-aa,v 1.4 2016/03/30 10:03:46 jperkin Exp $ | 1 | $NetBSD: patch-aa,v 1.5 2017/05/09 14:51:36 jperkin Exp $ | |
2 | 2 | |||
3 | Use pkgsrc flags/layout. | 3 | Use pkgsrc flags/layout. | |
4 | 4 | |||
5 | --- Makefile.orig 2007-11-25 12:10:44.000000000 +0000 | 5 | --- Makefile.orig 2007-11-25 12:10:44.000000000 +0000 | |
6 | +++ Makefile | 6 | +++ Makefile | |
7 | @@ -1,6 +1,6 @@ | 7 | @@ -1,6 +1,6 @@ | |
8 | # This is the makefile for BSD UNIX | 8 | # This is the makefile for BSD UNIX | |
9 | #CFLAGS= -g -DUNIX | 9 | #CFLAGS= -g -DUNIX | |
10 | -CFLAGS= -g -DUNIX -Wall | 10 | -CFLAGS= -g -DUNIX -Wall | |
11 | +CFLAGS= -g -DUNIX -DBSD -Wall | 11 | +CFLAGS+= -DUNIX -DBSD -Wall | |
12 | CC=gcc | 12 | CC=gcc | |
13 | 13 | |||
14 | OFILES= basic.o ebcdic.o fileio.o region.o text.o wangpc.o \ | 14 | OFILES= basic.o ebcdic.o fileio.o region.o text.o wangpc.o \ | |
15 | @@ -17,9 +17,15 @@ CFILES= basic.c ebcdic.c fileio.c re | 15 | @@ -17,9 +17,15 @@ CFILES= basic.c ebcdic.c fileio.c re | |
16 | HFILES= def.h prototyp.h | 16 | HFILES= def.h prototyp.h | |
17 | 17 | |||
18 | beav: $(OFILES) | 18 | beav: $(OFILES) | |
19 | - $(CC) $(CFLAGS) $(OFILES) -lncurses -o beav | 19 | - $(CC) $(CFLAGS) $(OFILES) -lncurses -o beav | |
20 | + $(CC) $(CFLAGS) $(OFILES) -ltermcap -o beav | 20 | + $(CC) $(CFLAGS) $(OFILES) $(LDFLAGS) -ltermcap -o beav | |
21 | + | 21 | + | |
22 | +install: beav beav.1 | 22 | +install: beav beav.1 | |
23 | + $(BSD_INSTALL_PROGRAM) beav ${DESTDIR}$(PREFIX)/bin | 23 | + $(BSD_INSTALL_PROGRAM) beav ${DESTDIR}$(PREFIX)/bin | |
24 | + mkdir -p ${DESTDIR}$(PREFIX)/share/doc/beav | 24 | + mkdir -p ${DESTDIR}$(PREFIX)/share/doc/beav | |
25 | + $(BSD_INSTALL_DATA) beav140.txt ${DESTDIR}$(PREFIX)/share/doc/beav/beav.txt | 25 | + $(BSD_INSTALL_DATA) beav140.txt ${DESTDIR}$(PREFIX)/share/doc/beav/beav.txt | |
26 | + $(BSD_INSTALL_MAN) beav.1 ${DESTDIR}$(PREFIX)/${PKGMANDIR}/man1 | 26 | + $(BSD_INSTALL_MAN) beav.1 ${DESTDIR}$(PREFIX)/${PKGMANDIR}/man1 | |
27 | 27 | |||
28 | clean: | 28 | clean: | |
29 | rm -f *.o beav | 29 | rm -f *.o beav | |
30 | 30 | |||
31 | -(OFILES): $(HFILES) | 31 | -(OFILES): $(HFILES) | |
32 | +$(OFILES): $(HFILES) | 32 | +$(OFILES): $(HFILES) |