diff options
| author | Jeremy Messenger <mezz@FreeBSD.org> | 2009-08-02 19:36:34 +0000 |
|---|---|---|
| committer | Jeremy Messenger <mezz@FreeBSD.org> | 2009-08-02 19:36:34 +0000 |
| commit | 789d75c728ef23566a07bf5b9bc2190bf34ff4f1 (patch) | |
| tree | dc7540d42fa2d5d7c1c74515e3bdbf6ab842cd17 /security/krb5-16 | |
| parent | - Mark BROKEN on i386, does not build (diff) | |
-Repocopy devel/libtool15 -> libtool22 and libltdl15 -> libltdl22.
-Update libtool and libltdl to 2.2.6a.
-Remove devel/libtool15 and devel/libltdl15.
-Fix ports build with libtool22/libltdl22.
-Bump ports that depend on libltdl22 due to shared library version change.
-Explain what to do update in the UPDATING.
It has been tested with GNOME2, XFCE4, KDE3, KDE4 and other many wm/desktop
and applications in the runtime.
With help: marcus and kwm
Pointyhat-exp: a few times by pav
Tested by: pgollucci, "Romain Tartière" <romain@blogreen.org>, and
a few MarcusCom CVS users. Also, I might have missed a few.
Repocopy by: marcus
Approved by: portmgr
Notes
Notes:
svn path=/head/; revision=238781
Diffstat (limited to 'security/krb5-16')
| -rw-r--r-- | security/krb5-16/Makefile | 4 | ||||
| -rw-r--r-- | security/krb5-16/files/patch-config::shlib.conf | 13 |
2 files changed, 7 insertions, 10 deletions
diff --git a/security/krb5-16/Makefile b/security/krb5-16/Makefile index 10f8cdaec16f..c132c0249ae9 100644 --- a/security/krb5-16/Makefile +++ b/security/krb5-16/Makefile @@ -7,7 +7,7 @@ PORTNAME= krb5 PORTVERSION= 1.6.3 -PORTREVISION= 6 +PORTREVISION= 6 CATEGORIES= security MASTER_SITES= http://web.mit.edu/kerberos/dist/krb5/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/ PATCH_SITES= http://web.mit.edu/kerberos/advisories/ @@ -30,7 +30,7 @@ WITH_OPENSSL_PORT= yes USE_GMAKE= yes USE_PERL5_BUILD= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +GNU_CONFIGURE= yes CONFIGURE_ARGS?= --enable-shared # CONFIGURE_ARGS+= --disable-thread-support CONFIGURE_ENV= INSTALL="${INSTALL}" YACC=/usr/bin/yacc \ diff --git a/security/krb5-16/files/patch-config::shlib.conf b/security/krb5-16/files/patch-config::shlib.conf index 18f91fffc6d5..5d680b5487ca 100644 --- a/security/krb5-16/files/patch-config::shlib.conf +++ b/security/krb5-16/files/patch-config::shlib.conf @@ -1,6 +1,6 @@ ---- config/shlib.conf.orig Mon Oct 23 05:20:11 2006 -+++ config/shlib.conf Wed Mar 28 17:17:55 2007 -@@ -258,22 +258,15 @@ +--- config/shlib.conf.orig 2009-07-13 14:48:25.000000000 +0200 ++++ config/shlib.conf 2009-07-13 14:49:49.000000000 +0200 +@@ -258,19 +258,13 @@ ;; *-*-freebsd*) @@ -16,15 +16,12 @@ + *) PICFLAGS=-fpic;; + esac SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE="libtool --mode=link cc -shared" RPATH_FLAG='-Wl,-rpath -Wl,' - else - RPATH_FLAG=-R - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - fi ++ CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH) $(CFLAGS) $(LDFLAGS)' SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' + LDCOMBINE='ld -Bshareable' |