From owner-svn-ports-all@FreeBSD.ORG Fri Sep 12 15:04:28 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 54DB372E; Fri, 12 Sep 2014 15:04:28 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3F8E3C38; Fri, 12 Sep 2014 15:04:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8CF4SL1088142; Fri, 12 Sep 2014 15:04:28 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8CF4Rjl088139; Fri, 12 Sep 2014 15:04:27 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201409121504.s8CF4Rjl088139@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Fri, 12 Sep 2014 15:04:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r368029 - in head/security/krb5-maint: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Sep 2014 15:04:28 -0000 Author: tijl Date: Fri Sep 12 15:04:27 2014 New Revision: 368029 URL: http://svnweb.freebsd.org/changeset/ports/368029 QAT: https://qat.redports.org/buildarchive/r368029/ Log: Adjust patch to avoid libtool. It is more similar to Linux now. Modified: head/security/krb5-maint/Makefile head/security/krb5-maint/files/patch-config__shlib.conf head/security/krb5-maint/pkg-plist Modified: head/security/krb5-maint/Makefile ============================================================================== --- head/security/krb5-maint/Makefile Fri Sep 12 14:59:23 2014 (r368028) +++ head/security/krb5-maint/Makefile Fri Sep 12 15:04:27 2014 (r368029) @@ -3,7 +3,7 @@ PORTNAME= krb5-maint PORTVERSION= 1.11.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MASTER_SITES= http://web.mit.edu/kerberos/dist/krb5/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/ DISTNAME= krb5-${PORTVERSION}-signed @@ -21,14 +21,13 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 CONFLICTS= heimdal-[0-9]* srp-[0-9]* krb5-[0-9]* -LATEST_LINK= ${PORTNAME}-19 KERBEROSV_URL= http://web.mit.edu/kerberos/ +USES= gettext gmake perl5 USE_PERL5= build USE_LDCONFIG= yes USE_CSTD= gnu99 -USE_AUTOTOOLS= libtool -USES= gettext gmake perl5 -CONFIGURE_ARGS?= --enable-shared --without-system-verto +GNU_CONFIGURE= yes +CONFIGURE_ARGS?= --without-system-verto CONFIGURE_ENV= INSTALL="${INSTALL}" YACC="${YACC}" MAKE_ARGS= INSTALL="${INSTALL}" Modified: head/security/krb5-maint/files/patch-config__shlib.conf ============================================================================== --- head/security/krb5-maint/files/patch-config__shlib.conf Fri Sep 12 14:59:23 2014 (r368028) +++ head/security/krb5-maint/files/patch-config__shlib.conf Fri Sep 12 15:04:27 2014 (r368029) @@ -1,6 +1,6 @@ --- config/shlib.conf.orig 2012-08-08 15:27:55.000000000 -0700 +++ config/shlib.conf 2012-11-02 17:49:31.140500618 -0700 -@@ -306,24 +306,18 @@ +@@ -306,24 +306,19 @@ ;; *-*-freebsd*) @@ -11,13 +11,12 @@ - fi - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then +- SHLIBVEXT='.so.$(LIBMAJOR)' + case $krb5_cv_host in + sparc64-*) PICFLAGS=-fPIC;; + *) PICFLAGS=-fpic;; + esac + - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE="libtool --mode=link cc -Xcompiler -shared" RPATH_FLAG='-Wl,-rpath -Wl,' - else - RPATH_FLAG=-R @@ -26,8 +25,12 @@ PROG_RPATH_FLAGS='$(RPATH_FLAG)$(PROG_RPATH)' CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)' CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CXXFLAGS) $(LDFLAGS)' ++ SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' ++ SHLIBSEXT='.so.$(LIBMAJOR)' SHLIBEXT=.so - LDCOMBINE='ld -Bshareable' - SHLIB_RPATH_FLAGS='-R$(SHLIB_RDIRS)' +- SHLIB_RPATH_FLAGS='-R$(SHLIB_RDIRS)' ++ LDCOMBINE='$(CC) -shared -Wl,-soname=$(LIBPREFIX)$(LIBBASE)$(SHLIBSEXT) -Wl,--no-undefined' ++ SHLIB_RPATH_FLAGS='$(RPATH_FLAG)$(SHLIB_RDIRS)' SHLIB_EXPFLAGS='$(SHLIB_RPATH_FLAGS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)' Modified: head/security/krb5-maint/pkg-plist ============================================================================== --- head/security/krb5-maint/pkg-plist Fri Sep 12 14:59:23 2014 (r368028) +++ head/security/krb5-maint/pkg-plist Fri Sep 12 15:04:27 2014 (r368029) @@ -60,31 +60,42 @@ include/verto-module.h include/verto.h lib/libcom_err.so lib/libcom_err.so.3 +lib/libcom_err.so.3.0 lib/libgssapi_krb5.so lib/libgssapi_krb5.so.2 +lib/libgssapi_krb5.so.2.2 lib/libgssrpc.so lib/libgssrpc.so.4 +lib/libgssrpc.so.4.1 lib/libk5crypto.so lib/libk5crypto.so.3 +lib/libk5crypto.so.3.1 lib/libkadm5clnt.so lib/libkadm5clnt_mit.so lib/libkadm5clnt_mit.so.8 +lib/libkadm5clnt_mit.so.8.0 lib/libkadm5srv.so lib/libkadm5srv_mit.so lib/libkadm5srv_mit.so.8 +lib/libkadm5srv_mit.so.8.0 lib/libkdb5.so lib/libkdb5.so.7 +lib/libkdb5.so.7.0 lib/libkrb5.so lib/libkrb5.so.3 +lib/libkrb5.so.3.3 lib/libkrb5support.so lib/libkrb5support.so.0 +lib/libkrb5support.so.0.1 lib/krb5/plugins/kdb/db2.so %%LDAP%%lib/krb5/plugins/kdb/kldap.so lib/krb5/plugins/preauth/pkinit.so %%LDAP%%lib/libkdb_ldap.so %%LDAP%%lib/libkdb_ldap.so.1 -lib/libverto.so.0 +%%LDAP%%lib/libkdb_ldap.so.1.0 lib/libverto.so +lib/libverto.so.0 +lib/libverto.so.0.0 man/man1/k5srvutil.1.gz man/man1/kadmin.1.gz man/man1/krb5-config.1.gz