Thu Feb 4 02:35:08 2010 UTC ()
DESTDIR support


(joerg)
diff -r1.20 -r1.21 pkgsrc/mail/mush/Makefile
diff -r1.10 -r1.11 pkgsrc/mail/mush/distinfo
diff -r1.3 -r1.4 pkgsrc/mail/mush/patches/patch-ag
cvs diff -r1.20 -r1.21 pkgsrc/mail/mush/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/mush/Makefile 2009/05/19 08:59:22 1.20
+++ pkgsrc/mail/mush/Makefile 2010/02/04 02:35:08 1.21
@@ -1,46 +1,48 @@ @@ -1,46 +1,48 @@
1# $NetBSD: Makefile,v 1.20 2009/05/19 08:59:22 wiz Exp $ 1# $NetBSD: Makefile,v 1.21 2010/02/04 02:35:08 joerg Exp $
2 2
3DISTNAME= mush-7.2.5 3DISTNAME= mush-7.2.5
4PKGNAME= mush-7.2.6.b4.pl1 4PKGNAME= mush-7.2.6.b4.pl1
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= mail 6CATEGORIES= mail
7MASTER_SITES= ftp://cse.ogi.edu/pub/mush/ 7MASTER_SITES= ftp://cse.ogi.edu/pub/mush/
8EXTRACT_SUFX= .tar.Z 8EXTRACT_SUFX= .tar.Z
9 9
10PATCH_SITES= ftp://cse.ogi.edu/pub/mush/CONTRIB/ 10PATCH_SITES= ftp://cse.ogi.edu/pub/mush/CONTRIB/
11PATCH_DIST_ARGS= -s -d ${WRKDIR} -E -p1 11PATCH_DIST_ARGS= -s -d ${WRKDIR} -E -p1
12PATCHFILES= patch-7.2.6-alpha-1 \ 12PATCHFILES= patch-7.2.6-alpha-1 \
13 patch-7.2.6-alpha-2 \ 13 patch-7.2.6-alpha-2 \
14 patch-7.2.6-alpha-3 \ 14 patch-7.2.6-alpha-3 \
15 patch-7.2.6-beta-1 \ 15 patch-7.2.6-beta-1 \
16 patch-7.2.6-beta-2 \ 16 patch-7.2.6-beta-2 \
17 patch-7.2.6-beta-3 \ 17 patch-7.2.6-beta-3 \
18 patch-7.2.6-beta-4 18 patch-7.2.6-beta-4
19 19
20MAINTAINER= christos@NetBSD.org 20MAINTAINER= christos@NetBSD.org
21COMMENT= Text-based mail client 21COMMENT= Text-based mail client
22LICENSE= mush-license 22LICENSE= mush-license
23 23
 24PKG_DESTDIR_SUPPORT= user-destdir
 25
