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

upgrade to libiconv 1.7

Browse Source 
--
Based on port from maintainer, libtool syncing by me.
This commit is contained in:
brad 2001-08-27 13:17:16 +00:00
parent 912fa6ba4b
commit d7b70dc45a
14 changed files with 279 additions and 205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
converters/libiconv/Makefile
View File

@ -1,10 +1,12 @@
# $OpenBSD: Makefile,v 1.4 2001/05/05 23:11:23 lebel Exp $
# $OpenBSD: Makefile,v 1.5 2001/08/27 13:17:16 brad Exp $
COMMENT= "character set conversion library"
DISTNAME= libiconv-1.6.1
DISTNAME= libiconv-1.7
CATEGORIES= converters devel
NEED_VERSION= 1.402
NEED_VERSION= 1.435
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= libiconv
HOMEPAGE= http://clisp.cons.org/~haible/packages-libiconv.html
@ -15,13 +17,12 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ftp://ftp.ilog.fr/pub/Users/haible/gnu/ \
${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= libiconv
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= ${CONFIGURE_SHARED} --enable-static
SEPARATE_BUILD= concurrent
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --enable-static
test: build
@cd ${WRKBUILD} && ${MAKE_PROGRAM} check
.include <bsd.port.mk>

6
converters/libiconv/files/md5
View File

@ -1,3 +1,3 @@
MD5 (libiconv-1.6.1.tar.gz) = 0117656ed71bc2929949583403cc7742
RMD160 (libiconv-1.6.1.tar.gz) = 51c926f67a2c9fba4f45e97fd8e0547158c202f6
SHA1 (libiconv-1.6.1.tar.gz) = 259abcc264a64873204714a8342fe085b6f34ac9
MD5 (libiconv-1.7.tar.gz) = bc7029c0bc913dc297cf49afa4c0e133
RMD160 (libiconv-1.7.tar.gz) = e1471522f3a6a66e9dc2bf14fdeaeb0a2c62ae89
SHA1 (libiconv-1.7.tar.gz) = 14232820739d778e0cdbe3aa647aa7ce6ff4d101

52
converters/libiconv/patches/patch-autoconf_ltconfig
View File

@ -1,52 +0,0 @@
$OpenBSD: patch-autoconf_ltconfig,v 1.2 2001/03/15 16:12:37 naddy Exp $
--- autoconf/ltconfig.orig Mon Feb 26 17:52:17 2001
+++ autoconf/ltconfig Thu Mar 15 15:25:22 2001
@@ -1099,6 +1099,9 @@ cygwin* | mingw*)
with_gnu_ld=no
fi
;;
+openbsd*)
+ with_gnu_ld=no
+ ;;
esac
@@ -1396,10 +1399,21 @@ else
;;
openbsd*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
- hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
+ case "$host_os" in
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then
+ export_dynamic_flag_spec='${wl}-E'
+ fi
+ ;;
+ esac
;;
os2*)
@@ -2016,13 +2030,10 @@ netbsd*)
openbsd*)
version_type=sunos
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- need_version=no
- fi
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
+ deplibs_check_method='pass_all'
;;
os2*)

71
converters/libiconv/patches/patch-autoconf_ltmain_sh
View File

