View | Details | Raw Unified | Return to bug 192033 | Differences between
and this patch

Collapse All | Expand All

(-)./Makefile (-8 / +9 lines)
Lines 35-43 Link Here
35
.include <bsd.port.pre.mk>
35
.include <bsd.port.pre.mk>
36
36
37
.if ${OSVERSION} < 900000
37
.if ${OSVERSION} < 900000
38
EXTRA_PATCHES=	${.CURDIR:H:H}/mail/dma/files/extrapatch-8-spool.c
38
EXTRA_PATCHES=	${FILESDIR}/extrapatch-8-spool.c
39
.else
39
.else
40
EXTRA_PATCHES=  ${.CURDIR:H:H}/mail/dma/files/extrapatch-else-spool.c
40
EXTRA_PATCHES=	${FILESDIR}/extrapatch-else-spool.c
41
.endif
41
.endif
42
42
43
pre-patch:
43
pre-patch:
Lines 54-68 Link Here
54
.endif
54
.endif
55
55
56
do-install:
56
do-install:
57
	${INSTALL} -o root -g mail -m 2555 ${WRKSRC}/dma/dma ${STAGEDIR}/${PREFIX}/libexec
57
	${INSTALL} ${WRKSRC}/dma/dma ${STAGEDIR}/${PREFIX}/libexec
58
	${INSTALL} -o root -g mail -m 4550 \
58
	${INSTALL} ${WRKSRC}/dma-mbox-create/dma-mbox-create ${STAGEDIR}/${PREFIX}/libexec
59
		${WRKSRC}/dma-mbox-create/dma-mbox-create ${STAGEDIR}/${PREFIX}/libexec
