Attachment #152567 for bug #197338

View | Details | Raw Unified | Return to bug 197338
Collapse All | Expand All




MASTER_SITES=		http://web.mit.edu/kerberos/dist/${PORTNAME}/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/
DISTNAME=		${PORTNAME}-${PORTVERSION}-signed
EXTRACT_SUFX=		.tar
PATCHFILES=		2015-001-patch-r113.txt

PATCH_SITES=		http://web.mit.edu/kerberos/advisories/
PATCH_DIST_STRIP=	-p2
PATCHFILES=		2015-001-patch-r113.txt

MAINTAINER=		cy@FreeBSD.org
COMMENT=		Authentication system developed at MIT, successor to Kerberos IV

GNU_CONFIGURE=		yes
USES=			gettext gmake perl5 libtool:build
CONFIGURE_ARGS?=	--enable-shared --without-system-verto
CONFIGURE_ENV=		INSTALL="${INSTALL}" INSTALL_LIB="${INSTALL_LIB}" YACC="${YACC}"
MAKE_ARGS=		INSTALL="${INSTALL}" INSTALL_LIB="${INSTALL_LIB}"

OPTIONS_DEFINE=		KRB5_PDF KRB5_HTML DNS_FOR_REALM LDAP READLINE
OPTIONS_DEFAULT=	KRB5_PDF KRB5_HTML

.if ${PORT_OPTIONS:MREADLINE}
.if ${OSVERSION} >= 1100000
# libtool has some gas with libreadline in 11-CURRENT.
BUILD_DEPENDS+=		libreadline.so:${PORTSDIR}/devel/readline
LIB_DEPENDS+=		libreadline.so:${PORTSDIR}/devel/readline
.else
USES+=			readline:port
.endif

.endif
.if ${PORT_OPTIONS:MKRB5_PDF}
	for i in $${pdf_dirs}; do \
		${ECHO_CMD} @dir share/doc/krb5/$${i} >> ${TMPPLIST}; \
	done | ${TAIL} -r >> ${TMPPLIST}
.endif
.if ${PORT_OPTIONS:MKRB5_HTML}
	for i in $${html_dirs}; do \
		${ECHO_CMD} @dir share/doc/krb5/$${i} >> ${TMPPLIST}; \
	done | ${TAIL} -r >> ${TMPPLIST}
.endif
	${ECHO_CMD} @dir share/doc/krb5 >> ${TMPPLIST}
	@${SED} "s%\${PREFIX}%${PREFIX}%" ${FILESDIR}/README.FreeBSD > ${STAGEDIR}${PREFIX}/share/doc/krb5/README.FreeBSD
	@${CHMOD} 444 ${STAGEDIR}${PREFIX}/share/doc/krb5/README.FreeBSD
	@${ECHO} "------------------------------------------------------"




--- config/pre.in.orig	2014-10-15 16:55:10.000000000 -0700
+++ config/pre.in	2015-02-04 12:43:45.693875606 -0800
@@ -178,9 +178,9 @@
 INSTALL=@INSTALL@
 INSTALL_STRIP=
 INSTALL_PROGRAM=@INSTALL_PROGRAM@ $(INSTALL_STRIP)

-INSTALL_SCRIPT=@INSTALL_PROGRAM@
+INSTALL_SCRIPT=@INSTALL_SCRIPT@
 INSTALL_DATA=@INSTALL_DATA@
-INSTALL_SHLIB=@INSTALL_SHLIB@
+INSTALL_SHLIB=$(INSTALL_LIB)
 INSTALL_SETUID=$(INSTALL) $(INSTALL_STRIP) -m 4755 -o root
 ## This is needed because autoconf will sometimes define @exec_prefix@ to be
 ## ${prefix}.
@@ -197,7 +197,7 @@
 ADMIN_BINDIR = @sbindir@
 SERVER_BINDIR = @sbindir@
 CLIENT_BINDIR =@bindir@
-PKGCONFIG_DIR = @libdir@/pkgconfig
+PKGCONFIG_DIR = $(prefix)/libdata/pkgconfig
 ADMIN_MANDIR = $(KRB5MANROOT)/man8
 SERVER_MANDIR = $(KRB5MANROOT)/man8
 CLIENT_MANDIR = $(KRB5MANROOT)/man1