@ -1,49 +1,48 @@
$OpenBSD: patch-autoconf_ltmain_sh,v 1.2 2001/03/15 16:12:37 naddy Exp $
--- autoconf/ltmain.sh.orig Wed Feb 21 19:13:29 2001
+++ autoconf/ltmain.sh Thu Mar 15 15:25:22 2001
@@ -1079,7 +1079,18 @@ compiler."
# These systems don't actually have c library (as such)
continue
$OpenBSD: patch-autoconf_ltmain_sh,v 1.3 2001/08/27 13:17:17 brad Exp $
--- autoconf/ltmain.sh.orig Sun Aug 26 23:27:18 2001
+++ autoconf/ltmain.sh Sun Aug 26 23:35:52 2001
@@ -1031,12 +1031,28 @@ compiler."
# These systems don't actually have a C library (as such)
test "X$arg" = "X-lc" && continue
;;
+ *-*-openbsd*)
+ # Do not include libc due to us having libc/libc_r.
+ continue
+ ;;
+ *-*-openbsd*)
+ # Do not include libc due to us having libc/libc_r.
+ test "X$arg" = "X-lc" && continue
+ ;;
+ esac
+ fi
+ if test "$X$arg" = "X-lc_r"; then
+ case $host in
+ *-*-openbsd*)
+ # Do not include libc_r directly, use -pthread flag.
+ continue
+ ;;
esac
+ elif test "$arg" = "-lc_r"; then
+ case "$host" in
+ *-*-openbsd*)
+ # Do not include libc_r directly, use -pthread flag.
+ continue
+ ;;
+ esac
elif test "$arg" = "-lm"; then
case "$host" in
*-*-cygwin* | *-*-beos*)
@@ -1091,6 +1102,10 @@ compiler."
fi
deplibs="$deplibs $arg"
continue
;;
+ -?thread)
+ deplibs="$deplibs $arg"
+ ;;
+ deplibs="$deplibs $arg"
+ ;;
+
-module)
module=yes
continue
@@ -1799,6 +1814,9 @@ compiler."
# rhapsody is a little odd...
deplibs="$deplibs -framework System"
;;
+ *-*-openbsd*)
+ # do not include libc due to us having libc/libc_r.
+ ;;
*)
# Add libc to deplibs on all other systems.
deplibs="$deplibs -lc"
@@ -3567,40 +3585,6 @@ libdir='$install_libdir'\
@@ -2408,6 +2424,9 @@ compiler."
*-*-netbsd*)
# Don't link with libc until the a.out ld.so is fixed.
;;
+ *-*-openbsd*)
+ # Do not include libc due to us having libc/libc_r.
+ ;;
*)
# Add libc to deplibs on all other systems if necessary.
if test $build_libtool_need_lc = "yes"; then
@@ -4412,40 +4431,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = : && exit 0
test "$show" = ":" && exit 0
- echo "----------------------------------------------------------------------"
- echo "Libraries have been installed in:"
@ -53,7 +52,7 @@ $OpenBSD: patch-autoconf_ltmain_sh,v 1.2 2001/03/15 16:12:37 naddy Exp $
- echo
- echo "If you ever happen to want to link against installed libraries"
- echo "in a given directory, LIBDIR, you must either use libtool, and"
- echo "specify the full pathname of the library, or use \`-LLIBDIR'"
- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
- echo "flag during linking and do at least one of the following:"
- if test -n "$shlibpath_var"; then
- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"

81
converters/libiconv/patches/patch-configure Normal file
View File

@ -0,0 +1,81 @@
$OpenBSD: patch-configure,v 1.1 2001/08/27 13:17:17 brad Exp $
--- configure.orig Sun Aug 26 22:23:45 2001
+++ configure Sun Aug 26 22:57:33 2001
@@ -2616,7 +2616,14 @@ old_postuninstall_cmds=
if test -n "$RANLIB"; then
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+ case "$host_os" in
+ openbsd*)
+ old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+ ;;
+ *)
+ old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+ ;;
+ esac
fi
# Allow CC to be a program name with arguments.
@@ -3139,7 +3146,9 @@ cygwin* | mingw* | pw32* )
with_gnu_ld=no
fi
;;
-
+openbsd*)
+ with_gnu_ld=no
+ ;;
esac
ld_shlibs=yes
@@ -3543,10 +3552,21 @@ else
;;
openbsd*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
+ case "$host_os" in
+ openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ export_dynamic_flag_spec='${wl}-E'
+ fi
+ ;;
+ esac
;;
os2*)
@@ -4035,9 +4055,23 @@ newsos6)
openbsd*)
version_type=sunos
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- need_version=no
+ need_lib_prefix=no
+ need_version=no
+ file_magic_cmd=/usr/bin/file
+ file_magic_test_file=`echo /usr/lib/libc.so.*`
+ if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
+ case "$host_os" in
+ openbsd2.[89] | openbsd2.[89].*)
+ shlibpath_overrides_runpath=no
+ ;;
+ *)
+ shlibpath_overrides_runpath=yes
+ ;;
+ esac
+ else
+ deplibs_check_method='file_magic OpenBSD.* shared library'
+ shlibpath_overrides_runpath=yes
fi
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'

