From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Oct 9 22:30:19 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EDBD832B for ; Tue, 9 Oct 2012 22:30:19 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [8.8.178.135]) by mx1.freebsd.org (Postfix) with ESMTP id C56F58FC20 for ; Tue, 9 Oct 2012 22:30:19 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q99MUJiP043553 for ; Tue, 9 Oct 2012 22:30:19 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q99MUJHq043552; Tue, 9 Oct 2012 22:30:19 GMT (envelope-from gnats) Resent-Date: Tue, 9 Oct 2012 22:30:19 GMT Resent-Message-Id: <201210092230.q99MUJHq043552@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Gabor Pali Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 13A77BA6 for ; Tue, 9 Oct 2012 18:48:28 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id F11738FC1B for ; Tue, 9 Oct 2012 18:48:27 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.5/8.14.5) with ESMTP id q99ImR81074165 for ; Tue, 9 Oct 2012 18:48:27 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.5/8.14.5/Submit) id q99ImRkS074164; Tue, 9 Oct 2012 18:48:27 GMT (envelope-from nobody) Message-Id: <201210091848.q99ImRkS074164@red.freebsd.org> Date: Tue, 9 Oct 2012 18:48:27 GMT From: Gabor Pali To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/172539: [textproc/xerces-c2-devel] OptionsNG Conversion X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Oct 2012 22:30:20 -0000 X-List-Received-Date: Tue, 09 Oct 2012 22:30:20 -0000 >Number: 172539 >Category: ports >Synopsis: [textproc/xerces-c2-devel] OptionsNG Conversion >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Oct 09 22:30:19 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Gabor Pali >Release: n/a >Organization: The FreeBSD Project >Environment: n/a >Description: >How-To-Repeat: >Fix: See the attached patch. Patch attached with submission follows: diff --git a/textproc/xerces-c2-devel/Makefile b/textproc/xerces-c2-devel/Makefile index afc7e93..9405de2 100644 --- a/textproc/xerces-c2-devel/Makefile +++ b/textproc/xerces-c2-devel/Makefile @@ -17,21 +17,26 @@ COMMENT= Validating XML parser from the Apache XML Project MAKE_JOBS_UNSAFE= yes -OPTIONS= THREADS "Build a thread enabled shared library." on \ - DEBUG "Include debugging information, do not strip." off \ - ICONVFBSD "Use IconvFBSD transcoder." on \ - ICU "Use ICU transcoder." off \ - NATIVE "Use native transcoder." off +OPTIONS_DEFINE= THREADS DEBUG ICONVFBSD ICU NATIVE +OPTIONS_DEFAULT= THREADS ICONVFBSD -.include +THREADS_DESC= Build a thread enabled shared library +DEBUG_DESC= Include debugging information, do not strip +ICONVFBSD_DESC= Use IconvFBSD transcoder +ICU_DESC= Use ICU transcoder +NATIVE_DESC= Use native transcoder -.if defined(WITH_NATIVE) +.include + +.if ${PORT_OPTIONS:MNATIVE} TRANSCODER= native .endif -.if defined(WITH_ICU) + +.if ${PORT_OPTIONS:MICU} TRANSCODER= icu .endif -.if defined(WITH_ICONVFBSD) + +.if ${PORT_OPTIONS:MICONVFBSD} TRANSCODER= IconvFBSD .endif @@ -84,7 +89,7 @@ CONFIGURE_ARGS+= -p freebsd -c ${CC} -x ${CXX} -n socket -P ${PREFIX} CONFIGURE_ARGS+= -t ${TRANSCODER} -.if defined(WITH_DEBUG) +.if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+= -d .endif @@ -96,11 +101,11 @@ CONFIGURE_ARGS+= -b 64 SAMPLES_CONFIG_ARGS+= -b 64 .endif -.if defined(WITHOUT_THREADS) -CONFIGURE_ARGS+= -r none -.else +.if ${PORT_OPTIONS:MTHREADS} CONFIGURE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" +.else +CONFIGURE_ARGS+= -r none .endif XERCESC_LIB_VERSION= ${PORTVERSION:S/.//:R} @@ -110,24 +115,22 @@ PLIST_SUB+= XERCESC_LIB=${XERCESC_LIB} \ XERCESC_DEPDOM_LIB=${XERCESC_DEPDOM_LIB} \ XERCESC_LIB_VERSION=${XERCESC_LIB_VERSION} -.if !defined(NOPORTEXAMPLES) +.if ${PORT_OPTIONS:MEXAMPLES} ALL_TARGET?= all samples XERCES_BINS?= CreateDOMDocument DOMCount DOMPrint EnumVal MemParse PParse \ PSVIWriter Redirect SAX2Count SAX2Print SAXCount SAXPrint \ SCMPrint SEnumVal StdInParse SAMPLES_CONFIG_ARGS+= -p freebsd -c ${CC} -x ${CXX} -.if defined(WITHOUT_THREADS) -SAMPLES_CONFIG_ARGS+= -r none -.else +.if ${PORT_OPTIONS:MTHREADS} SAMPLES_CONFIG_ARGS+= -r pthread SAMPLES_CONFIG_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" +.else +SAMPLES_CONFIG_ARGS+= -r none .endif .endif -.if !defined(NOPORTDOCS) PORTDOCS= * -.endif SCRIPTS_ENV= WITH_NATIVE="${WITH_NATIVE}" \ WITH_ICU="${WITH_ICU}" \ @@ -149,7 +152,7 @@ pre-configure: @${CHMOD} 700 ${CONFIGURE_WRKSRC}/configure post-configure: -.if !defined(NOPORTEXAMPLES) +.if ${PORT_OPTIONS:MEXAMPLES} .if defined(TRANSCODER) && (${TRANSCODER} == "icu") @(cd ${WRKSRC}/samples && \ ${SETENV} \ @@ -168,11 +171,11 @@ post-configure: .endif post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} @${CP} -r ${WRKSRC}/doc/ ${DOCSDIR} .endif -.if !defined(NOPORTEXAMPLES) +.if ${PORT_OPTIONS:MEXAMPLES} @${MKDIR} ${EXAMPLESDIR} .for i in ${XERCES_BINS} data @${CP} -r ${WRKSRC}/samples/$i ${EXAMPLESDIR} @@ -182,4 +185,4 @@ post-install: .endfor .endif -.include +.include >Release-Note: >Audit-Trail: >Unformatted: