Sat Feb 7 23:21:05 2009 UTC ()
Fix DESTDIR support.


(joerg)
diff -r1.21 -r1.22 pkgsrc/mail/ssmtp/Makefile
diff -r1.4 -r1.5 pkgsrc/mail/ssmtp/distinfo
diff -r1.2 -r1.3 pkgsrc/mail/ssmtp/patches/patch-ac
cvs diff -r1.21 -r1.22 pkgsrc/mail/ssmtp/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/ssmtp/Makefile 2008/11/16 13:54:12 1.21
+++ pkgsrc/mail/ssmtp/Makefile 2009/02/07 23:21:05 1.22
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.21 2008/11/16 13:54:12 tron Exp $ 1# $NetBSD: Makefile,v 1.22 2009/02/07 23:21:05 joerg Exp $
2# 2#
3# TLS functionality needs testing. Please let me know the result, 3# TLS functionality needs testing. Please let me know the result,
4# and preferably info about your system. 4# and preferably info about your system.
5# 5#
6# pkg@pop.707.to 6# pkg@pop.707.to
7# Toru TAKAMIZU 7# Toru TAKAMIZU
8 8
9DISTNAME= ssmtp_2.61.orig 9DISTNAME= ssmtp_2.61.orig
10PKGNAME= ssmtp-2.61 10PKGNAME= ssmtp-2.61
11PKGREVISION= 2 11PKGREVISION= 2
12CATEGORIES= mail 12CATEGORIES= mail
13MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/s/ssmtp/} 13MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/s/ssmtp/}
14 14
@@ -20,26 +20,28 @@ PKG_DESTDIR_SUPPORT= user-destdir @@ -20,26 +20,28 @@ PKG_DESTDIR_SUPPORT= user-destdir
20 20
21WRKSRC= ${WRKDIR}/${PKGNAME_NOREV:S/.orig$//} 21WRKSRC= ${WRKDIR}/${PKGNAME_NOREV:S/.orig$//}
22USE_TOOLS+= gmake 22USE_TOOLS+= gmake
23GNU_CONFIGURE= yes 23GNU_CONFIGURE= yes
24CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE:Q} 24CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE:Q}
25 25
26.include "options.mk" 26.include "options.mk"
27 27
28PKG_SYSCONFSUBDIR= ${PKGBASE} 28PKG_SYSCONFSUBDIR= ${PKGBASE}
29EGDIR= ${PREFIX}/share/examples/${PKGBASE} 29EGDIR= ${PREFIX}/share/examples/${PKGBASE}
30CONF_FILES= ${EGDIR}/ssmtp.conf ${PKG_SYSCONFDIR}/ssmtp.conf 30CONF_FILES= ${EGDIR}/ssmtp.conf ${PKG_SYSCONFDIR}/ssmtp.conf
31CONF_FILES+= ${EGDIR}/revaliases ${PKG_SYSCONFDIR}/revaliases 31CONF_FILES+= ${EGDIR}/revaliases ${PKG_SYSCONFDIR}/revaliases
32 32
 33MAKE_DIRS+= ${PKG_SYSCONFDIR}
 34
