From owner-svn-ports-all@freebsd.org Sat Feb 27 23:25:00 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 05476557B8A; Sat, 27 Feb 2021 23:25:00 +0000 (UTC) (envelope-from mi@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Dp2gH6kkSz4XGt; Sat, 27 Feb 2021 23:24:59 +0000 (UTC) (envelope-from mi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D61982624A; Sat, 27 Feb 2021 23:24:59 +0000 (UTC) (envelope-from mi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 11RNOxin016942; Sat, 27 Feb 2021 23:24:59 GMT (envelope-from mi@FreeBSD.org) Received: (from mi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 11RNOxCa016940; Sat, 27 Feb 2021 23:24:59 GMT (envelope-from mi@FreeBSD.org) Message-Id: <202102272324.11RNOxCa016940@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mi set sender to mi@FreeBSD.org using -f From: Mikhail Teterin Date: Sat, 27 Feb 2021 23:24:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r566738 - in head/textproc/rxp: . files X-SVN-Group: ports-head X-SVN-Commit-Author: mi X-SVN-Commit-Paths: in head/textproc/rxp: . files X-SVN-Commit-Revision: 566738 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Feb 2021 23:25:00 -0000 Author: mi Date: Sat Feb 27 23:24:58 2021 New Revision: 566738 URL: https://svnweb.freebsd.org/changeset/ports/566738 Log: Make the character-width an option -- 16 or 8 bit -- defaulting to 8. Remove the second listing of http.c from the library's makefile, which kept it from building on i386, but not -- for some reason -- on am64. Modified: head/textproc/rxp/Makefile head/textproc/rxp/files/BSDmakefile.lib head/textproc/rxp/files/BSDmakefile.rxp Modified: head/textproc/rxp/Makefile ============================================================================== --- head/textproc/rxp/Makefile Sat Feb 27 22:34:16 2021 (r566737) +++ head/textproc/rxp/Makefile Sat Feb 27 23:24:58 2021 (r566738) @@ -3,7 +3,7 @@ PORTNAME= rxp PORTVERSION= 1.4.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc MASTER_SITES= ftp://ftp.cogsci.ed.ac.uk/pub/richard/ @@ -18,6 +18,14 @@ USE_LDCONFIG= yes PATCH_WRKSRC= ${WRKSRC}/${PORTNAME}-${PORTVERSION} WRKSRC= ${WRKDIR} MAKE_ARGS+= VPATH=${PATCH_WRKSRC} + +OPTIONS_SINGLE= CHAR_SIZE +OPTIONS_SINGLE_CHAR_SIZE=8 16 +OPTIONS_DEFAULT=8 +8_DESC= 8-bit characters (required by speech_tools, festival) +16_DESC= 16-bit characters + +MAKE_ARGS+= CHAR_SIZE=${PORT_OPTIONS:C/[^0-9]//g} do-configure: .for s in lib rxp Modified: head/textproc/rxp/files/BSDmakefile.lib ============================================================================== --- head/textproc/rxp/files/BSDmakefile.lib Sat Feb 27 22:34:16 2021 (r566737) +++ head/textproc/rxp/files/BSDmakefile.lib Sat Feb 27 23:24:58 2021 (r566738) @@ -3,14 +3,14 @@ SHLIB_MAJOR= 1 SHLIB_MINOR= 4 MK_PROFILE= no -CFLAGS+= -DCHAR_SIZE=16 -DHAVE_LIBZ +CFLAGS+= -DCHAR_SIZE=${CHAR_SIZE} -DHAVE_LIBZ CFLAGS+= -Werror WARNS= 6 LDADD= -lz SRCS= catalog.c catutil.c resolve.c entityopener.c xmlparser.c \ url.c charset.c ctype16.c dtd.c input.c stdio16.c string16.c \ - system.c hash.c version.c namespaces.c http.c http.c \ + system.c hash.c version.c namespaces.c http.c \ nf16check.c nf16data.c INCS= charset.h ctype16.h dtd.h hash.h input.h namespaces.h \ rxputil.h stdio16.h string16.h system.h url.h version.h \ @@ -20,3 +20,7 @@ LIBDIR= ${PREFIX}/lib INCSDIR=${PREFIX}/include/rxp .include + +.if ${CHAR_SIZE} == 8 +CFLAGS+= -Wno-unused-label +.endif Modified: head/textproc/rxp/files/BSDmakefile.rxp ============================================================================== --- head/textproc/rxp/files/BSDmakefile.rxp Sat Feb 27 22:34:16 2021 (r566737) +++ head/textproc/rxp/files/BSDmakefile.rxp Sat Feb 27 23:24:58 2021 (r566738) @@ -1,7 +1,7 @@ PROG= rxp SRCS= rxp.c infoset-print.c -CFLAGS+= -DCHAR_SIZE=16 -DHAVE_LIBZ +CFLAGS+= -DCHAR_SIZE=${CHAR_SIZE} -DHAVE_LIBZ CFLAGS+= -Werror WARNS= 6