Thu Feb 4 01:48:01 2010 UTC ()
DESTDIR support


(joerg)
diff -r1.14 -r1.15 pkgsrc/mail/coolmail/Makefile
diff -r1.6 -r1.7 pkgsrc/mail/coolmail/distinfo
diff -r1.5 -r1.6 pkgsrc/mail/coolmail/patches/patch-aa
cvs diff -r1.14 -r1.15 pkgsrc/mail/coolmail/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/coolmail/Makefile 2008/01/19 09:16:25 1.14
+++ pkgsrc/mail/coolmail/Makefile 2010/02/04 01:48:01 1.15
@@ -1,28 +1,30 @@ @@ -1,28 +1,30 @@
1# $NetBSD: Makefile,v 1.14 2008/01/19 09:16:25 wiz Exp $ 1# $NetBSD: Makefile,v 1.15 2010/02/04 01:48:01 joerg Exp $
2 2
3DISTNAME= coolmail-1.3 3DISTNAME= coolmail-1.3
4PKGREVISION= 2 4PKGREVISION= 2
5CATEGORIES= mail x11 5CATEGORIES= mail x11
6MASTER_SITES= ${MASTER_SITE_SUNSITE:=system/mail/biffs/} 6MASTER_SITES= ${MASTER_SITE_SUNSITE:=system/mail/biffs/}
7EXTRACT_SUFX= .tgz 7EXTRACT_SUFX= .tgz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10COMMENT= Xbiff replacement with 3D animation and sound 10COMMENT= Xbiff replacement with 3D animation and sound
11 11
 12PKG_DESTDIR_SUPPORT= user-destdir
 13