33SUBST_CLASSES+= paths 35SUBST_CLASSES+= paths
34SUBST_FILES.paths= ${WRKDIR}/mailer.conf ssmtp.c ssmtp.conf ssmtp.8 36SUBST_FILES.paths= ${WRKDIR}/mailer.conf ssmtp.c ssmtp.conf ssmtp.8
35SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g' 37SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g'
36SUBST_SED.paths+= -e 's,/etc/ssl/certs,${PKG_SYSCONFDIR},g' 38SUBST_SED.paths+= -e 's,/etc/ssl/certs,${PKG_SYSCONFDIR},g'
37SUBST_SED.paths+= -e 's,/etc/ssmtp,${PKG_SYSCONFDIR},g' 39SUBST_SED.paths+= -e 's,/etc/ssmtp,${PKG_SYSCONFDIR},g'
38SUBST_STAGE.paths= post-patch 40SUBST_STAGE.paths= post-patch
39 41
40INSTALLATION_DIRS+= ${EGDIR} 42INSTALLATION_DIRS+= ${EGDIR}
41 43
42MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} 44MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX}
43MAKE_FLAGS+= mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}/man8 45MAKE_FLAGS+= mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
44 46
45post-extract: 47post-extract:
cvs diff -r1.4 -r1.5 pkgsrc/mail/ssmtp/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/ssmtp/distinfo 2005/02/24 09:59:29 1.4
+++ pkgsrc/mail/ssmtp/distinfo 2009/02/07 23:21:05 1.5
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.4 2005/02/24 09:59:29 agc Exp $ 1$NetBSD: distinfo,v 1.5 2009/02/07 23:21:05 joerg Exp $
2 2
3SHA1 (ssmtp_2.61.orig.tar.gz) = bc4b6c20bf8c2c9e66b359e3c24545a2615a1988 3SHA1 (ssmtp_2.61.orig.tar.gz) = bc4b6c20bf8c2c9e66b359e3c24545a2615a1988
4RMD160 (ssmtp_2.61.orig.tar.gz) = da76ee6dd86fc663e6fd69fcb2fb5f550f716de7 4RMD160 (ssmtp_2.61.orig.tar.gz) = da76ee6dd86fc663e6fd69fcb2fb5f550f716de7
5Size (ssmtp_2.61.orig.tar.gz) = 53341 bytes 5Size (ssmtp_2.61.orig.tar.gz) = 53341 bytes
6SHA1 (patch-aa) = 73681fd5585fe520fb9620e2f8358c41ad42cfd8 6SHA1 (patch-aa) = 73681fd5585fe520fb9620e2f8358c41ad42cfd8
7SHA1 (patch-ab) = fd4fb2e5baeacd9f1e60c04cd6c4229c39fa2641 7SHA1 (patch-ab) = fd4fb2e5baeacd9f1e60c04cd6c4229c39fa2641
8SHA1 (patch-ac) = c42d3fbfc3054cd1cc730c9fdde57f2d9498bcb4 8SHA1 (patch-ac) = 4deb9edcd201d0d5e6144dc9fa6a1b13c77c6cde
9SHA1 (patch-ad) = 92c666b84e8fa20103103f6d24f887a587d57a4c 9SHA1 (patch-ad) = 92c666b84e8fa20103103f6d24f887a587d57a4c
10SHA1 (patch-ae) = ef626358229731e6afff2e194928780e5fc908a3 10SHA1 (patch-ae) = ef626358229731e6afff2e194928780e5fc908a3
cvs diff -r1.2 -r1.3 pkgsrc/mail/ssmtp/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/mail/ssmtp/patches/patch-ac 2004/06/17 11:35:28 1.2
+++ pkgsrc/mail/ssmtp/patches/patch-ac 2009/02/07 23:21:05 1.3
@@ -1,24 +1,26 @@ @@ -1,24 +1,26 @@
1$NetBSD: patch-ac,v 1.2 2004/06/17 11:35:28 grant Exp $ 1$NetBSD: patch-ac,v 1.3 2009/02/07 23:21:05 joerg Exp $
2 2
3--- Makefile.in.orig 2002-09-27 22:32:53.000000000 +1000 3--- Makefile.in.orig 2004-07-26 07:32:18.000000000 +0200
4+++ Makefile.in 4+++ Makefile.in
5@@ -50,8 +50,8 @@ install: ssmtp $(GEN_CONFIG) 5@@ -50,9 +50,9 @@ install: ssmtp $(GEN_CONFIG)
 6 $(INSTALL) -s -m 755 ssmtp $(bindir)/ssmtp
6 $(INSTALL) -d -m 755 $(mandir) 7 $(INSTALL) -d -m 755 $(mandir)
7 $(INSTALL) -m 644 $(srcdir)/ssmtp.8 $(mandir)/ssmtp.8 8 $(INSTALL) -m 644 $(srcdir)/ssmtp.8 $(mandir)/ssmtp.8
8 $(INSTALL) -d -m 755 $(SSMTPCONFDIR) 9- $(INSTALL) -d -m 755 $(SSMTPCONFDIR)
9- $(INSTALL) -m 644 $(srcdir)/revaliases $(INSTALLED_REVALIASES_FILE) 10- $(INSTALL) -m 644 $(srcdir)/revaliases $(INSTALLED_REVALIASES_FILE)
10- $(GEN_CONFIG) $(INSTALLED_CONFIGURATION_FILE) 11- $(GEN_CONFIG) $(INSTALLED_CONFIGURATION_FILE)
 12+# $(INSTALL) -d -m 755 $(SSMTPCONFDIR)
11+# $(INSTALL) -m 644 $(srcdir)/revaliases $(INSTALLED_REVALIASES_FILE) 13+# $(INSTALL) -m 644 $(srcdir)/revaliases $(INSTALLED_REVALIASES_FILE)
12+# $(GEN_CONFIG) $(INSTALLED_CONFIGURATION_FILE) 14+# $(GEN_CONFIG) $(INSTALLED_CONFIGURATION_FILE)
13  15
14  16
15 .PHONY: install-sendmail 17 .PHONY: install-sendmail
16@@ -78,7 +78,7 @@ uninstall-sendmail: uninstall 18@@ -79,7 +79,7 @@ uninstall-sendmail: uninstall
17  19
18 # Binaries: 20 # Binaries:
19 ssmtp: $(OBJS) 21 ssmtp: $(OBJS)
20- $(CC) -o ssmtp $(OBJS) @LIBS@ 22- $(CC) -o ssmtp $(OBJS) @LIBS@
21+ $(CC) -o ssmtp $(OBJS) $(LDFLAGS) @LIBS@ 23+ $(CC) -o ssmtp $(OBJS) $(LDFLAGS) @LIBS@
22  24
23 .PHONY: clean 25 .PHONY: clean
24 clean: 26 clean: