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

upgrade to expat 1.95.2

Browse Source
This commit is contained in:
brad 2002-01-04 04:05:13 +00:00
parent 2f506b01c3
commit 31caa27b15
8 changed files with 28 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
textproc/expat/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.14 2001/09/28 06:02:15 pvalchev Exp $
# $OpenBSD: Makefile,v 1.15 2002/01/04 04:05:13 brad Exp $
# $FreeBSD: Makefile,v 1.2 1999/08/31 02:09:14 peter Exp $
COMMENT= "XML 1.0 parser written in C"
DISTNAME= expat-1.95.1
DISTNAME= expat-1.95.2
CATEGORIES= textproc
NEED_VERSION= 1.402
NEED_VERSION= 1.500
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= expat
@ -18,11 +18,18 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
CONFIGURE_STYLE= gnu
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/conftools
CONFIGURE_STYLE= gnu dest
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/conftools
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --enable-static
post-patch:
@cd ${WRKSRC}/conftools; \
${PATCH} --forward --quiet -E < \
${PORTSDIR}/infrastructure/patches/patch-lt1.3.5-ltconfig && \
${PATCH} --forward --quiet -E < \
${PORTSDIR}/infrastructure/patches/patch-lt1.3.5-ltmain_sh
post-install:
${INSTALL_PROGRAM} ${WRKBUILD}/xmlwf/xmlwf ${PREFIX}/bin

3
textproc/expat/distinfo Normal file
View File

@ -0,0 +1,3 @@
MD5 (expat-1.95.2.tar.gz) = 159c8a36523dc37f4cbcd1d6f970ccfb
RMD160 (expat-1.95.2.tar.gz) = 8403dc13539099f7835e02d30bed5280ab621083
SHA1 (expat-1.95.2.tar.gz) = 5705828c7b02d45628a5ec95a75a07fe38a834f1

3
textproc/expat/files/md5
View File

@ -1,3 +0,0 @@
MD5 (expat-1.95.1.tar.gz) = 113ebbf7efaf7179d869341cbb2879f7
RMD160 (expat-1.95.1.tar.gz) = f5c86fb4bd518607361f7efab5ac2ad6c1e93534
SHA1 (expat-1.95.1.tar.gz) = 7c3eedeaee249c3e2ff883c5a84ced753c645184

12
textproc/expat/patches/patch-Makefile_in
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-Makefile_in,v 1.1 2001/01/21 19:17:40 avsm Exp $
--- Makefile.in.orig Sun Oct 22 19:47:33 2000
+++ Makefile.in Sun Jan 21 02:09:50 2001
$OpenBSD: patch-Makefile_in,v 1.2 2002/01/04 04:05:14 brad Exp $
--- Makefile.in.orig Fri Jul 27 16:33:34 2001
+++ Makefile.in Sun Nov 18 12:28:42 2001
@@ -76,7 +76,7 @@ PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
VERSION = @VERSION@
-SUBDIRS = lib
-SUBDIRS = lib examples xmlwf
+SUBDIRS = lib xmlwf
INSTALLSUBDIRS = lib xmlwf
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
CONFIG_HEADERS = config.h:config.hin
CONFIG_HEADERS = config.h

16
textproc/expat/patches/patch-configure
View File

@ -1,14 +1,12 @@
$OpenBSD: patch-configure,v 1.1 2001/01/21 19:17:40 avsm Exp $
--- configure.orig Sun Oct 22 19:47:33 2000
+++ configure Sun Jan 21 19:14:19 2001
@@ -561,8 +561,8 @@ VERSION=$EXPAT_VERSION
$OpenBSD: patch-configure,v 1.2 2002/01/04 04:05:14 brad Exp $
--- configure.orig Fri Jul 27 16:33:34 2001
+++ configure Sun Nov 18 12:28:42 2001
@@ -561,7 +561,7 @@ VERSION=$EXPAT_VERSION
PACKAGE=expat
-LIBCURRENT=0
-LIBREVISION=1
-LIBCURRENT=1
+LIBCURRENT=2
+LIBREVISION=0
LIBAGE=0
LIBREVISION=0
LIBAGE=1

51
textproc/expat/patches/patch-conftools_ltconfig
View File

@ -1,51 +0,0 @@
--- conftools/ltconfig.orig Sun Oct 22 15:47:34 2000
+++ conftools/ltconfig Mon Jan 22 11:10:57 2001
@@ -1105,6 +1105,9 @@
with_gnu_ld=no
fi
;;
+openbsd*)
+ with_gnu_ld=no
+ ;;
esac
@@ -1402,10 +1405,21 @@
;;
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 @@
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*)

53
textproc/expat/patches/patch-conftools_ltmain_sh
View File

@ -1,53 +0,0 @@
--- conftools/ltmain.sh.orig Sun Oct 22 15:47:34 2000
+++ conftools/ltmain.sh Mon Jan 22 11:10:54 2001
@@ -1800,6 +1800,9 @@
# 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"
@@ -3568,40 +3571,6 @@
# Exit here if they wanted silent mode.
test "$show" = : && exit 0
- echo "----------------------------------------------------------------------"
- echo "Libraries have been installed in:"
- for libdir in $libdirs; do
- echo " $libdir"
- done
- 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 "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"
- echo " during execution"
- fi
- if test -n "$runpath_var"; then
- echo " - add LIBDIR to the \`$runpath_var' environment variable"
- echo " during linking"
- fi
- if test -n "$hardcode_libdir_flag_spec"; then
- libdir=LIBDIR
- eval flag=\"$hardcode_libdir_flag_spec\"
-
- echo " - use the \`$flag' linker flag"
- fi
- if test -n "$admincmds"; then
- echo " - have your system administrator run these commands:$admincmds"
- fi
- if test -f /etc/ld.so.conf; then
- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
- fi
- echo
- echo "See any operating system documentation about shared libraries for"
- echo "more information, such as the ld(1) and ld.so(8) manual pages."
- echo "----------------------------------------------------------------------"
exit 0
;;

12
textproc/expat/patches/patch-xmlwf_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-xmlwf_Makefile_in,v 1.1 2001/01/21 19:17:40 avsm Exp $
--- xmlwf/Makefile.in.orig Sun Oct 22 19:47:35 2000
+++ xmlwf/Makefile.in Sun Jan 21 19:14:08 2001
@@ -12,4 +12,7 @@ xmlwf: $(OBJS)
$(CC) -o xmlwf $(LDFLAGS) $(OBJS) $(LIBS)
clean:
- rm -f xmlwf core *.o
+ rm -f xmlwf core *.o
+
+install:
+