Attachment 146103 Details for Bug 192875 – cvm.patch

[patch] cvm.patch

cvm.patch (text/plain), 4.63 KB, created by Uffe Jakobsen on 2014-08-21 03:50:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Uffe Jakobsen

Created: 2014-08-21 03:50:16 UTC

Size: 4.63 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 365529)
>+++ Makefile	(working copy)
>@@ -7,15 +7,16 @@
> MASTER_SITES=	http://untroubled.org/${PORTNAME}/ \
> 		http://untroubled.org/${PORTNAME}/archive/
> 
>-MAINTAINER= ports@FreeBSD.org
>+MAINTAINER=	uffe@uffe.org
> COMMENT=	Credential Validation Modules
> 
>+LICENSE=	GPLv2
>+
> LIB_DEPENDS=	libbg.so:${PORTSDIR}/devel/bglibs
> 
> CONFLICTS=	bglibs-1.00*
> 
>-USE_AUTOTOOLS=	libtool
>-LIBTOOLFILES=	#none
>+USES=	libtool:build
> USE_LDCONFIG=	yes
> BGLIBS_INC=	${LOCALBASE}/include/bglibs
> BGLIBS_LIB=	${LOCALBASE}/lib/bglibs
>@@ -25,7 +26,6 @@
> OPTIONS_DEFINE=	VCHKPW
> VCHKPW_DESC=	Compile cvm-vchkpw
> 
>-NO_STAGE=	yes
> .include <bsd.port.options.mk>
> 
> ALL_TARGET=all
>@@ -38,23 +38,23 @@
> PLIST_SUB=	VCHKPW="@comment "
> .endif
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e 's|libtool|${LIBTOOL}|g' ${WRKSRC}/Makefile
>-
> do-configure:
> 	${ECHO_CMD} "${PREFIX}"		> ${WRKSRC}/conf-home
>-	${ECHO_CMD} "${PREFIX}/bin"	> ${WRKSRC}/conf-bin
>-	${ECHO_CMD} "${PREFIX}/include"	> ${WRKSRC}/conf-include
>-	${ECHO_CMD} "${PREFIX}/lib"	> ${WRKSRC}/conf-lib
>+	${ECHO_CMD} "${STAGEDIR}${PREFIX}/bin"	> ${WRKSRC}/conf-bin
>+	${ECHO_CMD} "${STAGEDIR}${PREFIX}/include"	> ${WRKSRC}/conf-include
>+	${ECHO_CMD} "${STAGEDIR}${PREFIX}/lib"	> ${WRKSRC}/conf-lib
> 	${ECHO_CMD} "${CC} ${CFLAGS}"	> ${WRKSRC}/conf-cc
> 	${ECHO_CMD} "${CC} ${STRIP} ${LDFLAGS}"       > ${WRKSRC}/conf-ld
> 	${ECHO_CMD} "${BGLIBS_INC}"	> ${WRKSRC}/conf-bgincs
> 	${ECHO_CMD} "${BGLIBS_LIB}"	> ${WRKSRC}/conf-bglibs
> 
>+post-install:
>+.for l in command local module qmail sasl sql udp v1client v2client
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}-${l}.so*
>+.endfor
> .if ${PORT_OPTIONS:MDOCS}
>-post-install:
>-	@${MKDIR} ${DOCSDIR}
>-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
>+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
> .endif
> 
> .include <bsd.port.mk>
>Index: files/patch-Makefile
>===================================================================
>--- files/patch-Makefile	(revision 365529)
>+++ files/patch-Makefile	(working copy)
>@@ -1,5 +1,5 @@
>---- ./Makefile.orig	2009-03-17 14:53:54.000000000 +0300
>-+++ ./Makefile	2009-03-17 14:55:41.000000000 +0300
>+--- Makefile.orig	2010-01-21 23:51:26.000000000 +0100
>++++ Makefile	2014-08-21 05:42:52.000000000 +0200
> @@ -155,10 +155,10 @@
>  	./compile cvm-v1testclient.c
>  
>@@ -13,3 +13,18 @@
>  
>  cvm-vmailmgr: cvm-vmailmgr.o ltload vmautoconvert.o vmlookup.o getpwnam.o libcvm-module.la libcvm-qmail.la socket.lib crypt.lib
>  	./ltload cvm-vmailmgr vmautoconvert.o vmlookup.o getpwnam.o libcvm-module.la libcvm-qmail.la -lbg `cat socket.lib` `cat crypt.lib`
>+@@ -249,12 +249,12 @@
>+ 	) >ltload
>+ 	chmod 755 ltload
>+ 
>+-makeshlib: conf-ld conf-lib LIBVERSION Makefile
>++makeshlib: conf-home conf-ld conf-lib LIBVERSION Makefile
>+ 	( if libtool --tag=CC --help >/dev/null 2>&1; then tag='--tag=CC'; fi; \
>+ 	  echo '#!/bin/sh'; \
>+ 	  echo 'lib="$$1"; shift';\
>+ 	  echo 'rm -f "$$lib"';\
>+-	  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+"$$@"}';\
>++	  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+"$$@"}';\
>+ 	) >makeshlib
>+ 	chmod 755 makeshlib
>+ 
>Index: pkg-descr
>===================================================================
>--- pkg-descr	(revision 365529)
>+++ pkg-descr	(working copy)
>@@ -8,4 +8,4 @@
> - A set of libraries for module writers
> 
> Author:	Bruce Guenter <bruceg@em.ca>
>-WWW:	http://untroubled.org/cvm/
>+WWW: http://untroubled.org/cvm/
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 365529)
>+++ pkg-plist	(working copy)
>@@ -26,39 +26,30 @@
> lib/libcvm-client.la
> lib/libcvm-client.so
> lib/libcvm-command.a
>-lib/libcvm-command.la
> lib/libcvm-command.so
> lib/libcvm-command.so.2
> lib/libcvm-local.a
>-lib/libcvm-local.la
> lib/libcvm-local.so
> lib/libcvm-local.so.2
> lib/libcvm-module.a
>-lib/libcvm-module.la
> lib/libcvm-module.so
> lib/libcvm-module.so.2
> lib/libcvm-qmail.a
>-lib/libcvm-qmail.la
> lib/libcvm-qmail.so
> lib/libcvm-qmail.so.2
> lib/libcvm-sasl.a
>-lib/libcvm-sasl.la
> lib/libcvm-sasl.so
> lib/libcvm-sasl.so.2
> lib/libcvm-sql.a
>-lib/libcvm-sql.la
> lib/libcvm-sql.so
> lib/libcvm-sql.so.2
> lib/libcvm-udp.a
>-lib/libcvm-udp.la
> lib/libcvm-udp.so
> lib/libcvm-udp.so.2
> lib/libcvm-v1client.a
>-lib/libcvm-v1client.la
> lib/libcvm-v1client.so
> lib/libcvm-v1client.so.2
> lib/libcvm-v2client.a
>-lib/libcvm-v2client.la
> lib/libcvm-v2client.so
> lib/libcvm-v2client.so.2
> %%PORTDOCS%%%%DOCSDIR%%/NEWS

Actions: View | Diff

Attachments on bug 192875: 146103