59
	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/libexec/*
60
	${INSTALL_MAN} ${WRKSRC}/dma.8 ${STAGEDIR}/${PREFIX}/man/man8/
60
	${INSTALL_MAN} ${WRKSRC}/dma.8 ${STAGEDIR}/${PREFIX}/man/man8/
61
	${MKDIR} ${STAGEDIR}/${PREFIX}/etc/dma
61
	${MKDIR} ${STAGEDIR}/${PREFIX}/etc/dma
62
.for i in ${CONFFILES}
62
.for i in ${CONFFILES}
63
	${INSTALL_DATA} -m 0644 ${WRKSRC}/${i} ${STAGEDIR}/${PREFIX}/etc/dma/${i}.sample
63
	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}/${PREFIX}/etc/dma/${i}.sample
64
.endfor
64
.endfor
65
	${CHMOD} o-r ${STAGEDIR}/${PREFIX}/etc/dma/auth.conf.sample
65
66
	${INSTALL} -d -o root -g mail -m 770 ${STAGEDIR}/var/spool/dma
66
post-install:
67
	${MKDIR} ${STAGEDIR}/var/spool/dma
67
68
68
.include <bsd.port.post.mk>
69
.include <bsd.port.post.mk>
(-)./mail_dma.diff (+1 lines)
Line 0 Link Here
1
===> Generating patch
(-)./pkg-install (+9 lines)
Line 0 Link Here
1
#!/bin/sh
2
3
case $2 in
4
POST-INSTALL)
5
	# pkg_tools compatibility
6
	# should be removed after 2014-09-01
7
	install -dv -o root -g mail -m 770 /var/spool/dma
8
	;;
9
esac
(-)./pkg-plist (-1 / +11 lines)
Lines 1-9 Link Here
1
@group mail
2
@mode 2555
1
libexec/dma
3
libexec/dma
4
@mode 4550
2
libexec/dma-mbox-create
5
libexec/dma-mbox-create
3
@sample etc/dma/dma.conf.sample
6
@group
7
@mode 640
4
@sample etc/dma/auth.conf.sample
8
@sample etc/dma/auth.conf.sample
9
@mode
10
@sample etc/dma/dma.conf.sample
5
man/man8/dma.8.gz
11
man/man8/dma.8.gz
6
@dirrmtry etc/dma
12
@dirrmtry etc/dma
7
@cwd /
13
@cwd /
14
@group mail
15
@mode 770
8
@dirrmtry var/spool/dma
16
@dirrmtry var/spool/dma
17
@group
18
@mode
9
@cwd %%RESETPREFIX%%
19
@cwd %%RESETPREFIX%%
(-)./ttt (+84 lines)
Line 0 Link Here
1
===> Generating patch
2
===> Viewing diff with /usr/local/bin/cdiff
3
diff -ruN /usr/ports/mail/dma/Makefile ./Makefile
4
--- /usr/ports/mail/dma/Makefile	2014-05-18 03:16:28.246534000 +0000
5
+++ ./Makefile	2014-07-22 11:25:01.000000000 +0000
6
@@ -35,9 +35,9 @@
7
 .include <bsd.port.pre.mk>
8
 
9
 .if ${OSVERSION} < 900000
10
-EXTRA_PATCHES=	${.CURDIR:H:H}/mail/dma/files/extrapatch-8-spool.c
11
+EXTRA_PATCHES=	${FILESDIR}/extrapatch-8-spool.c
12
 .else
13
-EXTRA_PATCHES=  ${.CURDIR:H:H}/mail/dma/files/extrapatch-else-spool.c
14
+EXTRA_PATCHES=	${FILESDIR}/extrapatch-else-spool.c
15
 .endif
16
 
17
 pre-patch:
18
@@ -54,15 +54,16 @@
19
 .endif
20
 
21
 do-install:
22
-	${INSTALL} -o root -g mail -m 2555 ${WRKSRC}/dma/dma ${STAGEDIR}/${PREFIX}/libexec
23
-	${INSTALL} -o root -g mail -m 4550 \
24
-		${WRKSRC}/dma-mbox-create/dma-mbox-create ${STAGEDIR}/${PREFIX}/libexec
25
+	${INSTALL} ${WRKSRC}/dma/dma ${STAGEDIR}/${PREFIX}/libexec
26
+	${INSTALL} ${WRKSRC}/dma-mbox-create/dma-mbox-create ${STAGEDIR}/${PREFIX}/libexec
27
+	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/libexec/*
28
 	${INSTALL_MAN} ${WRKSRC}/dma.8 ${STAGEDIR}/${PREFIX}/man/man8/
29
 	${MKDIR} ${STAGEDIR}/${PREFIX}/etc/dma
30
 .for i in ${CONFFILES}
31
-	${INSTALL_DATA} -m 0644 ${WRKSRC}/${i} ${STAGEDIR}/${PREFIX}/etc/dma/${i}.sample
32
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}/${PREFIX}/etc/dma/${i}.sample
33
 .endfor
34
-	${CHMOD} o-r ${STAGEDIR}/${PREFIX}/etc/dma/auth.conf.sample
35
-	${INSTALL} -d -o root -g mail -m 770 ${STAGEDIR}/var/spool/dma
36
+
37
+post-install:
38
+	${MKDIR} ${STAGEDIR}/var/spool/dma
39
 
40
 .include <bsd.port.post.mk>
41
diff -ruN /usr/ports/mail/dma/pkg-install ./pkg-install
42
--- /usr/ports/mail/dma/pkg-install	1970-01-01 00:00:00.000000000 +0000
43
+++ ./pkg-install	2014-07-22 12:29:29.000000000 +0000
44
@@ -0,0 +1,9 @@
45
+#!/bin/sh
46
+
47
+case $2 in
48
+POST-INSTALL)
49
+	# pkg_tools compatibility
50
+	# should be removed after 2014-09-01
51
+	install -dv -o root -g mail -m 770 /var/spool/dma
52
+	;;
53
+esac
54
diff -ruN /usr/ports/mail/dma/pkg-plist ./pkg-plist
55
--- /usr/ports/mail/dma/pkg-plist	2014-05-18 01:53:30.665567000 +0000
56
+++ ./pkg-plist	2014-07-22 12:28:47.000000000 +0000
57
@@ -1,9 +1,19 @@
58
+@group mail
59
+@mode 2555
60
 libexec/dma
61
+@mode 4550
62
 libexec/dma-mbox-create
63
-@sample etc/dma/dma.conf.sample
64
+@group
65
+@mode 640
66
 @sample etc/dma/auth.conf.sample
67
+@mode
68
+@sample etc/dma/dma.conf.sample
69
 man/man8/dma.8.gz
70
 @dirrmtry etc/dma
71
 @cwd /
72
+@group mail
73
+@mode 770
74
 @dirrmtry var/spool/dma
75
+@group
76
+@mode
77
 @cwd %%RESETPREFIX%%
78
diff -ruN /usr/ports/mail/dma/ttt ./ttt
79
--- /usr/ports/mail/dma/ttt	1970-01-01 00:00:00.000000000 +0000
80
+++ ./ttt	2014-07-22 12:44:01.000000000 +0000
81
@@ -0,0 +1 @@
82
+===> Generating patch
83
====> Cleaning up
84
===> Done

Return to bug 192033