svn commit: r566738 - in head/textproc/rxp: . files
Mikhail Teterin
mi at FreeBSD.org
Sat Feb 27 23:25:00 UTC 2021
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 <bsd.lib.mk>
+
+.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
More information about the svn-ports-all
mailing list