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

(-)Makefile (-13 / +13 lines)
Lines 7-21 Link Here
7
MASTER_SITES=	http://untroubled.org/${PORTNAME}/ \
7
MASTER_SITES=	http://untroubled.org/${PORTNAME}/ \
8
		http://untroubled.org/${PORTNAME}/archive/
8
		http://untroubled.org/${PORTNAME}/archive/
9
9
10
MAINTAINER= ports@FreeBSD.org
10
MAINTAINER=	uffe@uffe.org
11
COMMENT=	Credential Validation Modules
11
COMMENT=	Credential Validation Modules
12
12
13
LICENSE=	GPLv2
14
13
LIB_DEPENDS=	libbg.so:${PORTSDIR}/devel/bglibs
15
LIB_DEPENDS=	libbg.so:${PORTSDIR}/devel/bglibs
14
16
15
CONFLICTS=	bglibs-1.00*
17
CONFLICTS=	bglibs-1.00*
16
18
17
USE_AUTOTOOLS=	libtool
19
USES=	libtool:build
18
LIBTOOLFILES=	#none
19
USE_LDCONFIG=	yes
20
USE_LDCONFIG=	yes
20
BGLIBS_INC=	${LOCALBASE}/include/bglibs
21
BGLIBS_INC=	${LOCALBASE}/include/bglibs
21
BGLIBS_LIB=	${LOCALBASE}/lib/bglibs
22
BGLIBS_LIB=	${LOCALBASE}/lib/bglibs
Lines 25-31 Link Here
25
OPTIONS_DEFINE=	VCHKPW
26
OPTIONS_DEFINE=	VCHKPW
26
VCHKPW_DESC=	Compile cvm-vchkpw
27
VCHKPW_DESC=	Compile cvm-vchkpw
27
28
28
NO_STAGE=	yes
29
.include <bsd.port.options.mk>
29
.include <bsd.port.options.mk>
30
30
31
ALL_TARGET=all
31
ALL_TARGET=all
Lines 38-60 Link Here
38
PLIST_SUB=	VCHKPW="@comment "
38
PLIST_SUB=	VCHKPW="@comment "
39
.endif
39
.endif
40
40
41
post-patch:
42
	@${REINPLACE_CMD} -e 's|libtool|${LIBTOOL}|g' ${WRKSRC}/Makefile
43
44
do-configure:
41
do-configure:
45
	${ECHO_CMD} "${PREFIX}"		> ${WRKSRC}/conf-home
42
	${ECHO_CMD} "${PREFIX}"		> ${WRKSRC}/conf-home
46
	${ECHO_CMD} "${PREFIX}/bin"	> ${WRKSRC}/conf-bin
43
	${ECHO_CMD} "${STAGEDIR}${PREFIX}/bin"	> ${WRKSRC}/conf-bin
47
	${ECHO_CMD} "${PREFIX}/include"	> ${WRKSRC}/conf-include
44
	${ECHO_CMD} "${STAGEDIR}${PREFIX}/include"	> ${WRKSRC}/conf-include
48
	${ECHO_CMD} "${PREFIX}/lib"	> ${WRKSRC}/conf-lib
45
	${ECHO_CMD} "${STAGEDIR}${PREFIX}/lib"	> ${WRKSRC}/conf-lib
49
	${ECHO_CMD} "${CC} ${CFLAGS}"	> ${WRKSRC}/conf-cc
46
	${ECHO_CMD} "${CC} ${CFLAGS}"	> ${WRKSRC}/conf-cc
50
	${ECHO_CMD} "${CC} ${STRIP} ${LDFLAGS}"       > ${WRKSRC}/conf-ld
47
	${ECHO_CMD} "${CC} ${STRIP} ${LDFLAGS}"       > ${WRKSRC}/conf-ld
51
	${ECHO_CMD} "${BGLIBS_INC}"	> ${WRKSRC}/conf-bgincs
48
	${ECHO_CMD} "${BGLIBS_INC}"	> ${WRKSRC}/conf-bgincs
52
	${ECHO_CMD} "${BGLIBS_LIB}"	> ${WRKSRC}/conf-bglibs
49
	${ECHO_CMD} "${BGLIBS_LIB}"	> ${WRKSRC}/conf-bglibs
53
50
51
post-install:
52
.for l in command local module qmail sasl sql udp v1client v2client
53
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}-${l}.so*
54
.endfor
54
.if ${PORT_OPTIONS:MDOCS}
55
.if ${PORT_OPTIONS:MDOCS}
55
post-install:
56
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
56
	@${MKDIR} ${DOCSDIR}
57
	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
57
	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
58
.endif
58
.endif
59
59
60
.include <bsd.port.mk>
60
.include <bsd.port.mk>
(-)files/patch-Makefile (-2 / +17 lines)
Lines 1-5 Link Here
1
--- ./Makefile.orig	2009-03-17 14:53:54.000000000 +0300
1
--- Makefile.orig	2010-01-21 23:51:26.000000000 +0100
2
+++ ./Makefile	2009-03-17 14:55:41.000000000 +0300
2
+++ Makefile	2014-08-21 05:42:52.000000000 +0200
3
@@ -155,10 +155,10 @@
3
@@ -155,10 +155,10 @@
4
 	./compile cvm-v1testclient.c
4
 	./compile cvm-v1testclient.c
