fix dependencies and indentation

8 files changed, 94 insertions, 62 deletions

diff --git a/package/Config.in b/package/Config.in
index 98b30b967..346672c77 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -44,7 +44,8 @@ endmenu
 
 menu "Cryptography"
 source "package/cryptsetup/Config.in"
-source "package/gpg/Config.in"
+source "package/gnupg/Config.in"
+source "package/gnutls/Config.in"
 source "package/heimdal/Config.in"
 source "package/krb5/Config.in"
 source "package/openct/Config.in"
@@ -70,6 +71,7 @@ source "package/e2fsprogs/Config.in"
 source "package/fuse/Config.in"
 source "package/mdadm/Config.in"
 source "package/mtd/Config.in"
+source "package/nand/Config.in"
 source "package/lvm/Config.in"
 source "package/parted/Config.in"
 source "package/util-linux-ng/Config.in"
@@ -273,6 +275,7 @@ source "package/fontconfig/Config.in"
 source "package/gettext/Config.in"
 source "package/glib/Config.in"
 source "package/gtk+/Config.in"
+source "package/heimdal/Config.in.lib"
 source "package/id3lib/Config.in"
 source "package/libao/Config.in"
 source "package/libao/Config.in.lib"
@@ -314,7 +317,6 @@ source "package/libgssglue/Config.in"
 source "package/libgssglue/Config.in.lib"
 source "package/gmp/Config.in" 
 source "package/gmp/Config.in.lib" 
-source "package/gnutls/Config.in"
 source "package/gnutls/Config.in.lib"
 source "package/libgpg-error/Config.in"
 source "package/libgpg-error/Config.in.lib"
@@ -326,13 +328,13 @@ source "package/libid3tag/Config.in"
 source "package/libid3tag/Config.in.lib"
 source "package/jpeg/Config.in"
 source "package/jpeg/Config.in.lib"
+source "package/krb5/Config.in.lib"
 source "package/lame/Config.in.lib"
 source "package/mpfr/Config.in"
 source "package/mysql/Config.in"
 source "package/mysql/Config.in.lib"
 source "package/nspr/Config.in"
 source "package/nss/Config.in"
-source "package/libtool/Config.in" 
 source "package/libtool/Config.in.lib" 
 source "package/openldap/Config.in.lib"
 source "package/liblzo/Config.in"
@@ -359,6 +361,7 @@ source "package/libogg/Config.in.lib"
 source "package/libol/Config.in"
 source "package/libol/Config.in.lib"
 source "package/opencdk/Config.in"  
+source "package/opencdk/Config.in.lib"  
 source "package/obexftp/Config.in.lib"
 source "package/openobex/Config.in"
 source "package/libosip2/Config.in"
@@ -516,6 +519,7 @@ source "package/gcc/Config.in"
 source "package/gperf/Config.in"
 source "package/haserl/Config.in"
 source "package/jamvm/Config.in"
+source "package/libtool/Config.in"
 source "package/lua/Config.in"
 source "package/m4/Config.in"
 source "package/make/Config.in"
diff --git a/package/avahi/Makefile b/package/avahi/Makefile
index a85b4dcd1..231a97367 100644
--- a/package/avahi/Makefile
+++ b/package/avahi/Makefile
@@ -6,26 +6,25 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		avahi
 PKG_VERSION:=		0.6.25
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		libdaemon expat gdbm glib
 PKG_MD5SUM:=		a83155a6e29e3988f07e5eea3287b21e
 PKG_DESCR:=		mDNS/DNS-SD (aka RendezVous/Bonjour/ZeroConf) daemon
 PKG_SECTION:=		net
-PKG_DEPENDS:=		libavahi libdaemon libexpat
+PKG_DEPENDS:=		libavahi libdaemon libexpat gettext
+PKG_BUILDDEP+=		libdaemon expat gdbm glib gettext
 PKG_URL:=		http://avahi.org
 PKG_SITES:=		http://avahi.org/download/
 
