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

Collapse All | Expand All

(-)Makefile (-19 / +3 lines)
Lines 16-21 Link Here
16
CONFIGURE_ARGS=	--with-pam=${PREFIX}/lib/security --sysconfdir=${PREFIX}/etc \
16
CONFIGURE_ARGS=	--with-pam=${PREFIX}/lib/security --sysconfdir=${PREFIX}/etc \
17
		--docdir=${DOCSDIR} --includedir=${PREFIX}/include/${PORTNAME}
17
		--docdir=${DOCSDIR} --includedir=${PREFIX}/include/${PORTNAME}
18
18
19
USES=		libtool pathfix
19
GNU_CONFIGURE=	yes
20
GNU_CONFIGURE=	yes
20
USE_LDCONFIG=	yes
21
USE_LDCONFIG=	yes
21
SUB_FILES=	pkg-message
22
SUB_FILES=	pkg-message
Lines 22-54 Link Here
22
23
23
OPTIONS_DEFINE=	DOCS
24
OPTIONS_DEFINE=	DOCS
24
25
25
.include <bsd.port.options.mk>
26
27
.if ${OSVERSION} >= 1000000
28
USE_GCC=	yes
29
.endif
30
31
post-patch:
26
post-patch:
32
	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/login_duo/login_duo.8
27
	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/login_duo/login_duo.8
33
	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/pam_duo/pam_duo.8
28
	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/pam_duo/pam_duo.8
34
.if !${PORT_OPTIONS:MDOCS}
35
	@${REINPLACE_CMD} -e 's|README AUTHORS CHANGES LICENSE||g' ${WRKSRC}/Makefile.in
36
.endif
37
29
38
post-install:
30
post-install:
39
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libduo.so.3
31
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libduo.so.3
40
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/security/pam_duo.so
32
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/security/pam_duo.so
41
	@${INSTALL} -o sshd -g wheel -m 700 ${WRKSRC}/login_duo/login_duo.conf \
33
	${INSTALL_DATA} ${WRKSRC}/login_duo/login_duo.conf \
42
	    ${STAGEDIR}${PREFIX}/etc/login_duo.conf.sample
34
	    ${STAGEDIR}${PREFIX}/etc/login_duo.conf.sample
43
	@${INSTALL_DATA} -m 700 ${WRKSRC}/pam_duo/pam_duo.conf \
35
	${INSTALL_DATA} ${WRKSRC}/pam_duo/pam_duo.conf \
44
	    ${STAGEDIR}${PREFIX}/etc/pam_duo.conf.sample
36
	    ${STAGEDIR}${PREFIX}/etc/pam_duo.conf.sample
45
	@if [ ! -f ${PREFIX}/etc/login_duo.conf ]; then \
46
		${CP} -p ${STAGEDIR}${PREFIX}/etc/login_duo.conf.sample \
47
		    ${STAGEDIR}${PREFIX}/etc/login_duo.conf ; \
48
	fi
49
	@if [ ! -f ${PREFIX}/etc/pam_duo.conf ]; then \
50
		${CP} -p ${STAGEDIR}${PREFIX}/etc/pam_duo.conf.sample \
51
		    ${STAGEDIR}${PREFIX}/etc/pam_duo.conf ; \
52
	fi
53
37
54
.include <bsd.port.mk>
38
.include <bsd.port.mk>
(-)files/patch-lib__Makefile.am (-11 lines)
Lines 1-11 Link Here
1
--- ./lib/Makefile.am.orig	2011-03-28 16:38:36.000000000 -0400
2
+++ ./lib/Makefile.am	2011-07-17 21:47:03.000000000 -0400
3
@@ -18,7 +18,7 @@
4
 
5
 notrans_dist_man3_MANS = duo.3
6
 
7
-pkgconfigdir = $(libdir)/pkgconfig
8
+pkgconfigdir = $(prefix)/libdata/pkgconfig
9
 pkgconfig_DATA = libduo.pc
10
 
11
 noinst_PROGRAMS = testduo
(-)files/patch-lib__Makefile.in (-11 lines)
Lines 1-11 Link Here
1
--- ./lib/Makefile.in.orig	2011-07-17 21:47:09.000000000 -0400
2
+++ ./lib/Makefile.in	2011-07-17 21:47:16.000000000 -0400
3
@@ -252,7 +252,7 @@
4
 libduo_la_includedir = $(includedir)
5
 libduo_la_include_HEADERS = duo.h
6
 notrans_dist_man3_MANS = duo.3
7
-pkgconfigdir = $(libdir)/pkgconfig
8
+pkgconfigdir = $(prefix)/libdata/pkgconfig
9
 pkgconfig_DATA = libduo.pc
10
 testduo_LDADD = libduo.la
11
 all: all-am
(-)pkg-plist (-8 / +7 lines)
Lines 1-18 Link Here
1
@unexec if cmp -s %D/etc/login_duo.conf.sample %D/etc/login_duo.conf; then rm -f %D/etc/login_duo.conf; fi
1
@mode 600
2
etc/login_duo.conf.sample
2
@owner sshd
3
@exec if [ ! -f %D/etc/login_duo.conf ] ; then cp -p %D/%F %B/login_duo.conf; fi
3
@sample etc/login_duo.conf.sample
4
@unexec if cmp -s %D/etc/pam_duo.conf.sample %D/etc/pam_duo.conf; then rm -f %D/etc/pam_duo.conf; fi
4
@owner
5
etc/pam_duo.conf.sample
5
@sample etc/pam_duo.conf.sample
6
@exec if [ ! -f %D/etc/pam_duo.conf ] ; then cp -p %D/%F %B/pam_duo.conf; fi
6
@mode
7
include/duo/duo.h
7
include/duo/duo.h
8
include/duo/util.h
8
include/duo/util.h
9
lib/libduo.so.3.0.0
9
lib/libduo.so.3
10
lib/libduo.so.3
10
lib/libduo.so
11
lib/libduo.so
11
lib/libduo.la
12
lib/libduo.a
12
lib/libduo.a
13
libdata/pkgconfig/libduo.pc
13
libdata/pkgconfig/libduo.pc
14
lib/security/pam_duo.so
14
lib/security/pam_duo.so
15
lib/security/pam_duo.la
16
man/man3/duo.3.gz
15
man/man3/duo.3.gz
17
man/man8/login_duo.8.gz
16
man/man8/login_duo.8.gz
18
man/man8/pam_duo.8.gz
17
man/man8/pam_duo.8.gz

Return to bug 191580