5
 
5
 
Lines 13-15 Link Here
13
 
13
 
14
 cvm-vmailmgr: cvm-vmailmgr.o ltload vmautoconvert.o vmlookup.o getpwnam.o libcvm-module.la libcvm-qmail.la socket.lib crypt.lib
14
 cvm-vmailmgr: cvm-vmailmgr.o ltload vmautoconvert.o vmlookup.o getpwnam.o libcvm-module.la libcvm-qmail.la socket.lib crypt.lib
15
 	./ltload cvm-vmailmgr vmautoconvert.o vmlookup.o getpwnam.o libcvm-module.la libcvm-qmail.la -lbg `cat socket.lib` `cat crypt.lib`
15
 	./ltload cvm-vmailmgr vmautoconvert.o vmlookup.o getpwnam.o libcvm-module.la libcvm-qmail.la -lbg `cat socket.lib` `cat crypt.lib`
16
@@ -249,12 +249,12 @@
17
 	) >ltload
18
 	chmod 755 ltload
19
 
20
-makeshlib: conf-ld conf-lib LIBVERSION Makefile
21
+makeshlib: conf-home conf-ld conf-lib LIBVERSION Makefile
22
 	( if libtool --tag=CC --help >/dev/null 2>&1; then tag='--tag=CC'; fi; \
23
 	  echo '#!/bin/sh'; \
24
 	  echo 'lib="$$1"; shift';\
25
 	  echo 'rm -f "$$lib"';\
26
-	  echo libtool --mode=link --silent $$tag `head -n 1 conf-ld` '-o "$$lib" -rpath' `head -n 1 conf-lib` -version-info `head -n 1 LIBVERSION` '$${1+"$$@"}';\
27
+	  echo libtool --mode=link --silent $$tag `head -n 1 conf-ld` '-o "$$lib" -rpath' `head -n 1 conf-home`/lib -version-info `head -n 1 LIBVERSION` '$${1+"$$@"}';\
28
 	) >makeshlib
29
 	chmod 755 makeshlib
30
 
(-)pkg-descr (-1 / +1 lines)
Lines 8-11 Link Here
8
- A set of libraries for module writers
8
- A set of libraries for module writers
9
9
10
Author:	Bruce Guenter <bruceg@em.ca>
10
Author:	Bruce Guenter <bruceg@em.ca>
11
WWW:	http://untroubled.org/cvm/
11
WWW: http://untroubled.org/cvm/
(-)pkg-plist (-9 lines)
Lines 26-64 Link Here
26
lib/libcvm-client.la
26
lib/libcvm-client.la
27
lib/libcvm-client.so
27
lib/libcvm-client.so
28
lib/libcvm-command.a
28
lib/libcvm-command.a
29
lib/libcvm-command.la
30
lib/libcvm-command.so
29
lib/libcvm-command.so
31
lib/libcvm-command.so.2
30
lib/libcvm-command.so.2
32
lib/libcvm-local.a
31
lib/libcvm-local.a
33
lib/libcvm-local.la
34
lib/libcvm-local.so
32
lib/libcvm-local.so
35
lib/libcvm-local.so.2
33
lib/libcvm-local.so.2
36
lib/libcvm-module.a
34
lib/libcvm-module.a
37
lib/libcvm-module.la
38
lib/libcvm-module.so
35
lib/libcvm-module.so
39
lib/libcvm-module.so.2
36
lib/libcvm-module.so.2
40
lib/libcvm-qmail.a
37
lib/libcvm-qmail.a
41
lib/libcvm-qmail.la
42
lib/libcvm-qmail.so
38
lib/libcvm-qmail.so
43
lib/libcvm-qmail.so.2
39
lib/libcvm-qmail.so.2
44
lib/libcvm-sasl.a
40
lib/libcvm-sasl.a
45
lib/libcvm-sasl.la
46
lib/libcvm-sasl.so
41
lib/libcvm-sasl.so
47
lib/libcvm-sasl.so.2
42
lib/libcvm-sasl.so.2
48
lib/libcvm-sql.a
43
lib/libcvm-sql.a
49
lib/libcvm-sql.la
50
lib/libcvm-sql.so
44
lib/libcvm-sql.so
51
lib/libcvm-sql.so.2
45
lib/libcvm-sql.so.2
52
lib/libcvm-udp.a
46
lib/libcvm-udp.a
53
lib/libcvm-udp.la
54
lib/libcvm-udp.so
47
lib/libcvm-udp.so
55
lib/libcvm-udp.so.2
48
lib/libcvm-udp.so.2
56
lib/libcvm-v1client.a
49
lib/libcvm-v1client.a
57
lib/libcvm-v1client.la
58
lib/libcvm-v1client.so
50
lib/libcvm-v1client.so
59
lib/libcvm-v1client.so.2
51
lib/libcvm-v1client.so.2
60
lib/libcvm-v2client.a
52
lib/libcvm-v2client.a
61
lib/libcvm-v2client.la
62
lib/libcvm-v2client.so
53
lib/libcvm-v2client.so
63
lib/libcvm-v2client.so.2
54
lib/libcvm-v2client.so.2
64
%%PORTDOCS%%%%DOCSDIR%%/NEWS
55
%%PORTDOCS%%%%DOCSDIR%%/NEWS

Return to bug 192875