- update to expat-1.95.1
This is the new stream of official development for expat, and is now developed on sourceforge.
This commit is contained in:
avsm
parent
3ded5fbbd8
commit
6cb9ca4279
@ -1,16 +1,14 @@
|
||||
# $OpenBSD: Makefile,v 1.9 2000/12/14 16:02:58 brad Exp $
|
||||
# $OpenBSD: Makefile,v 1.10 2001/01/21 19:17:40 avsm Exp $
|
||||
# $FreeBSD: Makefile,v 1.2 1999/08/31 02:09:14 peter Exp $
|
||||
|
||||
DISTNAME= expat1_2
|
||||
PKGNAME= expat-1.2
|
||||
DISTNAME= expat-1.95.1
|
||||
CATEGORIES= textproc
|
||||
NEED_VERSION= 1.336
|
||||
MASTER_SITES= ftp://ftp.jclark.com/pub/xml/ \
|
||||
http://www.physik.TU-Berlin.DE/~ibex/ports/distfiles/
|
||||
EXTRACT_SUFX= .zip
|
||||
NEED_VERSION= 1.351
|
||||
|
||||
HOMEPAGE= http://www.jclark.com/xml/expat.html
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
|
||||
MASTER_SITE_SUBDIR= expat
|
||||
|
||||
HOMEPAGE= http://expat.sourceforge.net/
|
||||
MAINTAINER= Dug Song <dugsong@monkey.org>
|
||||
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
@ -18,26 +16,10 @@ PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
SHLIB= libexpat.so.1.0
|
||||
SUBST_VARS= SHLIB
|
||||
CONFIGURE_STYLE= gnu
|
||||
CONFIGURE_ARGS= ${CONFIGURE_SHARED} --enable-static
|
||||
|
||||
WRKDIST= ${WRKDIR}/expat
|
||||
|
||||
MAKE_FLAGS= CC="${CC}" CFLAGS="${CFLAGS} -Ixmltok -Ixmlparse -DXML_NS" \
|
||||
SHLIB="$(SHLIB)"
|
||||
|
||||
do-install:
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/include/xml
|
||||
post-install:
|
||||
${INSTALL_PROGRAM} ${WRKBUILD}/xmlwf/xmlwf ${PREFIX}/bin
|
||||
${INSTALL_DATA} ${WRKSRC}/xmlparse/xmlparse.h ${PREFIX}/include/xml
|
||||
${INSTALL_DATA} ${WRKSRC}/xmltok/xmltok.h ${PREFIX}/include/xml
|
||||
${INSTALL_DATA} ${WRKBUILD}/libexpat.a ${PREFIX}/lib
|
||||
@if [ ${WRKBUILD}/${SHLIB} ]; then \
|
||||
${INSTALL_DATA} ${WRKBUILD}/${SHLIB} ${PREFIX}/lib; \
|
||||
fi
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
.if defined(NO_SHARED_LIBS) && ${NO_SHARED_LIBS:L} == "yes"
|
||||
MAKE_ENV= NO_SHARED_LIBS= Yes
|
||||
.endif
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (expat1_2.zip) = e40f2e95ca191f43594d2b5f42cbaf9d
|
||||
RMD160 (expat1_2.zip) = 4a7a5b59af41d93b741dd2a419bc91461eedb3fa
|
||||
SHA1 (expat1_2.zip) = 90a9221925b7f81cae053b95944935b3549e9bc6
|
||||
MD5 (expat-1.95.1.tar.gz) = 113ebbf7efaf7179d869341cbb2879f7
|
||||
RMD160 (expat-1.95.1.tar.gz) = f5c86fb4bd518607361f7efab5ac2ad6c1e93534
|
||||
SHA1 (expat-1.95.1.tar.gz) = 7c3eedeaee249c3e2ff883c5a84ced753c645184
|
||||
|
||||
@ -1,54 +0,0 @@
|
||||
--- Makefile.orig Tue May 9 23:21:56 2000
|
||||
+++ Makefile Thu Dec 14 10:47:28 2000
|
||||
@@ -13,25 +13,36 @@
|
||||
LIBOBJS=xmltok/xmltok.o \
|
||||
xmltok/xmlrole.o \
|
||||
xmlparse/xmlparse.o
|
||||
+SHLIBOBJS=$(LIBOBJS:.o=.so)
|
||||
|
||||
OBJS=xmlwf/xmlwf.o \
|
||||
xmlwf/xmlfile.o \
|
||||
xmlwf/codepage.o \
|
||||
$(FILEMAP_OBJ)
|
||||
-LIB=xmlparse/libexpat.a
|
||||
+LIB=libexpat.a
|
||||
EXE=
|
||||
XMLWF=xmlwf/xmlwf$(EXE)
|
||||
|
||||
-all: $(XMLWF)
|
||||
+PICFLAG= -fpic
|
||||
|
||||
+.if defined(NO_SHARED_LIBS) && ${NO_SHARED_LIBS:L} == "yes"
|
||||
+all: $(XMLWF)
|
||||
$(XMLWF): $(OBJS) $(LIB)
|
||||
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIB)
|
||||
+.else
|
||||
+all: $(XMLWF) $(SHLIB)
|
||||
+$(XMLWF): $(OBJS) $(LIB) $(SHLIB)
|
||||
+.endif
|
||||
+ $(CC) $(CFLAGS) -o $@ $(OBJS) -L. -lexpat
|
||||
|
||||
$(LIB): $(LIBOBJS)
|
||||
$(AR) rc $(LIB) $(LIBOBJS)
|
||||
+ @ranlib $(LIB)
|
||||
+
|
||||
+$(SHLIB): $(SHLIBOBJS)
|
||||
+ $(CC) -shared $(PICFLAG) -o $(SHLIB) $(SHLIBOBJS)
|
||||
|
||||
clean:
|
||||
- rm -f $(OBJS) $(LIBOBJS) $(LIB) $(XMLWF)
|
||||
+ rm -f $(OBJS) $(LIBOBJS) $(LIB) $(SHLIB) $(XMLWF)
|
||||
|
||||
xmltok/nametab.h: gennmtab/gennmtab$(EXE)
|
||||
rm -f $@
|
||||
@@ -42,5 +53,10 @@
|
||||
|
||||
xmltok/xmltok.o: xmltok/nametab.h
|
||||
|
||||
+.SUFFIXES: .o .so
|
||||
+
|
||||
.c.o:
|
||||
$(CC) $(CFLAGS) -c -o $@ $<
|
||||
+
|
||||
+.c.so:
|
||||
+ $(CC) $(CFLAGS) $(PICFLAG) -DPIC -c -o $@ $<
|
||||
12
textproc/expat/patches/patch-Makefile_in
Normal file
12
textproc/expat/patches/patch-Makefile_in
Normal file
@ -0,0 +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
|
||||
@@ -76,7 +76,7 @@ PACKAGE = @PACKAGE@
|
||||
RANLIB = @RANLIB@
|
||||
VERSION = @VERSION@
|
||||
|
||||
-SUBDIRS = lib
|
||||
+SUBDIRS = lib xmlwf
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
CONFIG_HEADERS = config.h:config.hin
|
||||
|
||||
14
textproc/expat/patches/patch-configure
Normal file
14
textproc/expat/patches/patch-configure
Normal file
@ -0,0 +1,14 @@
|
||||
$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
|
||||
PACKAGE=expat
|
||||
|
||||
|
||||
-LIBCURRENT=0
|
||||
-LIBREVISION=1
|
||||
+LIBCURRENT=2
|
||||
+LIBREVISION=0
|
||||
LIBAGE=0
|
||||
|
||||
|
||||
49
textproc/expat/patches/patch-conftools_ltconfig
Normal file
49
textproc/expat/patches/patch-conftools_ltconfig
Normal file
@ -0,0 +1,49 @@
|
||||
$OpenBSD: patch-conftools_ltconfig,v 1.1 2001/01/21 19:17:40 avsm Exp $
|
||||
--- conftools/ltconfig.orig Sun Oct 22 19:47:34 2000
|
||||
+++ conftools/ltconfig Sun Jan 21 02:09:50 2001
|
||||
@@ -1105,6 +1105,9 @@ cygwin* | mingw*)
|
||||
with_gnu_ld=no
|
||||
fi
|
||||
;;
|
||||
+openbsd*)
|
||||
+ with_gnu_ld=no
|
||||
+ ;;
|
||||
|
||||
esac
|
||||
|
||||
@@ -1402,10 +1405,18 @@ 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
|
||||
+ openbsd2.[01234567])
|
||||
+ 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'
|
||||
+ ;;
|
||||
+ esac
|
||||
;;
|
||||
|
||||
os2*)
|
||||
@@ -2021,13 +2032,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
textproc/expat/patches/patch-conftools_ltmain_sh
Normal file
71
textproc/expat/patches/patch-conftools_ltmain_sh
Normal file
@ -0,0 +1,71 @@
|
||||
$OpenBSD: patch-conftools_ltmain_sh,v 1.1 2001/01/21 19:17:40 avsm Exp $
|
||||
--- conftools/ltmain.sh.orig Sun Oct 22 19:47:34 2000
|
||||
+++ conftools/ltmain.sh Sun Jan 21 02:09:50 2001
|
||||
@@ -627,14 +627,14 @@ compiler."
|
||||
# we shouldn't force the makefile maintainer to figure out
|
||||
# which system we are compiling for in order to pass an extra
|
||||
# flag for every libtool invokation.
|
||||
- allow_undefined=no
|
||||
+ # allow_undefined=no
|
||||
|
||||
# FIXME: Unfortunately, there are problems with the above when trying
|
||||
# to make a dll which has undefined symbols, in which case not
|
||||
# even a static library is built. For now, we need to specify
|
||||
# -no-undefined on the libtool link line when we can be certain
|
||||
# that all symbols are satisfied, otherwise we get a static library.
|
||||
- # allow_undefined=yes
|
||||
+ allow_undefined=yes
|
||||
|
||||
# This is a source program that is used to create dlls on Windows
|
||||
# Don't remove nor modify the starting and closing comments
|
||||
@@ -1800,6 +1800,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"
|
||||
@@ -3568,40 +3571,6 @@ libdir='$install_libdir'\
|
||||
# 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
Normal file
12
textproc/expat/patches/patch-xmlwf_Makefile_in
Normal file
@ -0,0 +1,12 @@
|
||||
$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:
|
||||
+
|
||||
@ -1,3 +1,3 @@
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.1 2000/09/27 14:49:59 brad Exp $
|
||||
lib/${SHLIB}
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.2 2001/01/21 19:17:40 avsm Exp $
|
||||
lib/libexpat.so.2.0
|
||||
DYNLIBDIR(%B)
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
@comment $OpenBSD: PLIST,v 1.3 2000/09/27 14:48:57 brad Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.4 2001/01/21 19:17:41 avsm Exp $
|
||||
bin/xmlwf
|
||||
include/xml/xmlparse.h
|
||||
include/xml/xmltok.h
|
||||
include/expat.h
|
||||
lib/libexpat.a
|
||||
lib/libexpat.la
|
||||
%%SHARED%%
|
||||
@dirrm include/xml
|
||||
|
||||
Loading…
Reference in New Issue
Block a user