svn commit: r380434 - in head/security/heimdal: . files

[Hiroki Sato]

Author: hrs
Date: Wed Mar  4 12:54:02 2015
New Revision: 380434
URL: https://svnweb.freebsd.org/changeset/ports/380434
QAT: https://qat.redports.org/buildarchive/r380434/

Log:
  - Remove an orphaned directory [1].
  - Fix USE_LDCONFIG [2].
  
  Spotted by:	sunpoet [1] and bdrewery [2]

Added:
  head/security/heimdal/files/patch-lib-roken-Makefile.in   (contents, props changed)
Modified:
  head/security/heimdal/Makefile

Modified: head/security/heimdal/Makefile
==============================================================================
--- head/security/heimdal/Makefile	Wed Mar  4 12:48:51 2015	(r380433)
+++ head/security/heimdal/Makefile	Wed Mar  4 12:54:02 2015	(r380434)
@@ -3,7 +3,7 @@
 
 PORTNAME=	heimdal
 PORTVERSION=	1.5.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security ipv6
 MASTER_SITES=	http://www.h5l.org/dist/src/ \
 		http://ftp.pdc.kth.se/pub/heimdal/src/ \
@@ -21,7 +21,7 @@ CONFLICTS=	krb4-[0-9]* krb5-[0-9]* krb5-
 
 USES=		gettext gssapi:bootstrap,heimdal libtool pathfix pkgconfig \
 		readline makeinfo
-USE_LDCONFIG=	yes
+USE_LDCONFIG=	${GSSAPILIBDIR}
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
@@ -30,8 +30,8 @@ CONFIGURE_ENV=	ac_cv_header_fnmatch_h=ye
 CONFIGURE_ARGS=	--with-libintl \
 		--with-libintl-include="${LOCALBASE}/include" \
 		--with-libintl-lib="${LOCALBASE}/lib" \
-		--libdir="${PREFIX}/lib/${PORTNAME}" \
-		--includedir="${PREFIX}/include/${PORTNAME}" \
+		--libdir="${GSSAPILIBDIR}" \
+		--includedir="${GSSAPIINCDIR}" \
 		--with-kcm \
 		--with-openssl \
 		--with-openssl-include="${OPENSSLINC}" \

Added: head/security/heimdal/files/patch-lib-roken-Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/heimdal/files/patch-lib-roken-Makefile.in	Wed Mar  4 12:54:02 2015	(r380434)
@@ -0,0 +1,41 @@
+--- lib/roken/Makefile.in.orig	2012-12-10 07:09:39.000000000 +0900
++++ lib/roken/Makefile.in	2015-03-04 21:35:04.000000000 +0900
+@@ -150,8 +150,7 @@
+   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man3dir)" \
+-	"$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" \
+-	"$(DESTDIR)$(rokenincludedir)"
++	"$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)"
+ LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+ libroken_la_DEPENDENCIES = @LTLIBOBJS@ $(am__DEPENDENCIES_1)
+@@ -305,8 +304,7 @@
+ am__dist_include_HEADERS_DIST = base64.h getarg.h hex.h parse_bytes.h \
+ 	parse_time.h parse_units.h resolve.h roken-common.h rtbl.h \
+ 	xdbm.h socket_wrapper.h
+-HEADERS = $(dist_include_HEADERS) $(nodist_include_HEADERS) \
+-	$(nodist_rokeninclude_HEADERS)
++HEADERS = $(dist_include_HEADERS) $(nodist_include_HEADERS)
+ ETAGS = etags
+ CTAGS = ctags
+ am__tty_colors = \
+@@ -1721,7 +1719,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(MANS) $(HEADERS) \
+ 		all-local
+ installdirs:
+-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(rokenincludedir)"; do \
++	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)"; do \
+ 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: $(BUILT_SOURCES)
+@@ -1777,8 +1775,7 @@
+ info-am:
+ 
+ install-data-am: install-dist_includeHEADERS install-man \
+-	install-nodist_includeHEADERS \
+-	install-nodist_rokenincludeHEADERS
++	install-nodist_includeHEADERS
+ 	@$(NORMAL_INSTALL)
+ 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+ install-dvi: install-dvi-am