lib/libkrad.so.0
lib/libverto.so.0
lib/libverto.so
libdata/pkgconfig/gssrpc.pc
libdata/pkgconfig/kadm-client.pc
libdata/pkgconfig/kadm-server.pc
libdata/pkgconfig/kdb.pc
libdata/pkgconfig/krb5-gssapi.pc
libdata/pkgconfig/krb5.pc
libdata/pkgconfig/mit-krb5-gssapi.pc
libdata/pkgconfig/mit-krb5.pc
man/man1/k5srvutil.1.gz
man/man1/kadmin.1.gz
man/man1/krb5-config.1.gz

share/examples/krb5/krb5.conf
share/examples/krb5/services.append
share/locale/en_US/LC_MESSAGES/mit-krb5.mo
@dir lib/krb5/plugins/authdata
@dir lib/krb5/plugins/libkrb5
@dir var/run/krb5kdc
@dir var/krb5kdc
@dirrmtry share/locale/en_US
@dirrm lib/pkgconfig
@dirrm lib/krb5/plugins/tls
@dirrm lib/krb5/plugins/preauth
@dirrm lib/krb5/plugins/libkrb5
@dirrm lib/krb5/plugins/kdb
@dirrm lib/krb5/plugins/authdata
@dirrm lib/krb5/plugins
@dirrm lib/krb5
@dirrm include/gssapi
@dirrm include/gssrpc
@dirrm include/krb5
@dirrm include/kadm5
@dirrm share/et
@dirrm share/examples/krb5

Return to bug 197338

Lines 94-107 lib/libkrad.so Link Here

(-)pkg-plist (-27 / +12 lines)
94	lib/libkrad.so.0	94	lib/libkrad.so.0
95	lib/libverto.so.0	95	lib/libverto.so.0
96	lib/libverto.so	96	lib/libverto.so
97	lib/pkgconfig/gssrpc.pc	97	libdata/pkgconfig/gssrpc.pc
98	lib/pkgconfig/kadm-client.pc	98	libdata/pkgconfig/kadm-client.pc
99	lib/pkgconfig/kadm-server.pc	99	libdata/pkgconfig/kadm-server.pc
100	lib/pkgconfig/kdb.pc	100	libdata/pkgconfig/kdb.pc
101	lib/pkgconfig/krb5-gssapi.pc	101	libdata/pkgconfig/krb5-gssapi.pc
102	lib/pkgconfig/krb5.pc	102	libdata/pkgconfig/krb5.pc
103	lib/pkgconfig/mit-krb5-gssapi.pc	103	libdata/pkgconfig/mit-krb5-gssapi.pc
104	lib/pkgconfig/mit-krb5.pc	104	libdata/pkgconfig/mit-krb5.pc
105	man/man1/k5srvutil.1.gz	105	man/man1/k5srvutil.1.gz
106	man/man1/kadmin.1.gz	106	man/man1/kadmin.1.gz
107	man/man1/krb5-config.1.gz	107	man/man1/krb5-config.1.gz
Lines 151-172 share/examples/krb5/kdc.conf Link Here
151	share/examples/krb5/krb5.conf	151	share/examples/krb5/krb5.conf
152	share/examples/krb5/services.append	152	share/examples/krb5/services.append
153	share/locale/en_US/LC_MESSAGES/mit-krb5.mo	153	share/locale/en_US/LC_MESSAGES/mit-krb5.mo
154	@exec mkdir -p %D/var/krb5kdc	154	@dir lib/krb5/plugins/authdata
155	@dirrmtry var/krb5kdc	155	@dir lib/krb5/plugins/libkrb5
156	@dirrmtry var	156	@dir var/run/krb5kdc
157	@dirrmtry share/locale/en_US/LC_MESSAGES	157	@dir var/krb5kdc
158	@dirrmtry share/locale/en_US
159	@dirrm lib/pkgconfig
160	@dirrm lib/krb5/plugins/tls
161	@dirrm lib/krb5/plugins/preauth
162	@dirrm lib/krb5/plugins/libkrb5
163	@dirrm lib/krb5/plugins/kdb
164	@dirrm lib/krb5/plugins/authdata
165	@dirrm lib/krb5/plugins
166	@dirrm lib/krb5
167	@dirrm include/gssapi
168	@dirrm include/gssrpc
169	@dirrm include/krb5
170	@dirrm include/kadm5
171	@dirrm share/et
172	@dirrm share/examples/krb5

