diff options
| author | Tijl Coosemans <tijl@FreeBSD.org> | 2014-11-30 11:04:02 +0000 |
|---|---|---|
| committer | Tijl Coosemans <tijl@FreeBSD.org> | 2014-11-30 11:04:02 +0000 |
| commit | 37442dc1411bc39a087de46c79215af20bf413d5 (patch) | |
| tree | 872a1f68fd26723368d0bb6e5534627c9b6e409d /converters | |
| parent | 30086832c14093cb50eb98366a651fbcffcec4b9 (diff) | |
| download | ports-37442dc1411bc39a087de46c79215af20bf413d5.tar.gz ports-37442dc1411bc39a087de46c79215af20bf413d5.zip | |
Restore a patch hunk that was removed in r373636. It fixes a reference
to the stage directory in an installed binary.
Reported by: antoine
Notes
Notes:
svn path=/head/; revision=373660
Diffstat (limited to 'converters')
| -rw-r--r-- | converters/libiconv/Makefile | 2 | ||||
| -rw-r--r-- | converters/libiconv/files/patch-src__Makefile.in | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile index 292acf872c26..db0824da1261 100644 --- a/converters/libiconv/Makefile +++ b/converters/libiconv/Makefile @@ -3,7 +3,7 @@ PORTNAME= libiconv PORTVERSION= 1.14 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= converters devel MASTER_SITES= GNU diff --git a/converters/libiconv/files/patch-src__Makefile.in b/converters/libiconv/files/patch-src__Makefile.in index 1cbeaed8769a..04d0b09ef858 100644 --- a/converters/libiconv/files/patch-src__Makefile.in +++ b/converters/libiconv/files/patch-src__Makefile.in @@ -8,3 +8,12 @@ # This is the temporary iconv executable, without internationalization. iconv_no_i18n$(EXEEXT) : iconv_no_i18n.@OBJEXT@ ../lib/libiconv.la $(OBJECTS_RES_@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.@OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $(OBJECTS_RES_@WOE32@) `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o iconv$(EXEEXT);; \ +- *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv$(EXEEXT);; \ ++ *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a ../lib/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv$(EXEEXT);; \ + esac + $(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv$(EXEEXT) $(DESTDIR)$(bindir)/iconv$(EXEEXT) + |