Bug 95118
| Summary: | [UPDATE patch]textproc/xerces-c2 to 2.7.0 | ||||||
|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Ken Menzel <kenm> | ||||
| Component: | Individual Port(s) | Assignee: | freebsd-ports-bugs (Nobody) <ports-bugs> | ||||
| Status: | Closed FIXED | ||||||
| Severity: | Affects Only Me | ||||||
| Priority: | Normal | ||||||
| Version: | Latest | ||||||
| Hardware: | Any | ||||||
| OS: | Any | ||||||
| Attachments: |
|
||||||
Please note the following corrections my e-mail is kenm@icarz.com +CATEGORIES= local should be +CATEGORIES= textproc and the PORTNAME can remain unchanged. I will be submitting a new port for p5-xerces-p the perl interface to this library. I have it ready (with the correct name and category). Sorry for the mistake, this is my first port submission. Ken ----------------------------------------------------- Ken Menzel ICQ# 9325188 www.icarz.com kenm@icarz.com /earth is 98% full ... please delete anyone you can. I have placed a complete diff and a complete shar and tar of the xerces-c2 port on http://www.kodem.com/ports (My personal website). I have completed the diff for the pkg-plist and distinfo (Thanks to Bjoern A. Zeeb for the guidance and tips). This should complete the files needed and I have tested the port in many configurations on 4.11 and 6.0 and will be rolling into my production environment this week. Final diffs for corrected Makefile, pkg-plist and distinfo (also posted on http://www.kodem.com/ports/index.html ) --- Makefile.orig Mon Apr 3 23:47:00 2006 +++ Makefile Mon Apr 3 13:50:58 2006 @@ -6,8 +6,8 @@ # PORTNAME= xerces-c2 -PORTVERSION= 2.6.0 -PORTREVISION= 1 +PORTVERSION= 2.7.0 +PORTREVISION= 0 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_APACHE_XML} MASTER_SITE_SUBDIR= xerces-c/source --- distinfo.orig Mon Apr 3 23:37:57 2006 +++ distinfo Mon Apr 3 13:50:58 2006 @@ -1,3 +1,3 @@ -MD5 (xerces-c-src_2_6_0.tar.gz) = 038b3614ae82d2878bcc820b9ccbe853 -SHA256 (xerces-c-src_2_6_0.tar.gz) = 2822d8c757e9533a7b2328b65a2e2485a329bfe50b88c0a5af5061e7e3d28cef -SIZE (xerces-c-src_2_6_0.tar.gz) = 9324884 +MD5 (xerces-c-src_2_7_0.tar.gz) = 04169609449a8846bc1e6891c04cadf4 +SHA256 (xerces-c-src_2_7_0.tar.gz) = 77fae8a1e7aa58007115c939aa68fd5028da79c481fc457dfce546b50c9dfda5 +SIZE (xerces-c-src_2_7_0.tar.gz) = 7760004 --- pkg-plist.orig Mon Apr 3 23:38:41 2006 +++ pkg-plist Mon Apr 3 13:50:58 2006 @@ -159,18 +159,17 @@ include/xercesc/internal/XMLReader.hpp include/xercesc/internal/XMLScanner.hpp include/xercesc/internal/XMLScannerResolver.hpp -include/xercesc/internal/XObjectComparator.hpp include/xercesc/internal/XProtoType.hpp include/xercesc/internal/XSAXMLScanner.hpp include/xercesc/internal/XSObjectFactory.hpp include/xercesc/internal/XSerializable.hpp include/xercesc/internal/XSerializationException.hpp include/xercesc/internal/XSerializeEngine.hpp -include/xercesc/internal/XTemplateComparator.hpp include/xercesc/internal/XTemplateSerializer.hpp include/xercesc/parsers/AbstractDOMParser.hpp include/xercesc/parsers/DOMBuilderImpl.hpp include/xercesc/parsers/SAX2XMLReaderImpl.hpp +include/xercesc/parsers/SAX2XMLFilterImpl.hpp include/xercesc/parsers/SAXParser.hpp include/xercesc/parsers/XercesDOMParser.hpp include/xercesc/sax/AttributeList.hpp @@ -190,6 +189,7 @@ include/xercesc/sax2/DefaultHandler.hpp include/xercesc/sax2/LexicalHandler.hpp include/xercesc/sax2/SAX2XMLReader.hpp +include/xercesc/sax2/SAX2XMLFilter.hpp include/xercesc/sax2/XMLReaderFactory.hpp include/xercesc/util/ArrayIndexOutOfBoundsException.hpp include/xercesc/util/AutoSense.hpp @@ -313,8 +313,11 @@ include/xercesc/util/XMLExceptMsgs.hpp include/xercesc/util/XMLException.hpp include/xercesc/util/XMLFloat.hpp +include/xercesc/util/XMLHolder.c +include/xercesc/util/XMLHolder.hpp include/xercesc/util/XMLIBM1047Transcoder.hpp include/xercesc/util/XMLIBM1140Transcoder.hpp +include/xercesc/util/XMLInitializer.hpp include/xercesc/util/XMLInteger.hpp include/xercesc/util/XMLMsgLoader.hpp include/xercesc/util/XMLNetAccessor.hpp @@ -570,6 +573,8 @@ %%NO_SAMPLES%%%%EXAMPLESDIR%%/SAX2Print/SAX2Print.hpp %%NO_SAMPLES%%%%EXAMPLESDIR%%/SAX2Print/SAX2PrintHandlers.cpp %%NO_SAMPLES%%%%EXAMPLESDIR%%/SAX2Print/SAX2PrintHandlers.hpp +%%NO_SAMPLES%%%%EXAMPLESDIR%%/SAX2Print/SAX2FilterHandlers.cpp +%%NO_SAMPLES%%%%EXAMPLESDIR%%/SAX2Print/SAX2FilterHandlers.hpp %%NO_SAMPLES%%%%EXAMPLESDIR%%/SAXCount/Makefile %%NO_SAMPLES%%%%EXAMPLESDIR%%/SAXCount/Makefile.in %%NO_SAMPLES%%%%EXAMPLESDIR%%/SAXCount/SAXCount.cpp ----------------------------------------------------- Ken Menzel ICQ# 9325188 www.icarz.com kenm@icarz.com /earth is 98% full ... please delete anyone you can. Hi,
I have done some more compile time testing and tried some
of the sample applications using the ports-src tabrall
from your webpage.
I needed the following patch to get it working with ICU
(basically I have been told the extra patch should not
be needed but our system seems to be broken) and make
portlint more happy.
plist was fine for all combinations tried. Good work!
Maybe you want to take MAINTAINERship too?
Someone should pick this up and commit the update.
Greetings
Bjoern
diff -uprN xerces-c2.orig/Makefile xerces-c2/Makefile
--- xerces-c2.orig/Makefile Mon Apr 3 17:48:03 2006
+++ xerces-c2/Makefile Thu Apr 6 18:55:32 2006
@@ -7,7 +7,6 @@
PORTNAME= xerces-c2
PORTVERSION= 2.7.0
-PORTREVISION= 0
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_APACHE_XML}
MASTER_SITE_SUBDIR= xerces-c/source
@@ -47,7 +46,7 @@ PLIST_SUB+= TRANSICU="@comment "
.else
.if (${TRANSCODER} == "icu")
PKGNAMESUFFIX+= -icu
-LIB_DEPENDS+= icuuc.32:${PORTSDIR}/devel/icu
+LIB_DEPENDS+= icuuc.34:${PORTSDIR}/devel/icu
ICUROOT?= ${LOCALBASE}
CONFIGURE_ENV+= ICUROOT=${ICUROOT}
MAKE_ENV+= ICUROOT=${ICUROOT}
@@ -77,7 +76,6 @@ CONFIGURE_WRKSRC= ${XERCESWRKSRC}
BUILD_WRKSRC= ${XERCESWRKSRC}
INSTALL_WRKSRC= ${XERCESWRKSRC}
-USE_REINPLACE= yes
USE_GMAKE= yes
MAKE_ENV+= XERCESCROOT=${WRKSRC}
diff -uprN xerces-c2.orig/files/patch-ac xerces-c2/files/patch-ac
--- xerces-c2.orig/files/patch-ac Thu Jan 1 00:00:00 1970
+++ xerces-c2/files/patch-ac Thu Apr 6 18:47:54 2006
@@ -0,0 +1,11 @@
+--- src/xercesc/Makefile.incl.orig Thu Apr 6 18:47:19 2006
++++ src/xercesc/Makefile.incl Thu Apr 6 18:47:37 2006
+@@ -411,7 +411,7 @@ MAKE_SHARED = ${CXX} -D${PLATFORM} -shar
+ MAKE_SHARED_C = ${CC} -D${PLATFORM} -shared -fPIC ${LDFLAGS}
+ ifeq (${TRANSCODER}, ICU)
+ PLATFORM_COMPILE_OPTIONS = -fPIC -D${PLATFORM} -I/usr/local/include
+- ALLLIBS = ${LIBS} -L/usr/local/lib -L${ICUROOT} -licuuc -licudata -lgcc
++ ALLLIBS = ${LIBS} -L/usr/local/lib -L${ICUROOT} -licuuc -licudata -lgcc_pic
+ else
+ PLATFORM_COMPILE_OPTIONS = -fPIC -D${PLATFORM}
+ ALLLIBS = ${LIBS}
> Hi, > > I have done some more compile time testing and tried some > of the sample applications using the ports-src tabrall > from your webpage. Thanks! > > I needed the following patch to get it working with ICU > (basically I have been told the extra patch should not > be needed but our system seems to be broken) and make > portlint more happy. > I did not try the ICU transcoder. I am not completely sure what the differences are in the transcoders. I am happy to add this to the my complete patch on the website. I am traveling, so it would be good if I can add this on monday (perhaps over the weekend?) > plist was fine for all combinations tried. Good work! > Maybe you want to take MAINTAINERship too? That would be fine with me since we use it and need it. > Someone should pick this up and commit the update. How do we get that to happen! > diff -uprN xerces-c2.orig/Makefile xerces-c2/Makefile > --- xerces-c2.orig/Makefile Mon Apr 3 17:48:03 2006 > +++ xerces-c2/Makefile Thu Apr 6 18:55:32 2006 > @@ -7,7 +7,6 @@ > > PORTNAME= xerces-c2 > PORTVERSION= 2.7.0 > -PORTREVISION= 0 > CATEGORIES= textproc > MASTER_SITES= ${MASTER_SITE_APACHE_XML} > MASTER_SITE_SUBDIR= xerces-c/source > @@ -47,7 +46,7 @@ PLIST_SUB+= TRANSICU="@comment " > .else > .if (${TRANSCODER} == "icu") > PKGNAMESUFFIX+= -icu > -LIB_DEPENDS+= icuuc.32:${PORTSDIR}/devel/icu > +LIB_DEPENDS+= icuuc.34:${PORTSDIR}/devel/icu > ICUROOT?= ${LOCALBASE} > CONFIGURE_ENV+= ICUROOT=${ICUROOT} > MAKE_ENV+= ICUROOT=${ICUROOT} > @@ -77,7 +76,6 @@ CONFIGURE_WRKSRC= ${XERCESWRKSRC} > BUILD_WRKSRC= ${XERCESWRKSRC} > INSTALL_WRKSRC= ${XERCESWRKSRC} > > -USE_REINPLACE= yes > USE_GMAKE= yes > MAKE_ENV+= XERCESCROOT=${WRKSRC} > > diff -uprN xerces-c2.orig/files/patch-ac xerces-c2/files/patch-ac > --- xerces-c2.orig/files/patch-ac Thu Jan 1 00:00:00 1970 > +++ xerces-c2/files/patch-ac Thu Apr 6 18:47:54 2006 > @@ -0,0 +1,11 @@ > +--- src/xercesc/Makefile.incl.orig Thu Apr 6 18:47:19 2006 > ++++ src/xercesc/Makefile.incl Thu Apr 6 18:47:37 2006 > +@@ -411,7 +411,7 @@ MAKE_SHARED = ${CXX} -D${PLATFORM} -shar > + MAKE_SHARED_C = ${CC} -D${PLATFORM} -shared -fPIC ${LDFLAGS} > + ifeq (${TRANSCODER}, ICU) > + PLATFORM_COMPILE_OPTIONS > = -fPIC -D${PLATFORM} -I/usr/local/include > +- ALLLIBS = > ${LIBS} -L/usr/local/lib -L${ICUROOT} -licuuc -licudata -lgcc > ++ ALLLIBS = > ${LIBS} -L/usr/local/lib -L${ICUROOT} -licuuc -licudata -lgcc_pic > + else > + PLATFORM_COMPILE_OPTIONS = -fPIC -D${PLATFORM} > + ALLLIBS = ${LIBS} State Changed From-To: open->feedback Please post the final version of the patch, either here or on some web-site. Cheers, Volker State Changed From-To: feedback->open Submitter address bounces State Changed From-To: open->feedback Try to assign to valid originator address. The latest update is at http://www.kodem.com/ports/ my personal website. It is posted as a shar, a tar and a diff and inlcudes Bjoern's requested changes. This site also has the perl port. Bjoern has asked for the name to be changed if you also this that is a good idea I will do that as well. Ken ----------------------------------------------------- Ken Menzel ICQ# 9325188 www.icarz.com kenm@icarz.com /earth is 98% full ... please delete anyone you can. State Changed From-To: feedback->open Feedback received. State Changed From-To: open->closed Committed, with minor changes. Thanks! |
Upgrade of textproc/xerces-c2 to 2.7.0 from 2.6.0 Fix: I would suggest renaming patch-ab to patch-obj-Makefile.in to follow current standards -PORTNAME= xerces-c2 -PORTVERSION= 2.6.0 -PORTREVISION= 1 -CATEGORIES= textproc +PORTNAME= xerces-c2.7 +PORTVERSION= 2.7.0 +PORTREVISION= 0 +CATEGORIES= local MASTER_SITES= ${MASTER_SITE_APACHE_XML} MASTER_SITE_SUBDIR= xerces-c/source DISTNAME= xerces-c-src_${PORTVERSION:S/./_/g} $(CP) ${FQ_REAL_DEPDOM} ${DESTDIR}$(PREFIX)/lib -- (cd ${DESTDIR}$(PREFIX)/lib; ln -s ${REAL_DEPDOM} ${SO_DEPDOM}; ln -s ${REAL_DEPDOM} ${LINK_DEPDOM}) -+ (cd ${DESTDIR}$(PREFIX)/lib; ln -sf ${REAL_DEPDOM} ${SO_DEPDOM}; ln -sf ${REAL_DEPDOM} ${LINK_DEPDOM}) +- (cd ${DESTDIR}$(PREFIX)/lib; rm -f ${SO_DEPDOM}; ln -s ${REAL_DEPDOM} ${SO_DEPDOM}; rm -f ${LINK_DEPDOM}; ln -s ${REAL_DEPDOM} ${LINK_DEPDOM}) ++ (cd ${DESTDIR}$(PREFIX)/lib; rm -f ${SO_DEPDOM}; ln -sf ${REAL_DEPDOM} ${SO_DEPDOM}; rm -f ${LINK_DEPDOM}; ln -sf ${REAL_DEPDOM} ${LINK_DEPDOM}) endif ifeq (${PLATFORM},OS390) $(CP) ${LIBNAME}${VER}${OS390SIDEDECK} ${DESTDIR}$(PREFIX)/lib--7lAu3oqZ1jPRbXH2IfsWVzGJojEu5V1yBuTGfH01psURMB9d Content-Type: text/plain; name="file.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="file.diff" --- Makefiletextproc/.orig Thu Mar 30 10:33:00 2006 +++ Makefile Wed Mar 29 11:29:30 2006 @@ -5,10 +5,10 @@ # $FreeBSD: ports/textproc/xerces-c2/Makefile,v 1.19 2006/01/26 10:15:40 garga Exp $ # How-To-Repeat: Upgrade of textproc/xerces-c2 to 2.7.0 from 2.6.0