Lines 8-17 CATEGORIES= security Link Here

(-)Makefile (-8 / +8 lines)
8	MASTER_SITES= http://web.mit.edu/kerberos/dist/${PORTNAME}/${PORTVERSION:C/^[0-9]\.[0-9]/&X/:C/X\.[0-9]*$//:C/X//}/	8	MASTER_SITES= http://web.mit.edu/kerberos/dist/${PORTNAME}/${PORTVERSION:C/^[0-9]\.[0-9]/&X/:C/X\.[0-9]*$//:C/X//}/
9	DISTNAME= ${PORTNAME}-${PORTVERSION}-signed	9	DISTNAME= ${PORTNAME}-${PORTVERSION}-signed
10	EXTRACT_SUFX= .tar	10	EXTRACT_SUFX= .tar
11	PATCHFILES= 2015-001-patch-r113.txt
12		11
13	PATCH_SITES= http://web.mit.edu/kerberos/advisories/	12	PATCH_SITES= http://web.mit.edu/kerberos/advisories/
14	PATCH_DIST_STRIP= -p2	13	PATCH_DIST_STRIP= -p2
		14	PATCHFILES= 2015-001-patch-r113.txt
15		15
16	MAINTAINER= cy@FreeBSD.org	16	MAINTAINER= cy@FreeBSD.org
17	COMMENT= Authentication system developed at MIT, successor to Kerberos IV	17	COMMENT= Authentication system developed at MIT, successor to Kerberos IV
Lines 29-36 USE_CSTD= gnu99 Link Here
29	GNU_CONFIGURE= yes	29	GNU_CONFIGURE= yes
30	USES= gettext gmake perl5 libtool:build	30	USES= gettext gmake perl5 libtool:build
31	CONFIGURE_ARGS?= --enable-shared --without-system-verto	31	CONFIGURE_ARGS?= --enable-shared --without-system-verto
32	CONFIGURE_ENV= INSTALL="${INSTALL}" YACC="${YACC}"	32	CONFIGURE_ENV= INSTALL="${INSTALL}" INSTALL_LIB="${INSTALL_LIB}" YACC="${YACC}"
33	MAKE_ARGS= INSTALL="${INSTALL}"	33	MAKE_ARGS= INSTALL="${INSTALL}" INSTALL_LIB="${INSTALL_LIB}"
34		34
35	OPTIONS_DEFINE= KRB5_PDF KRB5_HTML DNS_FOR_REALM LDAP READLINE	35	OPTIONS_DEFINE= KRB5_PDF KRB5_HTML DNS_FOR_REALM LDAP READLINE
36	OPTIONS_DEFAULT= KRB5_PDF KRB5_HTML	36	OPTIONS_DEFAULT= KRB5_PDF KRB5_HTML
Lines 71-78 PLIST_SUB+= LDAP="@comment " Link Here
71	.if ${PORT_OPTIONS:MREADLINE}	71	.if ${PORT_OPTIONS:MREADLINE}
72	.if ${OSVERSION} >= 1100000	72	.if ${OSVERSION} >= 1100000
73	# libtool has some gas with libreadline in 11-CURRENT.	73	# libtool has some gas with libreadline in 11-CURRENT.
74	BUILD_DEPENDS+= ${LOCALBASE}/lib/libreadline.so.6:${PORTSDIR}/devel/readline	74	BUILD_DEPENDS+= libreadline.so:${PORTSDIR}/devel/readline
75	LIB_DEPENDS+= ${LOCALBASE}/lib/libreadline.so.6:${PORTSDIR}/devel/readline	75	LIB_DEPENDS+= libreadline.so:${PORTSDIR}/devel/readline
76	.else	76	.else
77	USES+= readline:port	77	USES+= readline:port
78	.endif	78	.endif
Lines 123-137 post-install: Link Here
123	.endif	123	.endif
124	.if ${PORT_OPTIONS:MKRB5_PDF}	124	.if ${PORT_OPTIONS:MKRB5_PDF}
125	for i in $${pdf_dirs}; do \	125	for i in $${pdf_dirs}; do \
126	${ECHO_CMD} @dirrm share/doc/krb5/$${i} >> ${TMPPLIST}; \	126	${ECHO_CMD} @dir share/doc/krb5/$${i} >> ${TMPPLIST}; \
127	done \| ${TAIL} -r >> ${TMPPLIST}	127	done \| ${TAIL} -r >> ${TMPPLIST}
128	.endif	128	.endif
129	.if ${PORT_OPTIONS:MKRB5_HTML}	129	.if ${PORT_OPTIONS:MKRB5_HTML}
130	for i in $${html_dirs}; do \	130	for i in $${html_dirs}; do \
131	${ECHO_CMD} @dirrm share/doc/krb5/$${i} >> ${TMPPLIST}; \	131	${ECHO_CMD} @dir share/doc/krb5/$${i} >> ${TMPPLIST}; \
132	done \| ${TAIL} -r >> ${TMPPLIST}	132	done \| ${TAIL} -r >> ${TMPPLIST}
133	.endif	133	.endif
134	${ECHO_CMD} @dirrm share/doc/krb5 >> ${TMPPLIST}	134	${ECHO_CMD} @dir share/doc/krb5 >> ${TMPPLIST}
135	@${SED} "s%\${PREFIX}%${PREFIX}%" ${FILESDIR}/README.FreeBSD > ${STAGEDIR}${PREFIX}/share/doc/krb5/README.FreeBSD	135	@${SED} "s%\${PREFIX}%${PREFIX}%" ${FILESDIR}/README.FreeBSD > ${STAGEDIR}${PREFIX}/share/doc/krb5/README.FreeBSD
136	@${CHMOD} 444 ${STAGEDIR}${PREFIX}/share/doc/krb5/README.FreeBSD	136	@${CHMOD} 444 ${STAGEDIR}${PREFIX}/share/doc/krb5/README.FreeBSD
137	@${ECHO} "------------------------------------------------------"	137	@${ECHO} "------------------------------------------------------"