8
converters/libiconv/patches/patch-lib_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-lib_Makefile_in,v 1.2 2001/03/15 16:12:37 naddy Exp $
--- lib/Makefile.in.orig Sun Mar 11 19:37:52 2001
+++ lib/Makefile.in Thu Mar 15 15:25:22 2001
@@ -79,7 +79,7 @@ iconv.lo : $(srcdir)/iconv.c $(srcdir)/c
$OpenBSD: patch-lib_Makefile_in,v 1.3 2001/08/27 13:17:17 brad Exp $
--- lib/Makefile.in.orig Wed Jun 27 18:37:49 2001
+++ lib/Makefile.in Sun Aug 26 23:18:26 2001
@@ -84,7 +84,7 @@ iconv.lo : $(srcdir)/iconv.c $(srcdir)/c
# $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.
install-lib : all force
if [ ! -d $(libdir) ] ; then mkdir $(libdir) ; fi

8
converters/libiconv/patches/patch-libcharset_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-libcharset_Makefile_in,v 1.2 2001/03/15 16:12:37 naddy Exp $
--- libcharset/Makefile.in.orig Wed Feb 21 00:42:12 2001
+++ libcharset/Makefile.in Thu Mar 15 15:25:22 2001
@@ -38,7 +38,7 @@ all : force
$OpenBSD: patch-libcharset_Makefile_in,v 1.3 2001/08/27 13:17:17 brad Exp $
--- libcharset/Makefile.in.orig Mon May 21 10:48:37 2001
+++ libcharset/Makefile.in Sun Aug 26 23:18:27 2001
@@ -40,7 +40,7 @@ include/libcharset.h :
install-lib : all force
cd lib && $(MAKE) install-lib libdir='$(libdir)' includedir='$(includedir)'
$(MKINSTALLDIRS) $(includedir)

52
converters/libiconv/patches/patch-libcharset_autoconf_ltconfig
View File

@ -1,52 +0,0 @@
$OpenBSD: patch-libcharset_autoconf_ltconfig,v 1.2 2001/03/15 16:12:37 naddy Exp $
--- libcharset/autoconf/ltconfig.orig Mon Feb 26 17:49:31 2001
+++ libcharset/autoconf/ltconfig Thu Mar 15 15:25:22 2001
@@ -1105,6 +1105,9 @@ cygwin* | mingw*)
with_gnu_ld=no
fi
;;
+openbsd*)
+ with_gnu_ld=no
+ ;;
esac
@@ -1402,10 +1405,21 @@ else
;;
openbsd*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
- hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
+ case "$host_os" in
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then
+ export_dynamic_flag_spec='${wl}-E'
+ fi
+ ;;
+ esac
;;
os2*)
@@ -2021,13 +2035,10 @@ netbsd*)
openbsd*)
version_type=sunos
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- need_version=no
- fi
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
+ deplibs_check_method='pass_all'
;;
os2*)

71
converters/libiconv/patches/patch-libcharset_autoconf_ltmain_sh
View File