-PKG_DEPENDS_1:=		libavahi libdaemon avahi-daemon
-PKG_DESCR_1:=		Unicast DNS server from mDNS/DNS-SD configuration daemon
-PKG_DESCR_2:=		DNS-SD over mDNS (aka RendezVous/Bonjour/ZeroConf) library
-PKG_SECTION_2:=		libs
+PKG_DEPENDS_DNSCONFD:=	libavahi libdaemon avahi-daemon
+PKG_DESCR_DNSCONFD:=	Unicast DNS server from mDNS/DNS-SD configuration daemon
+PKG_DESCR_LIB:=		DNS-SD over mDNS library
 
 include ${TOPDIR}/mk/package.mk
 
-TLDFLAGS+=		-lintl
 $(eval $(call PKG_template,AVAHI_DAEMON,avahi-daemon,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,AVAHI_DNSCONFD,avahi-dnsconfd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBAVAHI,libavahi,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_2},${PKG_SECTION_2}))
+$(eval $(call PKG_template,AVAHI_DNSCONFD,avahi-dnsconfd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_DNSCONFD},${PKG_DESCR_DNSCONFD},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBAVAHI,libavahi,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_LIB},libs))
 
+TLDFLAGS+=		-lintl
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--enable-glib \
 			--disable-qt3 \
@@ -58,23 +57,28 @@ INSTALL_STYLE=		auto
 post-install:
 	# avahi daemon
 	${INSTALL_DIR} ${IDIR_AVAHI_DAEMON}/etc/avahi
-	${INSTALL_DATA} ./files/avahi-daemon.conf ${IDIR_AVAHI_DAEMON}/etc/avahi/
+	${INSTALL_DATA} ./files/avahi-daemon.conf \
+		${IDIR_AVAHI_DAEMON}/etc/avahi/
 	${INSTALL_DIR} ${IDIR_AVAHI_DAEMON}/etc/avahi/services
 	${INSTALL_DATA} ./files/service-http \
 		${IDIR_AVAHI_DAEMON}/etc/avahi/services/http.service
 	${INSTALL_DATA} ./files/service-ssh \
 		${IDIR_AVAHI_DAEMON}/etc/avahi/services/ssh.service
 	${INSTALL_DIR} ${IDIR_AVAHI_DAEMON}/usr/sbin
-	${CP} ${WRKINST}/usr/sbin/avahi-daemon ${IDIR_AVAHI_DAEMON}/usr/sbin/
+	${CP} ${WRKINST}/usr/sbin/avahi-daemon \
+		${IDIR_AVAHI_DAEMON}/usr/sbin/
 	# avahi dnsconfd
 	${INSTALL_DIR} ${IDIR_AVAHI_DNSCONFD}/etc/avahi
 	${CP} ${WRKINST}/etc/avahi/avahi-dnsconfd.action \
 		${IDIR_AVAHI_DNSCONFD}/etc/avahi/
 	${INSTALL_DIR} ${IDIR_AVAHI_DNSCONFD}/usr/sbin
-	${CP} ${WRKINST}/usr/sbin/avahi-dnsconfd ${IDIR_AVAHI_DNSCONFD}/usr/sbin/
+	${CP} ${WRKINST}/usr/sbin/avahi-dnsconfd \
+		${IDIR_AVAHI_DNSCONFD}/usr/sbin/
 	# libavahi
 	${INSTALL_DIR} ${IDIR_LIBAVAHI}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libavahi-common.so.* ${IDIR_LIBAVAHI}/usr/lib/
-	${CP} ${WRKINST}/usr/lib/libavahi-core.so.* ${IDIR_LIBAVAHI}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libavahi-common.so* \
+		${IDIR_LIBAVAHI}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libavahi-core.so* \
+		${IDIR_LIBAVAHI}/usr/lib/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/gettext/Makefile b/package/gettext/Makefile
index 248eea1ea..0a06b3f32 100644
--- a/package/gettext/Makefile
+++ b/package/gettext/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME=		gettext
 PKG_VERSION=		0.16.1
 PKG_RELEASE=		1
-PKG_BUILDDEP+=		libiconv libpthread
 PKG_MD5SUM=		3d9ad24301c6d6b17ec30704a13fe127
 PKG_DESCR:=		internationalisation library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libiconv libpthread
