cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a few problems in libiconv.

Browse Source 
* Allow libcharset to find charset.alias in the correct place
* Add support for the new FreeBSD locales
* Fix potential infinite loop when conversion fails
* Bump PORTREVISION

PR:		37543, 37497
Submitted by:	Fuyuhiko Maruyama <fuyuhik8@is.titech.ac.jp> (infinite loop
		fix) marcus (everything else)
Reviewed by:	nork (infinite loop fix), sobomax
Approved by:	sobomax
This commit is contained in:
Joe Marcus Clarke 2002-04-29 18:41:51 +00:00
parent 91cb80d943
commit a7bce67707
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=58332
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
converters/libiconv/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= libiconv
PORTVERSION= 1.7
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= converters devel
MASTER_SITES= ${MASTER_SITE_GNU} \
ftp://ftp.ilog.fr/pub/Users/haible/gnu/
@ -22,4 +22,7 @@ INSTALLS_SHLIB= yes
MAN1= iconv.1
MAN3= iconv.3 iconv_open.3 iconv_close.3
pre-build:
@cd ${WRKSRC} ; /usr/bin/gperf -t -L ANSI-C -H aliases_hash -N aliases_lookup -7 -C -k '1,3-11,$$' -i 1 lib/aliases.gperf > lib/aliases.h
.include <bsd.port.mk>

16
converters/libiconv/files/patch-ae
View File

@ -1,8 +1,5 @@
$FreeBSD$
--- libcharset/lib/Makefile.in.orig Thu Jun 28 01:56:56 2001
+++ libcharset/lib/Makefile.in Mon Aug 27 12:32:43 2001
--- libcharset/lib/Makefile.in.orig Wed Jun 27 18:56:56 2001
+++ libcharset/lib/Makefile.in Sat Apr 27 15:57:01 2002
@@ -10,6 +10,7 @@
local_prefix = /usr/local
exec_prefix = @exec_prefix@
@ -20,6 +17,15 @@ $FreeBSD$
# Needed by $(LIBTOOL).
top_builddir = ..
@@ -53,7 +54,7 @@
$(LIBTOOL_LINK) $(CC) $(LDFLAGS) -o libcharset.la -rpath $(libdir) -version-info $(LIBCHARSET_VERSION_INFO) -no-undefined $(OBJECTS)
localcharset.lo : $(srcdir)/localcharset.c
- $(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -DHAVE_CONFIG_H -DLIBDIR=\"$(libdir)\" -c $(srcdir)/localcharset.c
+ $(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -DHAVE_CONFIG_H -DLIBDIR=\"$(sysconfdir)\" -c $(srcdir)/localcharset.c
charset.alias: $(srcdir)/config.charset
$(SHELL) $(srcdir)/config.charset '@host@' > t-$@
@@ -72,11 +73,12 @@
install-lib : all force
$(MKINSTALLDIRS) $(libdir)