From 32e8556acc904690aca558abd461b779419ac0d1 Mon Sep 17 00:00:00 2001 From: aanriot Date: Sun, 26 Aug 2007 18:58:45 +0000 Subject: [PATCH] remove expat, which was COMES_WITH=4.2 . "go ahead" naddy@ --- textproc/expat/Makefile | 40 ------------------- textproc/expat/distinfo | 5 --- textproc/expat/patches/patch-Makefile_in | 49 ------------------------ textproc/expat/patches/patch-configure | 21 ---------- textproc/expat/pkg/DESCR | 2 - textproc/expat/pkg/PFRAG.shared | 2 - textproc/expat/pkg/PLIST | 15 -------- 7 files changed, 134 deletions(-) delete mode 100644 textproc/expat/Makefile delete mode 100644 textproc/expat/distinfo delete mode 100644 textproc/expat/patches/patch-Makefile_in delete mode 100644 textproc/expat/patches/patch-configure delete mode 100644 textproc/expat/pkg/DESCR delete mode 100644 textproc/expat/pkg/PFRAG.shared delete mode 100644 textproc/expat/pkg/PLIST diff --git a/textproc/expat/Makefile b/textproc/expat/Makefile deleted file mode 100644 index 8314d15c588..00000000000 --- a/textproc/expat/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# $OpenBSD: Makefile,v 1.30 2007/05/10 11:39:23 bernd Exp $ -# $FreeBSD: Makefile,v 1.2 1999/08/31 02:09:14 peter Exp $ - -COMES_WITH= 4.2 - -COMMENT= "XML 1.0 parser written in C" - -DISTNAME= expat-2.0.0 -PKGNAME= ${DISTNAME}p0 -SHARED_LIBS= expat 7.0 -CATEGORIES= textproc -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=expat/} - -HOMEPAGE= http://expat.sourceforge.net/ - -# BSD -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes -WANTLIB= c - -USE_LIBTOOL= Yes -SEPARATE_BUILD= simple -CONFIGURE_STYLE= gnu -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} -MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/conftools - -DOC=${PREFIX}/share/doc/expat -EXAMPLES=${PREFIX}/share/examples/expat - -post-install: - ${INSTALL_DATA_DIR} ${DOC} ${EXAMPLES} - ${INSTALL_DATA} ${WRKDIST}/doc/{reference.html,style.css,valid-xhtml10.png} ${DOC} - ${INSTALL_DATA} ${WRKDIST}/examples/{elements.c,outline.c} ${EXAMPLES} - -pre-regress: - @cp ${WRKSRC}/lib/expat*.h ${WRKSRC}/tests - -.include diff --git a/textproc/expat/distinfo b/textproc/expat/distinfo deleted file mode 100644 index e79f4afa02b..00000000000 --- a/textproc/expat/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -MD5 (expat-2.0.0.tar.gz) = 2UXffxwIaMXHPPZrqVlvPw== -RMD160 (expat-2.0.0.tar.gz) = 9SzKsmlQ0BSMPotkTXyQIXNN4xg= -SHA1 (expat-2.0.0.tar.gz) = n/ARp1ofW2AUXEr97FIEQss5jZM= -SHA256 (expat-2.0.0.tar.gz) = xCgOuA+o4Us/IEsdDsZ69m+gTE+drpx4oajuTG9IXd0= -SIZE (expat-2.0.0.tar.gz) = 450860 diff --git a/textproc/expat/patches/patch-Makefile_in b/textproc/expat/patches/patch-Makefile_in deleted file mode 100644 index de1d7196011..00000000000 --- a/textproc/expat/patches/patch-Makefile_in +++ /dev/null @@ -1,49 +0,0 @@ -$OpenBSD: patch-Makefile_in,v 1.5 2006/03/20 10:11:02 bernd Exp $ ---- Makefile.in.orig Thu Feb 10 16:52:02 2005 -+++ Makefile.in Sat Jan 21 16:32:37 2006 -@@ -44,15 +44,15 @@ MANFILE = $(srcdir)/doc/xmlwf.1 - APIHEADER = $(srcdir)/lib/expat.h $(srcdir)/lib/expat_external.h - LIBRARY = libexpat.la - --ifndef INSTALL_ROOT -+.ifndef INSTALL_ROOT - INSTALL_ROOT=$(DESTDIR) --endif -+.endif - - default: buildlib xmlwf/xmlwf - - buildlib: $(LIBRARY) - --all: $(LIBRARY) xmlwf/xmlwf examples/elements examples/outline -+all: $(LIBRARY) xmlwf/xmlwf - - clean: - cd lib && rm -f $(LIBRARY) *.o *.lo && rm -rf .libs _libs -@@ -157,10 +157,10 @@ tests/chardata.o: tests/chardata.c tests - tests/minicheck.o: tests/minicheck.c tests/minicheck.h - tests/runtests.o: tests/runtests.c tests/chardata.h - tests/runtests: tests/runtests.o tests/chardata.o tests/minicheck.o $(LIBRARY) -- $(LINK_EXE) $^ -+ $(LINK_EXE) $? - tests/runtestspp.o: tests/runtestspp.cpp tests/runtests.c tests/chardata.h - tests/runtestspp: tests/runtestspp.o tests/chardata.o tests/minicheck.o $(LIBRARY) -- $(LINK_CXX_EXE) $^ -+ $(LINK_CXX_EXE) $? - - tests/xmlts.zip: - wget --output-document=tests/xmlts.zip \ -@@ -172,10 +172,12 @@ tests/XML-Test-Suite: tests/xmlts.zip - run-xmltest: xmlwf/xmlwf tests/XML-Test-Suite - tests/xmltest.sh - --.SUFFIXES: .c .lo .o -+.SUFFIXES: .c .cpp .lo .o - - .c.o: - $(COMPILE) -o $@ -c $< -+.cpp.o: -+ $(CXXCOMPILE) -o $@ -c $< - .c.lo: - $(LTCOMPILE) -o $@ -c $< - diff --git a/textproc/expat/patches/patch-configure b/textproc/expat/patches/patch-configure deleted file mode 100644 index c05f21a56c8..00000000000 --- a/textproc/expat/patches/patch-configure +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-configure,v 1.4 2006/03/20 10:11:02 bernd Exp $ ---- configure.orig Sat Jan 21 15:48:13 2006 -+++ configure Sat Jan 21 15:47:55 2006 -@@ -7551,7 +7551,7 @@ if test -z "$aix_libpath"; then aix_libp - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' -- hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -+ hardcode_libdir_flag_spec='${wl}-R$libdir' - export_dynamic_flag_spec='${wl}-E' - else - case $host_os in -@@ -7561,7 +7561,7 @@ if test -z "$aix_libpath"; then aix_libp - ;; - *) - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -- hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -+ hardcode_libdir_flag_spec='${wl}-R$libdir' - ;; - esac - fi diff --git a/textproc/expat/pkg/DESCR b/textproc/expat/pkg/DESCR deleted file mode 100644 index 7d397c0fa4a..00000000000 --- a/textproc/expat/pkg/DESCR +++ /dev/null @@ -1,2 +0,0 @@ -Expat is an XML 1.0 parser written in C. It aims to be fully -conforming. It is currently not a validating XML processor. diff --git a/textproc/expat/pkg/PFRAG.shared b/textproc/expat/pkg/PFRAG.shared deleted file mode 100644 index 4456ca62eb5..00000000000 --- a/textproc/expat/pkg/PFRAG.shared +++ /dev/null @@ -1,2 +0,0 @@ -@comment $OpenBSD: PFRAG.shared,v 1.6 2005/12/25 16:08:25 steven Exp $ -@lib lib/libexpat.so.${LIBexpat_VERSION} diff --git a/textproc/expat/pkg/PLIST b/textproc/expat/pkg/PLIST deleted file mode 100644 index 42b8a4c3835..00000000000 --- a/textproc/expat/pkg/PLIST +++ /dev/null @@ -1,15 +0,0 @@ -@comment $OpenBSD: PLIST,v 1.7 2006/03/20 10:11:03 bernd Exp $ -bin/xmlwf -include/expat.h -include/expat_external.h -lib/libexpat.a -lib/libexpat.la -@man man/man1/xmlwf.1 -share/doc/expat/ -share/doc/expat/reference.html -share/doc/expat/style.css -share/doc/expat/valid-xhtml10.png -share/examples/expat/ -share/examples/expat/elements.c -share/examples/expat/outline.c -%%SHARED%%