24RESTRICTED= Unmodified source may be distributed but not sold. 26RESTRICTED= Unmodified source may be distributed but not sold.
25NO_BIN_ON_FTP= ${RESTRICTED} 27NO_BIN_ON_FTP= ${RESTRICTED}
26NO_SRC_ON_CDROM= ${RESTRICTED} 28NO_SRC_ON_CDROM= ${RESTRICTED}
27NO_BIN_ON_CDROM= ${RESTRICTED} 29NO_BIN_ON_CDROM= ${RESTRICTED}
28 30
29WRKSRC= ${WRKDIR} 31WRKSRC= ${WRKDIR}
30DIST_SUBDIR= mush 32DIST_SUBDIR= mush
31BUILD_TARGET= mush 33BUILD_TARGET= mush
32 34
33INSTALLATION_DIRS= bin share/misc 35INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/misc
34 36
35.include "../../mk/bsd.prefs.mk" 37.include "../../mk/bsd.prefs.mk"
36 38
37.if ${OPSYS} == "DragonFly" 39.if ${OPSYS} == "DragonFly"
38PLAT_MAKEFILE= makefile.netbsd 40PLAT_MAKEFILE= makefile.netbsd
39.else 41.else
40PLAT_MAKEFILE= makefile.${LOWER_OPSYS} 42PLAT_MAKEFILE= makefile.${LOWER_OPSYS}
41.endif 43.endif
42 44
43SUBST_CLASSES+= paths 45SUBST_CLASSES+= paths
44SUBST_FILES.paths= config.h-dist ${PLAT_MAKEFILE} 46SUBST_FILES.paths= config.h-dist ${PLAT_MAKEFILE}
45SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g' 47SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g'
46SUBST_SED.paths+= -e 's,@MANDIR@,${PREFIX}/${PKGMANDIR},g' 48SUBST_SED.paths+= -e 's,@MANDIR@,${PREFIX}/${PKGMANDIR},g'
cvs diff -r1.10 -r1.11 pkgsrc/mail/mush/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/mush/distinfo 2006/01/08 17:04:58 1.10
+++ pkgsrc/mail/mush/distinfo 2010/02/04 02:35:08 1.11
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.10 2006/01/08 17:04:58 joerg Exp $ 1$NetBSD: distinfo,v 1.11 2010/02/04 02:35:08 joerg Exp $
2 2
3SHA1 (mush/mush-7.2.5.tar.Z) = 1b9b54b368b9a748401b1baeb3b3eba5a9ed2c03 3SHA1 (mush/mush-7.2.5.tar.Z) = 1b9b54b368b9a748401b1baeb3b3eba5a9ed2c03
4RMD160 (mush/mush-7.2.5.tar.Z) = 32e010f544f79cc1a0f899d722d465975d552a4e 4RMD160 (mush/mush-7.2.5.tar.Z) = 32e010f544f79cc1a0f899d722d465975d552a4e
5Size (mush/mush-7.2.5.tar.Z) = 496317 bytes 5Size (mush/mush-7.2.5.tar.Z) = 496317 bytes
6SHA1 (mush/patch-7.2.6-alpha-1) = 132e609a6c44889a4ee462cdf0078923c1e0f4c8 6SHA1 (mush/patch-7.2.6-alpha-1) = 132e609a6c44889a4ee462cdf0078923c1e0f4c8
7RMD160 (mush/patch-7.2.6-alpha-1) = c7ede33d55899435674ac721d2302139ee4b8b2a 7RMD160 (mush/patch-7.2.6-alpha-1) = c7ede33d55899435674ac721d2302139ee4b8b2a
8Size (mush/patch-7.2.6-alpha-1) = 139372 bytes 8Size (mush/patch-7.2.6-alpha-1) = 139372 bytes
9SHA1 (mush/patch-7.2.6-alpha-2) = 34c72281af8e2f7f3ef72efad77b824f422845d4 9SHA1 (mush/patch-7.2.6-alpha-2) = 34c72281af8e2f7f3ef72efad77b824f422845d4
10RMD160 (mush/patch-7.2.6-alpha-2) = 6eed5884f568f52745171f22f717c6f90c46c6c2 10RMD160 (mush/patch-7.2.6-alpha-2) = 6eed5884f568f52745171f22f717c6f90c46c6c2
11Size (mush/patch-7.2.6-alpha-2) = 12684 bytes 11Size (mush/patch-7.2.6-alpha-2) = 12684 bytes
12SHA1 (mush/patch-7.2.6-alpha-3) = a04066037178155c9849fb06329557480a768d87 12SHA1 (mush/patch-7.2.6-alpha-3) = a04066037178155c9849fb06329557480a768d87
13RMD160 (mush/patch-7.2.6-alpha-3) = 3ba6b8554d64e826f04b430c227ae436988bc8d1 13RMD160 (mush/patch-7.2.6-alpha-3) = 3ba6b8554d64e826f04b430c227ae436988bc8d1
14Size (mush/patch-7.2.6-alpha-3) = 22109 bytes 14Size (mush/patch-7.2.6-alpha-3) = 22109 bytes
@@ -20,22 +20,22 @@ RMD160 (mush/patch-7.2.6-beta-2) = b42f8 @@ -20,22 +20,22 @@ RMD160 (mush/patch-7.2.6-beta-2) = b42f8
20Size (mush/patch-7.2.6-beta-2) = 1907 bytes 20Size (mush/patch-7.2.6-beta-2) = 1907 bytes
21SHA1 (mush/patch-7.2.6-beta-3) = 43014005455f1f219f5590506ae354875da0f825 21SHA1 (mush/patch-7.2.6-beta-3) = 43014005455f1f219f5590506ae354875da0f825
22RMD160 (mush/patch-7.2.6-beta-3) = 196e8aa0f7d3574709760a6a2ae74b0343b11b9f 22RMD160 (mush/patch-7.2.6-beta-3) = 196e8aa0f7d3574709760a6a2ae74b0343b11b9f
23Size (mush/patch-7.2.6-beta-3) = 56089 bytes 23Size (mush/patch-7.2.6-beta-3) = 56089 bytes
24SHA1 (mush/patch-7.2.6-beta-4) = ad506cafa0649196a8dc0576dd17d60937f226e7 24SHA1 (mush/patch-7.2.6-beta-4) = ad506cafa0649196a8dc0576dd17d60937f226e7
25RMD160 (mush/patch-7.2.6-beta-4) = dd3ac8494e0c85ba47516c4d4bb9fce4c9f1a8a7 25RMD160 (mush/patch-7.2.6-beta-4) = dd3ac8494e0c85ba47516c4d4bb9fce4c9f1a8a7
26Size (mush/patch-7.2.6-beta-4) = 19764 bytes 26Size (mush/patch-7.2.6-beta-4) = 19764 bytes
27SHA1 (patch-aa) = dd38a31a1e048471013df7a167fdf5582445ce2b 27SHA1 (patch-aa) = dd38a31a1e048471013df7a167fdf5582445ce2b
28SHA1 (patch-ab) = e1482baca81fe09889f8316d96f9afb1a7a6bbb0 28SHA1 (patch-ab) = e1482baca81fe09889f8316d96f9afb1a7a6bbb0
29SHA1 (patch-ac) = 963ce2cc9e30a2cd5e7e63edbe09692a880d8d5b 29SHA1 (patch-ac) = 963ce2cc9e30a2cd5e7e63edbe09692a880d8d5b
30SHA1 (patch-ad) = 2bcbd8e6e052d1549d4eb5201ec10f5ff3fd3051 30SHA1 (patch-ad) = 2bcbd8e6e052d1549d4eb5201ec10f5ff3fd3051
31SHA1 (patch-ae) = 2923fa751a0e3dba13bc711694285973225e21b6 31SHA1 (patch-ae) = 2923fa751a0e3dba13bc711694285973225e21b6
32SHA1 (patch-af) = 1df2f9fb0b536cc30f94ba357a5de9fe11bbf941 32SHA1 (patch-af) = 1df2f9fb0b536cc30f94ba357a5de9fe11bbf941
33SHA1 (patch-ag) = dce8cf449bca506d2d478a9b925aa4b80b34f6d6 33SHA1 (patch-ag) = 19a580901c94dfc30deb7945050a45acd1d2b444
34SHA1 (patch-ah) = ddd684d8de13fd2f338c506254229fa63cca9e94 34SHA1 (patch-ah) = ddd684d8de13fd2f338c506254229fa63cca9e94
35SHA1 (patch-ai) = 5659b2d975f86e856d1bf6efb8909bc08ec2acf4 35SHA1 (patch-ai) = 5659b2d975f86e856d1bf6efb8909bc08ec2acf4
36SHA1 (patch-aj) = fee38b6e855a6494ecef0e41e2602850d1b58746 36SHA1 (patch-aj) = fee38b6e855a6494ecef0e41e2602850d1b58746
37SHA1 (patch-ak) = fc25abdf0dfe16020a7ca5e4b284c40367f20f98 37SHA1 (patch-ak) = fc25abdf0dfe16020a7ca5e4b284c40367f20f98
38SHA1 (patch-al) = 4d0c9ff2a6a8c3c1d59a81b659ed3599881cc762 38SHA1 (patch-al) = 4d0c9ff2a6a8c3c1d59a81b659ed3599881cc762
39SHA1 (patch-am) = 6ce0fd015cb33ada51e086be1131ec0ad94f4169 39SHA1 (patch-am) = 6ce0fd015cb33ada51e086be1131ec0ad94f4169
40SHA1 (patch-an) = 9c7441265ac13e73a4143440b3a1706f81d9d00c 40SHA1 (patch-an) = 9c7441265ac13e73a4143440b3a1706f81d9d00c
41SHA1 (patch-ao) = e5b28c4a761c1bc1bba195c5dc6ff332cad51f67 41SHA1 (patch-ao) = e5b28c4a761c1bc1bba195c5dc6ff332cad51f67
cvs diff -r1.3 -r1.4 pkgsrc/mail/mush/patches/patch-ag (expand / switch to unified diff)

