From owner-freebsd-ports Sun Oct 15 11:23:26 2000 Delivered-To: freebsd-ports@freebsd.org Received: from mail.rdc1.kt.home.ne.jp (ha1.rdc1.kt.home.ne.jp [203.165.9.242]) by hub.freebsd.org (Postfix) with ESMTP id C4D4837B502; Sun, 15 Oct 2000 11:23:11 -0700 (PDT) Received: from daemon.local.idaemons.org ([203.165.161.10]) by mail.rdc1.kt.home.ne.jp (InterMail vM.4.01.02.00 201-229-116) with ESMTP id <20001015182304.JYVT15224.mail.rdc1.kt.home.ne.jp@daemon.local.idaemons.org>; Sun, 15 Oct 2000 11:23:04 -0700 Received: by daemon.local.idaemons.org (8.11.0/3.7W) id e9FIN3193362; Mon, 16 Oct 2000 03:23:04 +0900 (JST) Date: Mon, 16 Oct 2000 03:23:03 +0900 Message-ID: <86wvfa7ym0.wl@archon.local.idaemons.org> From: "Akinori MUSHA" To: dirk@FreeBSD.ORG Cc: kuriyama@imgsrc.co.jp, ports@FreeBSD.ORG Subject: Re: textproc/expat port In-Reply-To: In your message of "Mon, 16 Oct 2000 01:10:17 +0900" <86r95inl06.wl@archon.local.idaemons.org> References: <7mhf6i9mbg.wl@waterblue.imgsrc.co.jp> <20001012234906.A13294@physik.TU-Berlin.DE> <86r95inl06.wl@archon.local.idaemons.org> User-Agent: Wanderlust/1.1.2 (Raspberry Beret) EMIKO/1.13.12 (Euglena sociabilis) FLIM/1.13.2 (Kasanui) APEL/10.2 MULE XEmacs/21.1 (patch 12) (Channel Islands) (i386--freebsd) Organization: Associated I. Daemons X-PGP-Public-Key: finger knu@FreeBSD.org X-PGP-Fingerprint: 081D 099C 1705 861D 4B70 B04A 920B EFC7 9FD9 E1EE MIME-Version: 1.0 (generated by EMIKO 1.13.12 - "Euglena sociabilis") Content-Type: text/plain; charset=US-ASCII Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org At Mon, 16 Oct 2000 01:10:17 +0900, I wrote: > P.S. > I can take over the maintainership of expat 1.2 if two of you like. > In fact, I'm itching to rewrite its Makefile by using bsd.lib.mk. =) I've made a patch that updates textproc/expat to 1.2, as attached. Try it out and give me your approval if it's okay. :) Regards, -- / /__ __ / ) ) ) ) / and.or.jp / ruby-lang.org Akinori -Aki- MUSHA aka / (_ / ( (__( @ idaemons.org / FreeBSD.org "We're only at home when we're on the run, on the wing, on the fly" M Makefile M distinfo A files/Makefile.lib A files/Makefile.prog R files/patch-aa Index: Makefile =================================================================== RCS file: /home/ncvs/ports/textproc/expat/Makefile,v retrieving revision 1.4 diff -u -u -r1.4 Makefile --- Makefile 2000/08/10 12:36:26 1.4 +++ Makefile 2000/10/15 18:15:50 @@ -6,27 +6,38 @@ # PORTNAME= expat -PORTVERSION= 1.1 +PORTVERSION= 1.2 CATEGORIES= textproc MASTER_SITES= ftp://ftp.jclark.com/pub/xml/ \ http://www.physik.TU-Berlin.DE/~ibex/ports/distfiles/ DISTNAME= ${PORTNAME} -MAINTAINER= dirk@FreeBSD.org +MAINTAINER= knu@FreeBSD.org USE_ZIP= yes SHLIB_MAJOR= 1 +MAKEFILES= Makefile.lib Makefile.prog +MAKE_ARGS= SHLIB_MAJOR="${SHLIB_MAJOR}" PLIST_SUB= SHLIB_MAJOR="${SHLIB_MAJOR}" +do-build: +.for f in ${MAKEFILES} + ${CP} ${FILESDIR}/${f} ${WRKSRC}/ +.endfor + ${MV} ${WRKSRC}/xmlwf/* ${WRKSRC}/ + ${RMDIR} ${WRKSRC}/xmlwf +.for f in ${MAKEFILES} + @(cd ${WRKSRC}; \ + ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${f} ${MAKE_ARGS} ${ALL_TARGET}) +.endfor + do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/xmlwf/xmlwf ${PREFIX}/bin ${MKDIR} ${PREFIX}/include/xml - ${INSTALL_DATA} ${WRKSRC}/xmlparse/xmlparse.h ${PREFIX}/include/xml - ${INSTALL_DATA} ${WRKSRC}/xmltok/xmltok.h ${PREFIX}/include/xml - ${INSTALL_DATA} ${WRKSRC}/libexpat.a ${PREFIX}/lib - ${INSTALL_DATA} ${WRKSRC}/libexpat.so ${PREFIX}/lib/libexpat.so.${SHLIB_MAJOR} - ${LN} -s libexpat.so.${SHLIB_MAJOR} ${PREFIX}/lib/libexpat.so +.for f in ${MAKEFILES} + @(cd ${WRKSRC}; \ + ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${f} ${MAKE_ARGS} ${INSTALL_TARGET}) +.endfor .include Index: distinfo =================================================================== RCS file: /home/ncvs/ports/textproc/expat/distinfo,v retrieving revision 1.1.1.1 diff -u -u -r1.1.1.1 distinfo --- distinfo 1999/08/26 13:45:48 1.1.1.1 +++ distinfo 2000/10/15 17:30:49 @@ -1 +1 @@ -MD5 (expat.zip) = 9111cc7764ff900229d9e51c03f4a593 +MD5 (expat.zip) = e40f2e95ca191f43594d2b5f42cbaf9d Index: files/Makefile.lib =================================================================== RCS file: Makefile.lib diff -N Makefile.lib --- /dev/null Mon Oct 16 03:11:39 2000 +++ Makefile.lib Mon Oct 16 03:00:45 2000 @@ -0,0 +1,24 @@ +# $FreeBSD$ + +LIB= expat +SHLIB_MAJOR?= 1 +SHLIB_MINOR?= 2 + +# If you know what your system's byte order is, define XML_BYTE_ORDER: +# use -DXML_BYTE_ORDER=12 for little-endian byte order; +# use -DXML_BYTE_ORDER=21 for big-endian (network) byte order. +# -DXML_NS adds support for checking of lexical aspects of XML namespaces spec +# -DXML_MIN_SIZE makes a smaller but slower parser +# -DXML_DTD adds full support for parsing DTDs +CFLAGS+= -Wall -I${.CURDIR}/xmltok -I${.CURDIR}/xmlparse -DXML_NS -DXML_DTD + +SRCS= xmltok/xmltok.c \ + xmltok/xmlrole.c \ + xmlparse/xmlparse.c +INCS= xmlparse/xmlparse.h \ + xmltok/xmltok.h +NOMAN= YES +INCDIR= ${LOCALBASE}/include/xml +LIBDIR= ${LOCALBASE}/lib + +.include Index: files/Makefile.prog =================================================================== RCS file: Makefile.prog diff -N Makefile.prog --- /dev/null Mon Oct 16 03:11:39 2000 +++ Makefile.prog Mon Oct 16 03:00:43 2000 @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PROG= xmlwf +SRCS= xmlwf.c \ + xmlfile.c \ + codepage.c \ + unixfilemap.c +CFLAGS+= -I${.CURDIR}/xmltok -I${.CURDIR}/xmlparse +LDADD= -L${.CURDIR} -lexpat +NOMAN= YES +BINDIR= ${LOCALBASE}/bin + +.include Index: files/patch-aa =================================================================== RCS file: patch-aa diff -N patch-aa --- /var/tmp/cvsruMHc16322 Mon Oct 16 03:16:21 2000 +++ /dev/null Mon Oct 16 03:11:39 2000 @@ -1,56 +0,0 @@ ---- Makefile.orig Mon Mar 8 08:20:38 1999 -+++ Makefile Wed Aug 9 04:48:01 2000 -@@ -1,30 +1,30 @@ --CC=gcc - # If you know what your system's byte order is, define XML_BYTE_ORDER: - # use -DXML_BYTE_ORDER=12 for little-endian byte order; - # use -DXML_BYTE_ORDER=21 for big-endian (network) byte order. - # -DXML_NS adds support for checking of lexical aspects of XML namespaces spec - # -DXML_MIN_SIZE makes a smaller but slower parser --CFLAGS=-O2 -Ixmltok -Ixmlparse -DXML_NS -+CFLAGS+=-Ixmltok -Ixmlparse -DXML_NS -fpic - # Use one of the next two lines; unixfilemap is better if it works. - FILEMAP_OBJ=xmlwf/unixfilemap.o - #FILEMAP_OBJ=xmlwf/readfilemap.o - OBJS=xmltok/xmltok.o \ - xmltok/xmlrole.o \ -- xmlwf/xmlwf.o \ -- xmlwf/xmlfile.o \ -- xmlwf/codepage.o \ - xmlparse/xmlparse.o \ - xmlparse/hashtable.o \ - $(FILEMAP_OBJ) -+XOBJS=xmlwf/xmlwf.o \ -+ xmlwf/xmlfile.o \ -+ xmlwf/codepage.o -+ - EXE= - --all: xmlwf/xmlwf$(EXE) -+all: xmlwf/xmlwf$(EXE) libexpat.a libexpat.so - --xmlwf/xmlwf$(EXE): $(OBJS) -- $(CC) $(CFLAGS) -o $@ $(OBJS) -+xmlwf/xmlwf$(EXE): $(XOBJS) libexpat.a -+ $(CC) $(CFLAGS) -o $@ $(XOBJS) -L. -lexpat - - clean: -- rm -f $(OBJS) xmlwf/xmlwf$(EXE) -+ rm -f $(OBJS) $(XOBJS) xmlwf/xmlwf$(EXE) - - xmltok/nametab.h: gennmtab/gennmtab$(EXE) - rm -f $@ -@@ -34,6 +34,13 @@ - $(CC) $(CFLAGS) -o $@ gennmtab/gennmtab.c - - xmltok/xmltok.o: xmltok/nametab.h -+ -+libexpat.a: $(OBJS) -+ ar -rc $@ $(OBJS) -+ ranlib $@ -+ -+libexpat.so: $(OBJS) -+ $(CC) -shared -o $@ $(OBJS) - - .c.o: - $(CC) $(CFLAGS) -c -o $@ $< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message