summaryrefslogtreecommitdiff
path: root/ftp
diff options
context:
space:
mode:
authorTijl Coosemans <tijl@FreeBSD.org>2014-12-08 16:48:38 +0000
committerTijl Coosemans <tijl@FreeBSD.org>2014-12-08 16:48:38 +0000
commit60945f027780c21c987e0c642404a8383407edad (patch)
treefd2d9471767ad6e92fff12ef08f1cb015017f9f8 /ftp
parent- Remove unnecessary BUILD_DEPENDS (diff)
Replace USES=libtool:oldver with USES=libtool or USES=libtool:keepla in
the 32 ports that still use it. Bump PORTREVISION on their dependent ports except the ones that depend on these: audio/libogg audio/libvorbis devel/pcre ftp/curl graphics/jpeg graphics/libart_lgpl graphics/tiff textproc/expat2 textproc/libxslt In these cases the same trick as in the recent gettext update is used. The ports install a symlink with the old library version. When enough of their dependent ports have had regular updates the remaining ones can get a PORTREVISION bump and the links can be removed. Also remove the devel/pcre dependency from USE_GNOME=glib20. It causes over 2200 packages to depend on devel/pcre while less than 200 actually link with it. The glib20 package still depends on devel/pcre so this should not make a difference for ports with USE_GNOME=glib20. Also, libdata/pkgconfig/glib-2.0.pc lists pcre as a private library so USE_GNOME=glib20 should not propagate it. PR: 195724 Exp-run by: antoine Approved by: portmgr (antoine)
Notes
Notes: svn path=/head/; revision=374303
Diffstat (limited to 'ftp')
-rw-r--r--ftp/curl-hiphop/pkg-plist1
-rw-r--r--ftp/curl/Makefile4
-rw-r--r--ftp/curl/pkg-plist3
3 files changed, 5 insertions, 3 deletions
diff --git a/ftp/curl-hiphop/pkg-plist b/ftp/curl-hiphop/pkg-plist
index 4d30473457b6..07bcea266bdc 100644
--- a/ftp/curl-hiphop/pkg-plist
+++ b/ftp/curl-hiphop/pkg-plist
@@ -8,4 +8,3 @@
%%HIPHOP_DIR%%/ext/include/curl/stdcheaders.h
%%HIPHOP_DIR%%/ext/include/curl/typecheck-gcc.h
%%HIPHOP_DIR%%/ext/lib/libcurl.a
-%%HIPHOP_DIR%%/ext/lib/libcurl.la
diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
index f0e186d7f96a..e992dd8bb1b7 100644
--- a/ftp/curl/Makefile
+++ b/ftp/curl/Makefile
@@ -3,6 +3,7 @@
PORTNAME= curl
PORTVERSION= 7.39.0
+PORTREVISION?= 1
CATEGORIES= ftp www
MASTER_SITES= http://curl.haxx.se/download/ \
LOCAL/sunpoet
@@ -36,7 +37,7 @@ CONFIGURE_ENV+= LOCALBASE=${LOCALBASE}
GNU_CONFIGURE= yes
MAKE_ENV+= INSTALL_STRIP_FLAG=${STRIP}
USE_PERL5= build
-USES= libtool:oldver pathfix perl5 tar:lzma
+USES= libtool pathfix perl5 tar:lzma
.if !defined(BUILDING_HIPHOP)
USE_LDCONFIG= yes
@@ -166,6 +167,7 @@ post-patch:
@${REINPLACE_CMD} -e 's|include <gssapi.h>|include <gssapi/gssapi.h>|' ${WRKSRC}/lib/curl_gssapi.h ${WRKSRC}/lib/urldata.h
post-install:
+ ${LN} -s libcurl.so.4 ${STAGEDIR}${PREFIX}/lib/libcurl.so.7
.if !defined(BUILDING_HIPHOP)
${INSTALL_DATA} ${WRKSRC}/docs/libcurl/libcurl.m4 ${STAGEDIR}${PREFIX}/share/aclocal/
${MKDIR} ${STAGEDIR}${DOCSDIR}/ ${STAGEDIR}${DOCSDIR}/libcurl/
diff --git a/ftp/curl/pkg-plist b/ftp/curl/pkg-plist
index 5f49d0edc855..3121cef9e92a 100644
--- a/ftp/curl/pkg-plist
+++ b/ftp/curl/pkg-plist
@@ -10,8 +10,9 @@ include/curl/multi.h
include/curl/stdcheaders.h
include/curl/typecheck-gcc.h
lib/libcurl.a
-lib/libcurl.la
lib/libcurl.so
+lib/libcurl.so.4
+lib/libcurl.so.4.3.0
lib/libcurl.so.7
libdata/pkgconfig/libcurl.pc
man/man1/curl-config.1.gz