@ -1,49 +1,48 @@
$OpenBSD: patch-libcharset_autoconf_ltmain_sh,v 1.2 2001/03/15 16:12:37 naddy Exp $
--- libcharset/autoconf/ltmain.sh.orig Wed Feb 21 19:09:19 2001
+++ libcharset/autoconf/ltmain.sh Thu Mar 15 15:25:22 2001
@@ -1079,7 +1079,18 @@ compiler."
# These systems don't actually have c library (as such)
continue
$OpenBSD: patch-libcharset_autoconf_ltmain_sh,v 1.3 2001/08/27 13:17:17 brad Exp $
--- libcharset/autoconf/ltmain.sh.orig Tue Apr 24 19:35:10 2001
+++ libcharset/autoconf/ltmain.sh Sun Aug 26 23:36:51 2001
@@ -1031,12 +1031,28 @@ compiler."
# These systems don't actually have a C library (as such)
test "X$arg" = "X-lc" && continue
;;
+ *-*-openbsd*)
+ # Do not include libc due to us having libc/libc_r.
+ continue
+ ;;
+ *-*-openbsd*)
+ # Do not include libc due to us having libc/libc_r.
+ test "X$arg" = "X-lc" && continue
+ ;;
+ esac
+ fi
+ if test "$X$arg" = "X-lc_r"; then
+ case $host in
+ *-*-openbsd*)
+ # Do not include libc_r directly, use -pthread flag.
+ continue
+ ;;
esac
+ elif test "$arg" = "-lc_r"; then
+ case "$host" in
+ *-*-openbsd*)
+ # Do not include libc_r directly, use -pthread flag.
+ continue
+ ;;
+ esac
elif test "$arg" = "-lm"; then
case "$host" in
*-*-cygwin* | *-*-beos*)
@@ -1091,6 +1102,10 @@ compiler."
fi
deplibs="$deplibs $arg"
continue
;;
+ -?thread)
+ deplibs="$deplibs $arg"
+ ;;
+ deplibs="$deplibs $arg"
+ ;;
+
-module)
module=yes
continue
@@ -1799,6 +1814,9 @@ compiler."
# rhapsody is a little odd...
deplibs="$deplibs -framework System"
;;
+ *-*-openbsd*)
+ # do not include libc due to us having libc/libc_r.
+ ;;
*)
# Add libc to deplibs on all other systems.
deplibs="$deplibs -lc"
@@ -3567,40 +3585,6 @@ libdir='$install_libdir'\
@@ -2408,6 +2424,9 @@ compiler."
*-*-netbsd*)
# Don't link with libc until the a.out ld.so is fixed.
;;
+ *-*-openbsd*)
+ # Do not include libc due to us having libc/libc_r.
+ ;;
*)
# Add libc to deplibs on all other systems if necessary.
if test $build_libtool_need_lc = "yes"; then
@@ -4412,40 +4431,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = : && exit 0
test "$show" = ":" && exit 0
- echo "----------------------------------------------------------------------"
- echo "Libraries have been installed in:"
@ -53,7 +52,7 @@ $OpenBSD: patch-libcharset_autoconf_ltmain_sh,v 1.2 2001/03/15 16:12:37 naddy Ex
- echo
- echo "If you ever happen to want to link against installed libraries"
- echo "in a given directory, LIBDIR, you must either use libtool, and"
- echo "specify the full pathname of the library, or use \`-LLIBDIR'"
- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
- echo "flag during linking and do at least one of the following:"
- if test -n "$shlibpath_var"; then
- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"

81
converters/libiconv/patches/patch-libcharset_configure Normal file
View File

