Thu Dec 10 23:49:03 2009 UTC ()
PKG_DESTDIR_SUPPORT=user-destdir


(abs)
diff -r1.20 -r1.21 pkgsrc/misc/fep/Makefile
diff -r1.13 -r1.14 pkgsrc/misc/fep/distinfo
diff -r1.8 -r1.9 pkgsrc/misc/fep/patches/patch-aa
cvs diff -r1.20 -r1.21 pkgsrc/misc/fep/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/fep/Makefile 2009/05/19 08:59:23 1.20
+++ pkgsrc/misc/fep/Makefile 2009/12/10 23:49:03 1.21
@@ -1,26 +1,28 @@ @@ -1,26 +1,28 @@
1# $NetBSD: Makefile,v 1.20 2009/05/19 08:59:23 wiz Exp $ 1# $NetBSD: Makefile,v 1.21 2009/12/10 23:49:03 abs Exp $
2 2
3DISTNAME= fep 3DISTNAME= fep
4PKGNAME= fep-1.0 4PKGNAME= fep-1.0
5PKGREVISION= 3 5PKGREVISION= 3
6CATEGORIES= misc 6CATEGORIES= misc
7MASTER_SITES= ftp://ftp.sra.co.jp/pub/cmd/fep/ 7MASTER_SITES= ftp://ftp.sra.co.jp/pub/cmd/fep/
8 8
9MAINTAINER= nobu@psrc.isac.co.jp 9MAINTAINER= nobu@psrc.isac.co.jp
10COMMENT= General purpose front end for command line editing 10COMMENT= General purpose front end for command line editing
11LICENSE= fep-license 11LICENSE= fep-license
12 12
13RESTRICTED= Do not redistribute for a fee. 13RESTRICTED= Do not redistribute for a fee.
14NO_SRC_ON_CDROM=${RESTRICTED} 14NO_SRC_ON_CDROM=${RESTRICTED}
15NO_BIN_ON_CDROM=${RESTRICTED} 15NO_BIN_ON_CDROM=${RESTRICTED}
 16PKG_DESTDIR_SUPPORT= user-destdir
16 17
17WRKSRC= ${WRKDIR} 18WRKSRC= ${WRKDIR}
18MANCOMPRESSED= yes 19MANCOMPRESSED= yes
 20INSTALLATION_DIRS+= bin man/man1
