summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortijl <tijl@FreeBSD.org>2014-09-08 12:21:50 +0000
committertijl <tijl@FreeBSD.org>2014-09-08 12:21:50 +0000
commitb237633954a5b34e3a674abb2c99a6118a4a7e3d (patch)
tree803a4932e602b5f2150c88cf45073277957eb07c
parent335dab7e992eaea4c8a117554074bfabe01ab5e9 (diff)
downloadFreeBSD-ports-b237633954a5b34e3a674abb2c99a6118a4a7e3d.zip
FreeBSD-ports-b237633954a5b34e3a674abb2c99a6118a4a7e3d.tar.gz
Let USES=libtool also delete links to .la files (and links to links to...)
Approved by: portmgr (antoine)
-rw-r--r--Mk/Uses/libtool.mk4
-rw-r--r--lang/mono/Makefile2
-rw-r--r--lang/mono/pkg-plist1
-rw-r--r--security/cvm/Makefile3
-rw-r--r--security/cvm/pkg-plist1
5 files changed, 6 insertions, 5 deletions
diff --git a/Mk/Uses/libtool.mk b/Mk/Uses/libtool.mk
index 40eac47..cb5fdbf 100644
--- a/Mk/Uses/libtool.mk
+++ b/Mk/Uses/libtool.mk
@@ -76,6 +76,10 @@ patch-lafiles:
@${FIND} ${STAGEDIR} -type f -name '*.la' | \
${XARGS} ${SED} -i '' -e "/dependency_libs=/s/=.*/=''/"
.else
+ @${FIND} ${STAGEDIR} -type l -exec ${SH} -c \
+ 'case `${READLINK_CMD} -f "{}"` in \
+ *.la) ${ECHO_CMD} "{}" ;; esac' \; | \
+ ${XARGS} ${GREP} -l 'libtool library' | ${XARGS} ${RM}
@${FIND} ${STAGEDIR} -type f -name '*.la' | \
${XARGS} ${GREP} -l 'libtool library' | ${XARGS} ${RM}
.endif
diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index 0c21464..2f81b69 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mono
PORTVERSION= 3.4.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= lang
MASTER_SITES= http://download.mono-project.com/sources/${PORTNAME}/
diff --git a/lang/mono/pkg-plist b/lang/mono/pkg-plist
index fcd9f27..2e52ecf 100644
--- a/lang/mono/pkg-plist
+++ b/lang/mono/pkg-plist
@@ -139,7 +139,6 @@ lib/libMonoSupportW.so
lib/libikvm-native.a
lib/libikvm-native.so
lib/libmono-2.0.a
-lib/libmono-2.0.la
lib/libmono-2.0.so
lib/libmono-2.0.so.1
lib/libmono-2.0.so.1.0.0
diff --git a/security/cvm/Makefile b/security/cvm/Makefile
index db3879c..614fe9e 100644
--- a/security/cvm/Makefile
+++ b/security/cvm/Makefile
@@ -3,7 +3,7 @@
PORTNAME= cvm
PORTVERSION= 0.96
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security
MASTER_SITES= http://untroubled.org/${PORTNAME}/ \
http://untroubled.org/${PORTNAME}/archive/
@@ -21,7 +21,6 @@ USES= libtool:build
USE_LDCONFIG= yes
BGLIBS_INC= ${LOCALBASE}/include/bglibs
BGLIBS_LIB= ${LOCALBASE}/lib/bglibs
-ALL_TARGET= all
DOCS= NEWS README TODO *.html
diff --git a/security/cvm/pkg-plist b/security/cvm/pkg-plist
index 730747c..598ce4c 100644
--- a/security/cvm/pkg-plist
+++ b/security/cvm/pkg-plist
@@ -23,7 +23,6 @@ include/cvm/sasl.h
include/cvm/v1client.h
include/cvm/v2client.h
lib/libcvm-client.a
-lib/libcvm-client.la
lib/libcvm-client.so
lib/libcvm-command.a
lib/libcvm-command.so
OpenPOWER on IntegriCloud