@ -0,0 +1,81 @@
$OpenBSD: patch-libcharset_configure,v 1.1 2001/08/27 13:17:17 brad Exp $
--- libcharset/configure.orig Mon Jun 25 08:39:57 2001
+++ libcharset/configure Sun Aug 26 23:38:33 2001
@@ -2492,7 +2492,14 @@ old_postuninstall_cmds=
if test -n "$RANLIB"; then
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+ case "$host_os" in
+ openbsd*)
+ old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+ ;;
+ *)
+ old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+ ;;
+ esac
fi
# Allow CC to be a program name with arguments.
@@ -2989,7 +2996,9 @@ cygwin* | mingw* | pw32* )
with_gnu_ld=no
fi
;;
-
+openbsd*)
+ with_gnu_ld=no
+ ;;
esac
ld_shlibs=yes
@@ -3393,10 +3402,21 @@ else
;;
openbsd*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
+ case "$host_os" in
+ openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ export_dynamic_flag_spec='${wl}-E'
+ fi
+ ;;
+ esac
;;
os2*)
@@ -3873,9 +3893,23 @@ newsos6)
openbsd*)
version_type=sunos
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- need_version=no
+ need_lib_prefix=no
+ need_version=no
+ file_magic_cmd=/usr/bin/file
+ file_magic_test_file=`echo /usr/lib/libc.so.*`
+ if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
+ case "$host_os" in
+ openbsd2.[89] | openbsd2.[89].*)
+ shlibpath_overrides_runpath=no
+ ;;
+ *)
+ shlibpath_overrides_runpath=yes
+ ;;
+ esac
+ else
+ deplibs_check_method='file_magic OpenBSD.* shared library'
+ shlibpath_overrides_runpath=yes
fi
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'

10
converters/libiconv/patches/patch-libcharset_lib_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-libcharset_lib_Makefile_in,v 1.2 2001/03/15 16:12:37 naddy Exp $
--- libcharset/lib/Makefile.in.orig Sun Mar 11 19:37:53 2001
+++ libcharset/lib/Makefile.in Thu Mar 15 15:25:22 2001
@@ -25,6 +25,7 @@ RM = rm -f
$OpenBSD: patch-libcharset_lib_Makefile_in,v 1.3 2001/08/27 13:17:17 brad Exp $
--- libcharset/lib/Makefile.in.orig Wed Jun 27 18:56:56 2001
+++ libcharset/lib/Makefile.in Sun Aug 26 23:18:28 2001
@@ -27,6 +27,7 @@ RM = rm -f
# Programs used by "make install":
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@ -9,7 +9,7 @@ $OpenBSD: patch-libcharset_lib_Makefile_in,v 1.2 2001/03/15 16:12:37 naddy Exp $
MKINSTALLDIRS = $(SHELL) $(srcdir)/../autoconf/mkinstalldirs
#### End of system configuration section. ####
@@ -69,11 +70,11 @@ ref-del.sed : $(srcdir)/ref-del.sin
@@ -71,11 +72,11 @@ ref-del.sed : $(srcdir)/ref-del.sin
# $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.
install-lib : all force
$(MKINSTALLDIRS) $(libdir)

12
converters/libiconv/patches/patch-man_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-man_Makefile_in,v 1.1 2001/08/27 13:17:17 brad Exp $
--- man/Makefile.in.orig Mon Aug 27 07:47:29 2001
+++ man/Makefile.in Mon Aug 27 07:48:17 2001
@@ -10,7 +10,7 @@ prefix = @prefix@
local_prefix = /usr/local
exec_prefix = @exec_prefix@
mandir = @mandir@
-docdir = $(prefix)/doc/libiconv
+docdir = $(prefix)/share/doc/libiconv
htmldir = $(docdir)
# Programs used by "make":

4
converters/libiconv/pkg/PFRAG.shared
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2001/03/12 01:32:04 naddy Exp $
@comment $OpenBSD: PFRAG.shared,v 1.2 2001/08/27 13:17:17 brad Exp $
lib/libcharset.so.1.0
lib/libiconv.so.2.3
lib/libiconv.so.2.4
DYNLIBDIR(%B)

7
converters/libiconv/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2001/03/12 01:32:04 naddy Exp $
@comment $OpenBSD: PLIST,v 1.2 2001/08/27 13:17:17 brad Exp $
bin/iconv
include/iconv.h
include/libcharset.h
@ -12,3 +12,8 @@ man/man1/iconv.1
man/man3/iconv.3
man/man3/iconv_close.3
man/man3/iconv_open.3
share/doc/libiconv/iconv.1.html
share/doc/libiconv/iconv.3.html
share/doc/libiconv/iconv_close.3.html
share/doc/libiconv/iconv_open.3.html
@dirrm share/doc/libiconv