svn commit: r373660 - in head/converters/libiconv: . files

[Tijl Coosemans]

Author: tijl
Date: Sun Nov 30 11:04:02 2014
New Revision: 373660
URL: https://svnweb.freebsd.org/changeset/ports/373660
QAT: https://qat.redports.org/buildarchive/r373660/

Log:
  Restore a patch hunk that was removed in r373636.  It fixes a reference
  to the stage directory in an installed binary.
  
  Reported by:	antoine

Modified:
  head/converters/libiconv/Makefile
  head/converters/libiconv/files/patch-src__Makefile.in

Modified: head/converters/libiconv/Makefile
==============================================================================
--- head/converters/libiconv/Makefile	Sun Nov 30 10:51:16 2014	(r373659)
+++ head/converters/libiconv/Makefile	Sun Nov 30 11:04:02 2014	(r373660)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libiconv
 PORTVERSION=	1.14
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	converters devel
 MASTER_SITES=	GNU
 

Modified: head/converters/libiconv/files/patch-src__Makefile.in
==============================================================================
--- head/converters/libiconv/files/patch-src__Makefile.in	Sun Nov 30 10:51:16 2014	(r373659)
+++ head/converters/libiconv/files/patch-src__Makefile.in	Sun Nov 30 11:04:02 2014	(r373660)
@@ -8,3 +8,12 @@
  
  # This is the temporary iconv executable, without internationalization.
  iconv_no_i18n$(EXEEXT) : iconv_no_i18n. at OBJEXT@ ../lib/libiconv.la $(OBJECTS_RES_ at WOE32@)
+@@ -113,7 +112,7 @@
+ 	if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi
+ 	case "@host_os@" in \
+ 	  hpux*) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv. at OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $(OBJECTS_RES_ at WOE32@) `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o iconv$(EXEEXT);; \
+-	  *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv. at OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_ at WOE32@) -o iconv$(EXEEXT);; \
++	  *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv. at OBJEXT@ ../srclib/libicrt.a ../lib/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_ at WOE32@) -o iconv$(EXEEXT);; \
+ 	esac
+ 	$(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv$(EXEEXT) $(DESTDIR)$(bindir)/iconv$(EXEEXT)
+