+PKG_BUILDDEP+=		libiconv libpthread
 PKG_URL:=		http://www.gnu.org/software/gettext/
 PKG_SITES:=		${MASTER_SITE_GNU:=gettext/}
 ifeq ($(ADK_STATIC),y)
@@ -42,6 +42,6 @@ INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_GETTEXT}/usr/lib
-	${CP} ${WRKINST}/usr/lib/*.so.* ${IDIR_GETTEXT}/usr/lib
+	${CP} ${WRKINST}/usr/lib/*.so* ${IDIR_GETTEXT}/usr/lib
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile
index 0d9a58a14..603e67cc9 100644
--- a/package/gnutls/Makefile
+++ b/package/gnutls/Makefile
@@ -16,10 +16,13 @@ PKG_SITES:=		${MASTER_SITE_GNU:=gnutls/}
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
+PKG_DESCR_GNUTLS_UTILS:=	GNU TLS utilities
+PKG_DEPENDS_GNUTLS_UTILS:=	libgnutls libgnutls-extra
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBGNUTLS,libgnutls,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,GNUTLS_UTILS,gnutls-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,GNUTLS_UTILS,gnutls-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_GNUTLS_UTILS},${PKG_DESCR_GNUTLS_UTILS},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBGNUTLS_EXTRA,libgnutls-extra,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBGNUTLS_OPENSSL,libgnutls-openssl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
@@ -33,11 +36,13 @@ INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBGNUTLS}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libgnutls.so.* ${IDIR_LIBGNUTLS}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libgnutls.so* ${IDIR_LIBGNUTLS}/usr/lib
 	${INSTALL_DIR} ${IDIR_LIBGNUTLS_EXTRA}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libgnutls-extra.so.* ${IDIR_LIBGNUTLS_EXTRA}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libgnutls-extra.so* \
+		${IDIR_LIBGNUTLS_EXTRA}/usr/lib
 	${INSTALL_DIR} ${IDIR_LIBGNUTLS_OPENSSL}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libgnutls-openssl.so.* ${IDIR_LIBGNUTLS_OPENSSL}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libgnutls-openssl.so* \
+		${IDIR_LIBGNUTLS_OPENSSL}/usr/lib
 	${INSTALL_DIR} ${IDIR_GNUTLS_UTILS}/usr/bin
 	${CP} ${WRKINST}/usr/bin/{{cert,srp,psk}tool,gnutls-{cli,serv}} \
 	    ${IDIR_GNUTLS_UTILS}/usr/bin
diff --git a/package/heimdal/Makefile b/package/heimdal/Makefile
index f9228dae1..b7ac0e376 100644
--- a/package/heimdal/Makefile
+++ b/package/heimdal/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		6e5028077e2a6b101a4a72801ba71b9e
 PKG_DESCR:=		Kerberos 5 server
 PKG_SECTION:=		net
-PKG_DEPENDS:=		heimdal-libs heimdal-client-libs libncurses libcom-err
+PKG_DEPENDS:=		libheimdal libheimdal-client libncurses libcom-err
 PKG_BUILDDEP+=		openssl ncurses e2fsprogs
 ifeq (${ADK_COMPILE_HEIMDAL_WITH_DB_BDB},y)
 PKG_BUILDDEP+=		libdb
@@ -40,8 +40,8 @@ PKG_DEPENDS+=		libopenldap
 endif
 
 $(eval $(call PKG_template,HEIMDAL_SERVER,heimdal-server,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,HEIMDAL_LIBS,heimdal-libs,$(PKG_VERSION)-${PKG_RELEASE},,${PKG_DESCR_1},${PKG_SECTION_1}))
-$(eval $(call PKG_template,HEIMDAL_CLIENT_LIBS,heimdal-client-libs,$(PKG_VERSION)-${PKG_RELEASE},,${PKG_DESCR_2},${PKG_SECTION_2}))
+$(eval $(call PKG_template,LIBHEIMDAL,libheimdal,$(PKG_VERSION)-${PKG_RELEASE},,${PKG_DESCR_1},${PKG_SECTION_1}))
+$(eval $(call PKG_template,LIBHEIMDAL_CLIENT,libheimdal-client,$(PKG_VERSION)-${PKG_RELEASE},,${PKG_DESCR_2},${PKG_SECTION_2}))
 
 CONFIGURE_OPTS:=	--with-hdbdir=/etc/heimdal \
 			--disable-otp \
@@ -107,34 +107,53 @@ endif
 	${INSTALL_DIR} ${IDIR_HEIMDAL_SERVER}/etc/heimdal
 	${INSTALL_DIR} ${IDIR_HEIMDAL_SERVER}/usr/sbin
 	${INSTALL_DIR} ${IDIR_HEIMDAL_SERVER}/usr/lib/heimdal
-	${CP} ${WRKINST}/usr/lib/heimdal/libkdc.so* ${IDIR_HEIMDAL_SERVER}/usr/lib/heimdal
-	${CP} ${WRKINST}/usr/lib/heimdal/libkadm5srv.so* ${IDIR_HEIMDAL_SERVER}/usr/lib/heimdal
-	${CP} ${WRKINST}/usr/lib/heimdal/libhdb.so* ${IDIR_HEIMDAL_SERVER}/usr/lib/heimdal
-	${INSTALL_DATA} ./files/krb5.conf ${IDIR_HEIMDAL_SERVER}/etc/heimdal
-	${INSTALL_DATA} ./files/kdc.conf ${IDIR_HEIMDAL_SERVER}/etc/heimdal
-	${INSTALL_DATA} ./files/kadmind.acl ${IDIR_HEIMDAL_SERVER}/etc/heimdal
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/kdc ${IDIR_HEIMDAL_SERVER}/usr/sbin/
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/kadmind ${IDIR_HEIMDAL_SERVER}/usr/sbin/
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/kpasswdd ${IDIR_HEIMDAL_SERVER}/usr/sbin/
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/kstash ${IDIR_HEIMDAL_SERVER}/usr/sbin/
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/ktutil ${IDIR_HEIMDAL_SERVER}/usr/sbin/
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/kadmin ${IDIR_HEIMDAL_SERVER}/usr/sbin/
+	${CP} ${WRKINST}/usr/lib/heimdal/libkdc.so* \
+		${IDIR_HEIMDAL_SERVER}/usr/lib/heimdal
+	${CP} ${WRKINST}/usr/lib/heimdal/libkadm5srv.so* \
+		${IDIR_HEIMDAL_SERVER}/usr/lib/heimdal
+	${CP} ${WRKINST}/usr/lib/heimdal/libhdb.so* \
+		${IDIR_HEIMDAL_SERVER}/usr/lib/heimdal
+	${INSTALL_DATA} ./files/{krb5.conf,kdc.conf,kadmind.acl} \
+		${IDIR_HEIMDAL_SERVER}/etc/heimdal
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/kdc \
+		${IDIR_HEIMDAL_SERVER}/usr/sbin/
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/kadmind \
+		${IDIR_HEIMDAL_SERVER}/usr/sbin/
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/kpasswdd \
+		${IDIR_HEIMDAL_SERVER}/usr/sbin/
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/kstash \
+		${IDIR_HEIMDAL_SERVER}/usr/sbin/
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/ktutil \
+		${IDIR_HEIMDAL_SERVER}/usr/sbin/
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/kadmin \
+		${IDIR_HEIMDAL_SERVER}/usr/sbin/
 	# heimdal libs
-	${INSTALL_DIR} ${IDIR_HEIMDAL_LIBS}/usr/lib/heimdal
+	${INSTALL_DIR} ${IDIR_LIBHEIMDAL}/usr/lib/heimdal
 ifeq ($(ADK_COMPILE_HEIMDAL_WITH_PKINIT),y)
-	${CP} ${WRKINST}/usr/lib/heimdal/libhx509.so* ${IDIR_HEIMDAL_LIBS}/usr/lib/heimdal
+	${CP} ${WRKINST}/usr/lib/heimdal/libhx509.so* \
+		${IDIR_LIBHEIMDAL}/usr/lib/heimdal
 endif
-	${CP} ${WRKINST}/usr/lib/heimdal/libheimntlm.so* ${IDIR_HEIMDAL_LIBS}/usr/lib/heimdal
-	${CP} ${WRKINST}/usr/lib/heimdal/libwind.so* ${IDIR_HEIMDAL_LIBS}/usr/lib/heimdal
-	${CP} ${WRKINST}/usr/lib/heimdal/libgssapi.so* ${IDIR_HEIMDAL_LIBS}/usr/lib/heimdal
-	${CP} ${WRKINST}/usr/lib/heimdal/libkafs.so* ${IDIR_HEIMDAL_LIBS}/usr/lib/heimdal
-	${CP} ${WRKINST}/usr/lib/heimdal/libkrb5.so* ${IDIR_HEIMDAL_LIBS}/usr/lib/heimdal
-	${CP} ${WRKINST}/usr/lib/heimdal/libasn1.so* ${IDIR_HEIMDAL_LIBS}/usr/lib/heimdal
-	${CP} ${WRKINST}/usr/lib/heimdal/libroken.so* ${IDIR_HEIMDAL_LIBS}/usr/lib/heimdal
+	${CP} ${WRKINST}/usr/lib/heimdal/libheimntlm.so* \
+		${IDIR_LIBHEIMDAL}/usr/lib/heimdal
+	${CP} ${WRKINST}/usr/lib/heimdal/libwind.so* \
+		${IDIR_LIBHEIMDAL}/usr/lib/heimdal
+	${CP} ${WRKINST}/usr/lib/heimdal/libgssapi.so* \
+		${IDIR_LIBHEIMDAL}/usr/lib/heimdal
+	${CP} ${WRKINST}/usr/lib/heimdal/libkafs.so* \
+		${IDIR_LIBHEIMDAL}/usr/lib/heimdal
+	${CP} ${WRKINST}/usr/lib/heimdal/libkrb5.so* \
+		${IDIR_LIBHEIMDAL}/usr/lib/heimdal
+	${CP} ${WRKINST}/usr/lib/heimdal/libasn1.so* \
+		${IDIR_LIBHEIMDAL}/usr/lib/heimdal
+	${CP} ${WRKINST}/usr/lib/heimdal/libroken.so* \
+		${IDIR_LIBHEIMDAL}/usr/lib/heimdal
 	# heimdal client libs
-	${INSTALL_DIR} ${IDIR_HEIMDAL_CLIENT_LIBS}/usr/lib/heimdal
-	${CP} ${WRKINST}/usr/lib/heimdal/libeditline.so* ${IDIR_HEIMDAL_CLIENT_LIBS}/usr/lib/heimdal
-	${CP} ${WRKINST}/usr/lib/heimdal/libsl.so* ${IDIR_HEIMDAL_CLIENT_LIBS}/usr/lib/heimdal
-	${CP} ${WRKINST}/usr/lib/heimdal/libkadm5clnt.so* ${IDIR_HEIMDAL_CLIENT_LIBS}/usr/lib/heimdal
+	${INSTALL_DIR} ${IDIR_LIBHEIMDAL_CLIENT}/usr/lib/heimdal
+	${CP} ${WRKINST}/usr/lib/heimdal/libeditline.so* \
+		${IDIR_LIBHEIMDAL_CLIENT}/usr/lib/heimdal
+	${CP} ${WRKINST}/usr/lib/heimdal/libsl.so* \
+		${IDIR_LIBHEIMDAL_CLIENT}/usr/lib/heimdal
+	${CP} ${WRKINST}/usr/lib/heimdal/libkadm5clnt.so* \
+		${IDIR_LIBHEIMDAL_CLIENT}/usr/lib/heimdal
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/krb5/Makefile b/package/krb5/Makefile
index 089197773..6f1c72a18 100644
--- a/package/krb5/Makefile
+++ b/package/krb5/Makefile
@@ -5,11 +5,11 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		krb5
 PKG_VERSION:=		1.7
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		9f7b3402b4731a7fa543db193bf1b564
 PKG_DESCR:=		MIT kerberos server
 PKG_SECTION:=		net
-PKG_DEPENDS:=		krb5-libs libncurses libss libcom-err
+PKG_DEPENDS:=		libkrb5 libncurses libss libcom-err
 PKG_BUILDDEP+=		ncurses e2fsprogs
 PKG_URL:=		http://web.mit.edu/kerberos
 PKG_SITES:=		http://web.mit.edu/kerberos/dist/krb5/1.7/
@@ -23,7 +23,7 @@ WRKSRC=			${WRKDIST}/src
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,KRB5_SERVER,krb5-server,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,KRB5_LIBS,krb5-libs,$(PKG_VERSION)-${PKG_RELEASE},,${PKG_DESCR_LIB},${PKG_SECTION_LIB}))
+$(eval $(call PKG_template,LIBKRB5,libkrb5,$(PKG_VERSION)-${PKG_RELEASE},,${PKG_DESCR_LIB},${PKG_SECTION_LIB}))
 
 TCFLAGS+=		-I${STAGING_DIR}/usr/include/et
 CONFIGURE_STYLE:=	gnu
@@ -59,11 +59,11 @@ post-install:
 	${CP} ${WRKINST}/usr/lib/lib{gssrpc,kadm5clnt,kadm5srv,kdb5}.so* \
 		${IDIR_KRB5_SERVER}/usr/lib
 	# krb5-libs
-	${INSTALL_DIR} ${IDIR_KRB5_LIBS}/etc
-	${INSTALL_DIR} ${IDIR_KRB5_LIBS}/usr/lib
-	${INSTALL_DATA} ./files/krb5.conf ${IDIR_KRB5_LIBS}/etc
+	${INSTALL_DIR} ${IDIR_LIBKRB5}/etc
+	${INSTALL_DIR} ${IDIR_LIBKRB5}/usr/lib
+	${INSTALL_DATA} ./files/krb5.conf ${IDIR_LIBKRB5}/etc
 	${CP} ${WRKINST}/usr/lib/lib{gssapi_krb5,k5crypto,krb5,krb5support}.so* \
-		${IDIR_KRB5_LIBS}/usr/lib
-	echo '/usr/lib/libgssapi_krb5.so		mechglue_internal_krb5_init' > ${IDIR_KRB5_LIBS}/etc/gssapi_mech.conf
+		${IDIR_LIBKRB5}/usr/lib
+	echo '/usr/lib/libgssapi_krb5.so		mechglue_internal_krb5_init' > ${IDIR_LIBKRB5}/etc/gssapi_mech.conf
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile
index bb36d9a2b..7bdc87085 100644
--- a/package/nfs-utils/Makefile
+++ b/package/nfs-utils/Makefile
@@ -12,7 +12,7 @@ PKG_SECTION:=		net
 PKG_DEPENDS:=		kmod-nfsd
 
 ifeq (${ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS},y)
-PKG_DEPENDS+=		krb5-libs libevent libnfsidmap librpcsecgss libcom-err libgssglue
+PKG_DEPENDS+=		libkrb5 libevent libnfsidmap librpcsecgss libcom-err libgssglue
 PKG_BUILDDEP+=		libnfsidmap krb5 libevent libgssglue librpcsecgss
 endif
 
diff --git a/package/openssh/Makefile b/package/openssh/Makefile
index 3b724edbc..29fd6a055 100644
--- a/package/openssh/Makefile
+++ b/package/openssh/Makefile
@@ -12,11 +12,11 @@ PKG_SECTION:=		net
 PKG_DEPENDS:=		zlib libopenssl
 PKG_BUILDDEP+=		zlib openssl
 ifeq (${ADK_COMPILE_OPENSSH_WITH_KRB5},y)
-PKG_DEPENDS+=		krb5-libs libcom-err
+PKG_DEPENDS+=		libkrb5 libcom-err
 PKG_BUILDDEP+=		krb5
 endif
 ifeq (${ADK_COMPILE_OPENSSH_WITH_HEIMDAL},y)
-PKG_DEPENDS+=		heimdal-libs libcom-err
+PKG_DEPENDS+=		libheimdal libcom-err
 PKG_BUILDDEP+=		heimdal
 endif
 PKG_URL:=		http://www.openssh.com