Lines 1-6 Link Here

(-)files/patch-config__pre.in (-4 / +16 lines)
1	--- config/pre.in.orig Fri Nov 19 13:47:51 2004	1	--- config/pre.in.orig 2014-10-15 16:55:10.000000000 -0700
2	+++ config/pre.in Thu Jan 27 17:43:12 2005	2	+++ config/pre.in 2015-02-04 12:43:45.693875606 -0800
3	@@ -177,7 +177,7 @@	3	@@ -178,9 +178,9 @@
4	INSTALL=@INSTALL@	4	INSTALL=@INSTALL@
5	INSTALL_STRIP=	5	INSTALL_STRIP=
6	INSTALL_PROGRAM=@INSTALL_PROGRAM@ $(INSTALL_STRIP)	6	INSTALL_PROGRAM=@INSTALL_PROGRAM@ $(INSTALL_STRIP)
Lines 7-11 Link Here
7	-INSTALL_SCRIPT=@INSTALL_PROGRAM@	7	-INSTALL_SCRIPT=@INSTALL_PROGRAM@
8	+INSTALL_SCRIPT=@INSTALL_SCRIPT@	8	+INSTALL_SCRIPT=@INSTALL_SCRIPT@
9	INSTALL_DATA=@INSTALL_DATA@	9	INSTALL_DATA=@INSTALL_DATA@
10	INSTALL_SHLIB=@INSTALL_SHLIB@	10	-INSTALL_SHLIB=@INSTALL_SHLIB@
		11	+INSTALL_SHLIB=$(INSTALL_LIB)
11	INSTALL_SETUID=$(INSTALL) $(INSTALL_STRIP) -m 4755 -o root	12	INSTALL_SETUID=$(INSTALL) $(INSTALL_STRIP) -m 4755 -o root
		13	## This is needed because autoconf will sometimes define @exec_prefix@ to be
		14	## ${prefix}.
		15	@@ -197,7 +197,7 @@
		16	ADMIN_BINDIR = @sbindir@
		17	SERVER_BINDIR = @sbindir@
		18	CLIENT_BINDIR =@bindir@
		19	-PKGCONFIG_DIR = @libdir@/pkgconfig
		20	+PKGCONFIG_DIR = $(prefix)/libdata/pkgconfig
		21	ADMIN_MANDIR = $(KRB5MANROOT)/man8
		22	SERVER_MANDIR = $(KRB5MANROOT)/man8
		23	CLIENT_MANDIR = $(KRB5MANROOT)/man1