12OPSYSVARS+= EXTRA_LIBS 14OPSYSVARS+= EXTRA_LIBS
13EXTRA_LIBS.*= -lcompat 15EXTRA_LIBS.*= -lcompat
14EXTRA_LIBS.Interix= -lSM 16EXTRA_LIBS.Interix= -lSM
15EXTRA_LIBS.IRIX= # empty 17EXTRA_LIBS.IRIX= # empty
16MAKE_ENV+= EXTRA_LIBS=${EXTRA_LIBS:Q} 18MAKE_ENV+= EXTRA_LIBS=${EXTRA_LIBS:Q}
17MAKE_ENV+= X11BASE=${PREFIX:Q} 19MAKE_ENV+= X11BASE=${PREFIX:Q}
18USE_X11BASE= yes 20USE_X11BASE= yes
19 21
20INSTALLATION_DIRS= bin lib/X11/app-defaults ${PKGMANDIR}/man1 22INSTALLATION_DIRS= bin lib/X11/app-defaults ${PKGMANDIR}/man1
21 23
22post-install: 24post-install:
23 ${INSTALL_DATA} ${WRKSRC}/Coolmail.ad \ 25 ${INSTALL_DATA} ${WRKSRC}/Coolmail.ad \
24 ${PREFIX}/lib/X11/app-defaults/Coolmail 26 ${DESTDIR}${PREFIX}/lib/X11/app-defaults/Coolmail
25 27
26.include "../../x11/libXext/buildlink3.mk" 28.include "../../x11/libXext/buildlink3.mk"
27.include "../../x11/libXt/buildlink3.mk" 29.include "../../x11/libXt/buildlink3.mk"
28.include "../../mk/bsd.pkg.mk" 30.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/mail/coolmail/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/coolmail/distinfo 2005/10/22 17:56:31 1.6
+++ pkgsrc/mail/coolmail/distinfo 2010/02/04 01:48:01 1.7
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.6 2005/10/22 17:56:31 rillig Exp $ 1$NetBSD: distinfo,v 1.7 2010/02/04 01:48:01 joerg Exp $
2 2
3SHA1 (coolmail-1.3.tgz) = 7b8dccf16f575827a595f1025294dfc66f00a6dc 3SHA1 (coolmail-1.3.tgz) = 7b8dccf16f575827a595f1025294dfc66f00a6dc
4RMD160 (coolmail-1.3.tgz) = e23a8e8a465d700163393e70ebed60870ddcbc95 4RMD160 (coolmail-1.3.tgz) = e23a8e8a465d700163393e70ebed60870ddcbc95
5Size (coolmail-1.3.tgz) = 26809 bytes 5Size (coolmail-1.3.tgz) = 26809 bytes
6SHA1 (patch-aa) = 3baa02ca2f01c67724c1e01c095c0fbe65038df7 6SHA1 (patch-aa) = dd16e3150674a92f4ad43270d523bbc1f5b5eb16
7SHA1 (patch-ab) = 35879a8f39e83e47b1598b761adcfa412d6b3104 7SHA1 (patch-ab) = 35879a8f39e83e47b1598b761adcfa412d6b3104
8SHA1 (patch-ac) = 1054bda16101047024e2f6811034cfdc4d340a66 8SHA1 (patch-ac) = 1054bda16101047024e2f6811034cfdc4d340a66
cvs diff -r1.5 -r1.6 pkgsrc/mail/coolmail/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/mail/coolmail/patches/patch-aa 2005/10/22 16:17:14 1.5
+++ pkgsrc/mail/coolmail/patches/patch-aa 2010/02/04 01:48:01 1.6
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1$NetBSD: patch-aa,v 1.5 2005/10/22 16:17:14 rillig Exp $ 1$NetBSD: patch-aa,v 1.6 2010/02/04 01:48:01 joerg Exp $
2 2
3--- Makefile.orig Thu Jan 11 10:55:40 1996 3--- Makefile.orig Thu Jan 11 10:55:40 1996
4+++ Makefile Thu Jul 16 05:07:04 1998 4+++ Makefile Thu Jul 16 05:07:04 1998
5@@ -26,6 +26,6 @@ 5@@ -26,6 +26,6 @@
6 LINK = $(CC) 6 LINK = $(CC)
7-INCLUDES = -I/usr/X11R5/include 7-INCLUDES = -I/usr/X11R5/include
8-LIB_DIRS = -L/usr/X11R5/lib 8-LIB_DIRS = -L/usr/X11R5/lib
9-BINDIR = /usr/local/bin 9-BINDIR = /usr/local/bin
10-MANDIR = /usr/local/man/man1 10-MANDIR = /usr/local/man/man1
11+INCLUDES = -I$(X11BASE)/include 11+INCLUDES = -I$(X11BASE)/include
12+LIB_DIRS = -L$(X11BASE)/lib -Wl,-R$(X11BASE)/lib 12+LIB_DIRS = -L$(X11BASE)/lib -Wl,-R$(X11BASE)/lib
13+BINDIR = $(PREFIX)/bin 13+BINDIR = ${DESTDIR}$(PREFIX)/bin
14+MANDIR = $(PREFIX)/man/man1 14+MANDIR = ${DESTDIR}$(PREFIX)/${PKGMANDIR}/man1
15  15
16@@ -33,4 +33,6 @@ 16@@ -33,4 +33,6 @@
17 # feature. 17 # feature.
18-AUDIO = -DAUDIO 18-AUDIO = -DAUDIO
19-AUDIO_MODULE = audio.o 19-AUDIO_MODULE = audio.o
20+# Note. Audio works. I have no soundcards at present though, so I cannot 20+# Note. Audio works. I have no soundcards at present though, so I cannot
21+# test it appropriately. 21+# test it appropriately.
22+#AUDIO = -DAUDIO 22+#AUDIO = -DAUDIO
23+#AUDIO_MODULE = audio.o 23+#AUDIO_MODULE = audio.o
24  24
25@@ -38,3 +40,3 @@ 25@@ -38,3 +40,3 @@
26  26
27-LIBS = $(LIB_DIRS) -lXt -lX11 -lm -lXext 27-LIBS = $(LIB_DIRS) -lXt -lX11 -lm -lXext