--- pkgsrc/mail/mush/patches/patch-ag 2006/01/08 17:04:58 1.3
+++ pkgsrc/mail/mush/patches/patch-ag 2010/02/04 02:35:08 1.4
@@ -1,42 +1,42 @@ @@ -1,42 +1,42 @@
1$NetBSD: patch-ag,v 1.3 2006/01/08 17:04:58 joerg Exp $ 1$NetBSD: patch-ag,v 1.4 2010/02/04 02:35:08 joerg Exp $
2 2
3*** /dev/null Fri Sep 4 13:38:54 1998 3*** /dev/null Fri Sep 4 13:38:54 1998
4--- makefile.netbsd Fri Sep 4 13:36:36 1998 4--- makefile.netbsd Fri Sep 4 13:36:36 1998
5*************** 5***************
6*** 0 **** 6*** 0 ****
7--- 1,76 ---- 7--- 1,71 ----
8+ # makefile.netbsd 8+ # makefile.netbsd
9+ # 9+ #
10+ HDRS= mush.h config.h-dist strings.h bindings.h options.h version.h glob.h pop.h 10+ HDRS= mush.h config.h-dist strings.h bindings.h options.h version.h glob.h pop.h
11+  11+
12+ SRCS= main.c init.c misc.c mail.c hdrs.c execute.c commands.c print.c dates.c \ 12+ SRCS= main.c init.c misc.c mail.c hdrs.c execute.c commands.c print.c dates.c \
13+ signals.c setopts.c msgs.c pick.c sort.c expr.c folders.c \ 13+ signals.c setopts.c msgs.c pick.c sort.c expr.c folders.c \
14+ loop.c viewopts.c curses.c curs_io.c bind.c file.c strings.c \ 14+ loop.c viewopts.c curses.c curs_io.c bind.c file.c strings.c \
15+ lock.c macros.c options.c addrs.c malloc.c glob.c command2.c \ 15+ lock.c macros.c options.c addrs.c malloc.c glob.c command2.c \
16+ pop.c pmush.c xcreat.c  16+ pop.c pmush.c xcreat.c
17+ OBJS= main.o init.o misc.o mail.o hdrs.o execute.o commands.o print.o file.o \ 17+ OBJS= main.o init.o misc.o mail.o hdrs.o execute.o commands.o print.o file.o \
18+ signals.o setopts.o msgs.o pick.o sort.o expr.o strings.o \ 18+ signals.o setopts.o msgs.o pick.o sort.o expr.o strings.o \
19+ folders.o dates.o loop.o viewopts.o curses.o curs_io.o bind.o \ 19+ folders.o dates.o loop.o viewopts.o curses.o curs_io.o bind.o \
20+ lock.o macros.o options.o addrs.o malloc.o glob.o command2.o \ 20+ lock.o macros.o options.o addrs.o malloc.o glob.o command2.o \
21+ pop.o pmush.o xcreat.o  21+ pop.o pmush.o xcreat.o
22+  22+
23+ HELP_FILES= README README-7.0 README-7.1 README-7.2.0 README-7.2.2 \ 23+ HELP_FILES= README README-7.0 README-7.1 README-7.2.0 README-7.2.2 \
24+ README-7.2.4 mush.1 cmd_help Mushrc Mailrc Gnurc \ 24+ README-7.2.4 mush.1 cmd_help Mushrc Mailrc Gnurc \
25+ sample.mushrc advanced.mushrc digestify 25+ sample.mushrc advanced.mushrc digestify
26+  26+
27+ MAKES= makefile.bsdi makefile.bsd makefile.xenix makefile.sys.v makefile.hpux makefile.sun makefile.solaris makefile.freebsd 27+ MAKES= makefile.bsdi makefile.bsd makefile.xenix makefile.sys.v makefile.hpux makefile.sun makefile.solaris makefile.freebsd
28+  28+
29+ CFLAGS= -O2 -DPOSIX -DCURSES -DBSD -DBSD44 -DSIGRET=void -DBASENAME -DENV_MAIL -DMSGS_DYNAMIC 29+ CFLAGS+= -DPOSIX -DCURSES -DBSD -DBSD44 -DSIGRET=void -DBASENAME -DENV_MAIL -DMSGS_DYNAMIC
30+ LDFLAGS=  30+ LDFLAGS=
31+ LINTFLAGS= -bxah -Dlint -DCURSES -DBSD 31+ LINTFLAGS= -bxah -Dlint -DCURSES -DBSD
32+ LIBS= -lcurses -ltermlib 32+ LIBS= -lcurses -ltermlib
33+ OTHERLIBS= 33+ OTHERLIBS=
34+ # Use some variant of this one if you #define MMDF in config.h 34+ # Use some variant of this one if you #define MMDF in config.h
35+ #OTHERLIBS=/usr/src/mmdf/lib/libmmdf.a 35+ #OTHERLIBS=/usr/src/mmdf/lib/libmmdf.a
36+  36+
37+ all: mush 37+ all: mush
38+  38+
39+ mush: $(OBJS) 39+ mush: $(OBJS)
40+ @echo loading... 40+ @echo loading...
41+ @$(CC) $(LDFLAGS) $(OBJS) $(LIBS) $(OTHERLIBS) -o mush 41+ @$(CC) $(LDFLAGS) $(OBJS) $(LIBS) $(OTHERLIBS) -o mush
42+  42+
@@ -56,28 +56,23 @@ $NetBSD: patch-ag,v 1.3 2006/01/08 17:04 @@ -56,28 +56,23 @@ $NetBSD: patch-ag,v 1.3 2006/01/08 17:04
56+ lint: 56+ lint:
57+ lint $(LINTFLAGS) $(SRCS) 57+ lint $(LINTFLAGS) $(SRCS)
58+  58+
59+ clean: 59+ clean:
60+ rm -f *.o core mush 60+ rm -f *.o core mush
61+  61+
62+ BINDIR= @PREFIX@/bin 62+ BINDIR= @PREFIX@/bin
63+ LIBDIR= @PREFIX@/share/misc 63+ LIBDIR= @PREFIX@/share/misc
64+ MRCDIR= @PREFIX@/share/misc 64+ MRCDIR= @PREFIX@/share/misc
65+ MANDIR= @MANDIR@/man1 65+ MANDIR= @MANDIR@/man1
66+ MANEXT= 1 66+ MANEXT= 1
67+  67+
68+ install: mush 68+ install: mush
69+ cp mush $(BINDIR) 69+ ${BSD_INSTALL_PROGRAM} mush ${DESTDIR}$(BINDIR)
70+ strip $(BINDIR)/mush 70+ ${BSD_INSTALL_DATA} cmd_help ${DESTDIR}$(LIBDIR)
71+ chmod 0755 $(BINDIR)/mush 71+ ${BSD_INSTALL_DATA} Mushrc ${DESTDIR}$(MRCDIR)/Mushrc
72+ cp cmd_help $(LIBDIR) 72+ ${BSD_INSTALL_MAN} mush.1 ${DESTDIR}$(MANDIR)/mush.$(MANEXT)
73+ chmod 0644 $(LIBDIR)/cmd_help 
74+ cp Mushrc $(MRCDIR)/Mushrc 
75+ chmod 0644 $(MRCDIR)/Mushrc 
76+ cp mush.1 $(MANDIR)/mush.$(MANEXT) 
77+ chmod 0644 $(MANDIR)/mush.$(MANEXT) 
78+  73+
79+  74+
80+ glob: glob.c 75+ glob: glob.c
81+ $(CC) $(CFLAGS) -DTEST -DTEST2 glob.c $(LIBS) $(OTHERLIBS) -o glob 76+ $(CC) $(CFLAGS) -DTEST -DTEST2 glob.c $(LIBS) $(OTHERLIBS) -o glob
82+  77+
83+  78+