svn commit: r365544 - in head/security/cvm: . files
John Marino
marino at FreeBSD.org
Thu Aug 21 11:02:33 UTC 2014
Author: marino
Date: Thu Aug 21 11:02:31 2014
New Revision: 365544
URL: http://svnweb.freebsd.org/changeset/ports/365544
QAT: https://qat.redports.org/buildarchive/r365544/
Log:
Stage security/cvm and assign maintainership to submitter
PR: 192875
Submitted by: uffe
tweaks by: marino
Modified:
head/security/cvm/Makefile
head/security/cvm/files/patch-Makefile
head/security/cvm/pkg-descr
head/security/cvm/pkg-plist
Modified: head/security/cvm/Makefile
==============================================================================
--- head/security/cvm/Makefile Thu Aug 21 10:43:20 2014 (r365543)
+++ head/security/cvm/Makefile Thu Aug 21 11:02:31 2014 (r365544)
@@ -3,58 +3,57 @@
PORTNAME= cvm
PORTVERSION= 0.96
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= http://untroubled.org/${PORTNAME}/ \
http://untroubled.org/${PORTNAME}/archive/
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER= uffe at 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
+ALL_TARGET= all
DOCS= NEWS README TODO *.html
-OPTIONS_DEFINE= VCHKPW
+OPTIONS_DEFINE= DOCS VCHKPW
+OPTIONS_SUB= yes
VCHKPW_DESC= Compile cvm-vchkpw
-NO_STAGE= yes
-.include <bsd.port.options.mk>
+VCHKPW_BUILD_DEPENDS+= ${LOCALBASE}/vpopmail/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail
-ALL_TARGET=all
+.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MVCHKPW}
-BUILD_DEPENDS+= ${LOCALBASE}/vpopmail/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail
ALL_TARGET+= cvm-vchkpw
-PLIST_SUB= VCHKPW=""
-.else
-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
-.if ${PORT_OPTIONS:MDOCS}
post-install:
- @${MKDIR} ${DOCSDIR}
- cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
+.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}
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
.endif
.include <bsd.port.mk>
Modified: head/security/cvm/files/patch-Makefile
==============================================================================
--- head/security/cvm/files/patch-Makefile Thu Aug 21 10:43:20 2014 (r365543)
+++ head/security/cvm/files/patch-Makefile Thu Aug 21 11:02:31 2014 (r365544)
@@ -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
+
Modified: head/security/cvm/pkg-descr
==============================================================================
--- head/security/cvm/pkg-descr Thu Aug 21 10:43:20 2014 (r365543)
+++ head/security/cvm/pkg-descr Thu Aug 21 11:02:31 2014 (r365544)
@@ -8,4 +8,4 @@ Credential Validation Modules:
- A set of libraries for module writers
Author: Bruce Guenter <bruceg at em.ca>
-WWW: http://untroubled.org/cvm/
+WWW: http://untroubled.org/cvm/
Modified: head/security/cvm/pkg-plist
==============================================================================
--- head/security/cvm/pkg-plist Thu Aug 21 10:43:20 2014 (r365543)
+++ head/security/cvm/pkg-plist Thu Aug 21 11:02:31 2014 (r365544)
@@ -26,39 +26,30 @@ lib/libcvm-client.a
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
More information about the svn-ports-all
mailing list