Date: Tue, 29 Oct 2002 14:49:16 +0000 (UTC) From: "Bjoern A.Zeeb" <bzeeb+freebsdports@zabbadoz.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: "Bjoern A.Zeeb" <bzeeb+freebsdports@zabbadoz.net>, barner@in.tum.de, christopher.kelly@uk.yahoo-inc.com Subject: ports/44590: Update port: textproc/xerces-c2 add transcoder option Message-ID: <20021029144916.5885622E16@mail.int.zabbadoz.net>
next in thread | raw e-mail | index | archive | help
>Number: 44590 >Category: ports >Synopsis: Update port: textproc/xerces-c2 add transcoder option >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Oct 29 07:00:06 PST 2002 >Closed-Date: >Last-Modified: >Originator: Bjoern A. Zeeb >Release: FreeBSD 4.7-RC i386 >Organization: Zabbadoz.NeT >Environment: System: FreeBSD e0-0.zab2.int.zabbadoz.net 4.7-RC FreeBSD 4.7-RC #1: Fri Oct 4 18:45:10 UTC 2002 bz@e0-0.zab2.int.zabbadoz.net:/usr/src/obj/usr/src/RELENG_4/src/sys/ZAB2-2002092701 i386 >Description: on initial checkin transcoder oprtion has not been included because of broken dependencies. an update has been sent via pr (see ports/34265) which has not been applied yet. this update is necessary for another (new) port xalan-c (see ports/44430) to also be able to use ICU. >How-To-Repeat: >Fix: add transcoder option for users to also be able to build with ICU or native iconv support. Default remains libiconv. diff -u /usr/ports/textproc/xerces-c2/Makefile xerces-c2/Makefile --- /usr/ports/textproc/xerces-c2/Makefile Fri Oct 25 02:12:19 2002 +++ xerces-c2/Makefile Tue Oct 29 12:16:13 2002 @@ -7,13 +7,36 @@ PORTNAME= xerces-c2 PORTVERSION= 2.1.0 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= http://xml.apache.org/dist/xerces-c/stable/ DISTNAME= xerces-c-src${PORTVERSION:S/./_/g} MAINTAINER?= bzeeb+freebsdports@zabbadoz.net -LIB_DEPENDS+= iconv.3:${PORTSDIR}/converters/libiconv +.if !defined(TRANSCODER) +LIB_DEPENDS+= iconv.3:${PORTSDIR}/converters/libiconv +TRANSCODER= "IconvFBSD" +PLIST_SUB+= TRANSICONV="" +PLIST_SUB+= TRANSICU="@comment " +.else +.if (${TRANSCODER} == "icu") +LIB_DEPENDS+= icuuc.22:${PORTSDIR}/devel/icu +ICUROOT?= ${LOCALBASE} +CONFIGURE_ENV+= ICUROOT=${ICUROOT} LDFLAGS="-L${LOCALBASE}/lib" +MAKE_ENV+= ICUROOT=${ICUROOT} LDFLAGS="-L${LOCALBASE}/lib" +PLIST_SUB+= TRANSICONV="@comment " +PLIST_SUB+= TRANSICU="" +.elif (${TRANSCODER} == "native") +PLIST_SUB+= TRANSICONV="" +PLIST_SUB+= TRANSICU="@comment " +.else +LIB_DEPENDS+= iconv.3:${PORTSDIR}/converters/libiconv +TRANSCODER= "IconvFBSD" +PLIST_SUB+= TRANSICONV="" +PLIST_SUB+= TRANSICU="@comment " +.endif +.endif # expect this to get broken some day NO_FILTER_SHLIBS= yes @@ -30,18 +53,17 @@ MAKE_ENV+= XERCESCROOT=${WRKSRC} GNU_CONFIGURE= yes -CONFIGURE_ENV+= XERCESCROOT=${WRKSRC} TRANSCODER="IconvFBSD" +CONFIGURE_ENV+= XERCESCROOT=${WRKSRC} TRANSCODER=${TRANSCODER} CONFIGURE_SCRIPT= runConfigure -CONFIGURE_ARGS?= -p freebsd -x g++ -n socket -P ${PREFIX} +CONFIGURE_ARGS?= -p freebsd -c ${CC} -x ${CXX} -n socket -P ${PREFIX} -CONFIGURE_ARGS+= -t IconvFBSD +CONFIGURE_ARGS+= -t ${TRANSCODER} .if defined(NO_THREADS) CONFIGURE_ARGS+= -r none .endif -XERCESC_LIB_VERSIO= ${PORTVERSION:S/.//} -XERCESC_LIB_VERSION= ${XERCESC_LIB_VERSIO:R} +XERCESC_LIB_VERSION= ${PORTVERSION:S/.//:R} XERCESC_LIB= libxerces-c.so.${PORTVERSION:S/.//} PLIST_SUB+= XERCESC_LIB=${XERCESC_LIB} \ XERCESC_LIB_VERSION=${XERCESC_LIB_VERSION} @@ -62,7 +84,7 @@ pre-fetch: .if !defined(BATCH) && !defined(PACKAGE_BUILDING) @(/usr/bin/dialog --textbox ${MASTERDIR}/pkg-message 15 75 || \ - /usr/bin/true) + ${TRUE}) @${ECHO} '' @${ECHO} 'You may use the following build options by defining' @${ECHO} 'them on the command line with -D' @@ -71,6 +93,8 @@ @${ECHO} 'NO_SAMPLES do not copy sample binaries and sources' @${ECHO} 'NOPORTDOCS do not copy documentation' @${ECHO} '' + @${ECHO} 'TRANSCODER=[icu|IconvFBSD|native] default: IconvFBSD' + @${ECHO} '' @/bin/sleep 2 .endif @@ -87,17 +111,24 @@ post-configure: .if !defined(NO_SAMPLES) +.if defined(TRANSCODER) && (${TRANSCODER} == "icu") + @(cd ${WRKSRC}/samples && \ + export XERCESCROOT=${WRKSRC} && \ + export ICUROOT=${ICUROOT} && \ + export LDFLAGS="-L${LOCALBASE}/lib" && \ + ${SH} runConfigure ${SAMPLES_CONFIG_ARGS}) +.else @(cd ${WRKSRC}/samples && \ export XERCESCROOT=${WRKSRC} && \ ${SH} runConfigure ${SAMPLES_CONFIG_ARGS}) .endif +.endif post-install: @${STRIP_CMD} ${PREFIX}/lib/${XERCESC_LIB} @${LN} -sf ${XERCESC_LIB} ${PREFIX}/lib/libxerces-c.so @${LN} -sf ${XERCESC_LIB} \ - ${PREFIX}/lib/libxerces-c.so.${XERCESC_LIB_VERSION:R} - + ${PREFIX}/lib/libxerces-c.so.${XERCESC_LIB_VERSION} .if !defined(NOPORTDOCS) @${MKDIR} ${PREFIX}/share/doc/xerces-c @${CP} -r ${WRKSRC}/doc/ ${PREFIX}/share/doc/xerces-c/ diff -u /usr/ports/textproc/xerces-c2/pkg-plist xerces-c2/pkg-plist --- /usr/ports/textproc/xerces-c2/pkg-plist Fri Oct 25 02:12:19 2002 +++ xerces-c2/pkg-plist Tue Oct 29 11:56:28 2002 @@ -131,7 +131,8 @@ include/xercesc/util/AutoSense.hpp include/xercesc/util/XMLDeleterFor.c include/xercesc/util/Platforms/FreeBSD/FreeBSDDefs.hpp -include/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.hpp +%%TRANSICONV%%include/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.hpp +%%TRANSICU%%include/xercesc/util/Transcoders/ICU/ICUTransService.hpp include/xercesc/util/MsgLoaders/InMemory/InMemMsgLoader.hpp include/xercesc/util/MsgLoaders/InMemory/CppErrMsgs_EN_US.hpp include/xercesc/util/Compilers/BorlandCDefs.hpp @@ -392,7 +393,8 @@ @dirrm include/xercesc/util/Compilers @dirrm include/xercesc/util/MsgLoaders/InMemory @dirrm include/xercesc/util/MsgLoaders -@dirrm include/xercesc/util/Transcoders/IconvFBSD +%%TRANSICONV%%@dirrm include/xercesc/util/Transcoders/IconvFBSD +%%TRANSICU%%@dirrm include/xercesc/util/Transcoders/ICU @dirrm include/xercesc/util/Transcoders @dirrm include/xercesc/util/Platforms/FreeBSD @dirrm include/xercesc/util/Platforms >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20021029144916.5885622E16>