19 21
20pre-build: 22pre-build:
21 cd ${WRKSRC} && \ 23 cd ${WRKSRC} && \
22 for i in *.[ch]; do ${SED} "s,#endif lint,#endif /* lint */,g" $${i} > $${i}.new && \ 24 for i in *.[ch]; do ${SED} "s,#endif lint,#endif /* lint */,g" $${i} > $${i}.new && \
23 ${MV} -f $${i}.new $${i}; \ 25 ${MV} -f $${i}.new $${i}; \
24 done 26 done
25 27
26.include "../../mk/bsd.pkg.mk" 28.include "../../mk/bsd.pkg.mk"
cvs diff -r1.13 -r1.14 pkgsrc/misc/fep/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/fep/distinfo 2006/01/17 21:23:01 1.13
+++ pkgsrc/misc/fep/distinfo 2009/12/10 23:49:03 1.14
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: distinfo,v 1.13 2006/01/17 21:23:01 kristerw Exp $ 1$NetBSD: distinfo,v 1.14 2009/12/10 23:49:03 abs Exp $
2 2
3SHA1 (fep.tar.gz) = 73fa55337b12dba3b91c9895e2c9adbbdfa9d960 3SHA1 (fep.tar.gz) = 73fa55337b12dba3b91c9895e2c9adbbdfa9d960
4RMD160 (fep.tar.gz) = 2a8b9eeecd5c76bec5cdb524ae6c650f298ccbde 4RMD160 (fep.tar.gz) = 2a8b9eeecd5c76bec5cdb524ae6c650f298ccbde
5Size (fep.tar.gz) = 40137 bytes 5Size (fep.tar.gz) = 40137 bytes
6SHA1 (patch-aa) = f62c430e029bdf8e434d9e492831192209bd6aab 6SHA1 (patch-aa) = 33cb713a2fc7d084a3769b7b9b61c7810ebacdd0
7SHA1 (patch-ab) = 2b6f6cff25a21b374dce4b0162dc06a6d0b6c24f 7SHA1 (patch-ab) = 2b6f6cff25a21b374dce4b0162dc06a6d0b6c24f
8SHA1 (patch-ac) = a306ac6a1fa580238e3ac89ea785fefe138ebb65 8SHA1 (patch-ac) = a306ac6a1fa580238e3ac89ea785fefe138ebb65
9SHA1 (patch-ad) = 78d5fd59d51542d304d3adcdde3a7ac48790d857 9SHA1 (patch-ad) = 78d5fd59d51542d304d3adcdde3a7ac48790d857
10SHA1 (patch-ae) = 16a34dbf37dfeeab3c0c76ec651ac19037fa600a 10SHA1 (patch-ae) = 16a34dbf37dfeeab3c0c76ec651ac19037fa600a
11SHA1 (patch-af) = 77d32f96314a8657e3b575d93def4156e29af2af 11SHA1 (patch-af) = 77d32f96314a8657e3b575d93def4156e29af2af
12SHA1 (patch-ag) = 2e1d76994ddd50c040383c93f4776ddd7bb2f934 12SHA1 (patch-ag) = 2e1d76994ddd50c040383c93f4776ddd7bb2f934
13SHA1 (patch-ah) = 5fd76d412877dc5db166dad274a765b68182c875 13SHA1 (patch-ah) = 5fd76d412877dc5db166dad274a765b68182c875
14SHA1 (patch-ai) = eda04c0d295a425e6929ade003314cc5ea340368 14SHA1 (patch-ai) = eda04c0d295a425e6929ade003314cc5ea340368
15SHA1 (patch-aj) = 12c456f62a84fd61b049a1c4091f92fbaa059205 15SHA1 (patch-aj) = 12c456f62a84fd61b049a1c4091f92fbaa059205
16SHA1 (patch-ak) = 97f14ed899fc2afc4f27a3730084355ec42649af 16SHA1 (patch-ak) = 97f14ed899fc2afc4f27a3730084355ec42649af
17SHA1 (patch-al) = 43cadd61a36ea6783df419caeb1c2b9fab5090e1 17SHA1 (patch-al) = 43cadd61a36ea6783df419caeb1c2b9fab5090e1
18SHA1 (patch-am) = 26915755c5c06fc68cba722349b2a4d585787fb7 18SHA1 (patch-am) = 26915755c5c06fc68cba722349b2a4d585787fb7
cvs diff -r1.8 -r1.9 pkgsrc/misc/fep/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/misc/fep/patches/patch-aa 2005/12/10 22:10:47 1.8
+++ pkgsrc/misc/fep/patches/patch-aa 2009/12/10 23:49:03 1.9
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: patch-aa,v 1.8 2005/12/10 22:10:47 christos Exp $ 1$NetBSD: patch-aa,v 1.9 2009/12/10 23:49:03 abs Exp $
2 2
3--- Makefile.orig 1993-06-09 22:51:22.000000000 -0400 3--- Makefile.orig 1993-06-10 02:51:22.000000000 +0000
4+++ Makefile 2005-12-10 17:00:00.000000000 -0500 4+++ Makefile
5@@ -15,17 +15,30 @@ 5@@ -15,17 +15,30 @@ OBJ = fep_main.o fep_edit.o fep_hist.o f
6 DISTRIBUTION\ 6 DISTRIBUTION\
7 = Makefile fep.1 $(HEADER) $(SRC) feprc.sample README 7 = Makefile fep.1 $(HEADER) $(SRC) feprc.sample README
8  8
9-INSTDIR = /usr/local/bin 9-INSTDIR = /usr/local/bin
10+INSTDIR = ${PREFIX}/bin 10+INSTDIR = ${PREFIX}/bin
11  11
12 #STAT = -DSTAT# Delete # for statistic info 12 #STAT = -DSTAT# Delete # for statistic info
13 #KANJI = -DKANJI# Delete # for KANJI handling 13 #KANJI = -DKANJI# Delete # for KANJI handling
14-CONFIG = $(STAT) $(KANJI) 14-CONFIG = $(STAT) $(KANJI)
15+CONFIG = $(STAT) $(KANJI) -DTERMIOS 15+CONFIG = $(STAT) $(KANJI) -DTERMIOS
16  16
17 #DEBUG = -g 17 #DEBUG = -g
18-DEBUG = -O 18-DEBUG = -O
@@ -27,22 +27,24 @@ $NetBSD: patch-aa,v 1.8 2005/12/10 22:10 @@ -27,22 +27,24 @@ $NetBSD: patch-aa,v 1.8 2005/12/10 22:10
27+.if exists(/usr/lib/libcompat.a) 27+.if exists(/usr/lib/libcompat.a)
28+LDFLAGS = -ltermcap -lcompat 28+LDFLAGS = -ltermcap -lcompat
29+.else 29+.else
30 LDFLAGS = -ltermcap 30 LDFLAGS = -ltermcap
31+.endif 31+.endif
32+.elif exists(/usr/lib/libncurses.a) 32+.elif exists(/usr/lib/libncurses.a)
33+LDFLAGS = -lncurses 33+LDFLAGS = -lncurses
34+.else 34+.else
35+LDFLAGS = -lcurses 35+LDFLAGS = -lcurses
36+.endif 36+.endif
37  37
38 all: $(TARGET) 38 all: $(TARGET)
39  39
40@@ -37,7 +50,7 @@ 40@@ -36,8 +49,8 @@ argv: fep_com.c
 41 $(CC) -o argv -DMKARGDEBUG fep_util.c
41  42
42 install: $(TARGET) 43 install: $(TARGET)
43 install -s $(TARGET) $(INSTDIR) 44- install -s $(TARGET) $(INSTDIR)
44- install -c fep.1 /usr/man/manl/fep.l 45- install -c fep.1 /usr/man/manl/fep.l
45+ gzip -9n -c fep.1 > ${PREFIX}/man/man1/fep.1.gz 46+ install -s $(TARGET) $(DESTDIR)$(INSTDIR)
 47+ gzip -9n -c fep.1 > $(DESTDIR)${PREFIX}/man/man1/fep.1.gz
46  48
47 fep.1: fep.jman 49 fep.1: fep.jman
48 sed -e '/^\.EG/d' -e '/^\.JP/,/^\.EJ/d' -e '/^\.\\"KS/,/^\.\\"KE/d' \ 50 sed -e '/^\.EG/d' -e '/^\.JP/,/^\.EJ/d' -e '/^\.\\"KS/,/^\.\\"KE/d' \