ports/186257: [patch] www/newsbeuter: fix crash on FreeBSD 10+
Tijl Coosemans
tijl at FreeBSD.org
Wed Jan 29 21:40:01 UTC 2014
>Number: 186257
>Category: ports
>Synopsis: [patch] www/newsbeuter: fix crash on FreeBSD 10+
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Jan 29 21:40:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Tijl Coosemans
>Release: FreeBSD 11.0-CURRENT i386
>Organization:
>Environment:
>Description:
The attached patch fixes www/newsbeuter and devel/stfl on FreeBSD 10.
devel/stfl:
- Fix a crash on FreeBSD 10 by indicating the port uses the WCHAR_T
iconv extension.
- Use more of the port's own build system. This simplifies the
Makefile.
www/newsbeuter:
- Indicate the port uses the //TRANSLIT iconv extension.
- Use OPTIONS_SUB.
>How-To-Repeat:
>Fix:
--- newsbeuter.patch begins here ---
Index: devel/stfl/Makefile
===================================================================
--- devel/stfl/Makefile (revision 341693)
+++ devel/stfl/Makefile (working copy)
@@ -3,6 +3,7 @@
PORTNAME= stfl
PORTVERSION= 0.22
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://www.clifford.at/stfl/
@@ -11,37 +12,30 @@ COMMENT= Structured Terminal Forms Langu
LICENSE= GPLv3
+USES= gmake iconv:wchar_t ncurses
USE_LDCONFIG= yes
-USES= gmake iconv ncurses
-ALL_TARGET= libstfl.so
-PLIST_FILES= lib/libstfl.so.1 lib/libstfl.so include/stfl.h \
- libdata/pkgconfig/stfl.pc
+
+PLIST_FILES= include/stfl.h lib/libstfl.a lib/libstfl.so lib/libstfl.so.0 \
+ lib/libstfl.so.0.22 libdata/pkgconfig/stfl.pc
CFLAGS+= -I${LOCALBASE}/include
-LDLIBS+= -L${LOCALBASE}/lib
-MAKE_ENV= LDLIBS="${LDLIBS}"
+LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB}
+MAKE_ENV= LDLIBS="${LDFLAGS}"
post-patch:
- @${REINPLACE_CMD} -e 's|\.a|.so|g;/ranlib/d;\
- s|ar qc|$${CC} $${CFLAGS} $${LDLIBS} -pthread -shared -fPIC -o|;\
- s|sed -r|sed -E|;s|-Os||;/gcc/d;/-MM/s|-I.|$${CFLAGS}|'\
+ @${REINPLACE_CMD} -e 's|-Os||;/gcc/d;/pkgconfig/s|$$(libdir)|libdata|' \
${WRKSRC}/Makefile
- @${REINPLACE_CMD} -e 's|alloca.h|stdlib.h|' ${WRKSRC}/widgets/*.c
+ @${REINPLACE_CMD} -e '/Libs.private/s|$$| ${ICONV_LIB}|' \
+ ${WRKSRC}/stfl.pc.in
@${REINPLACE_CMD} -e 's|ncursesw/|${NCURSESINC}/|'\
${WRKSRC}/stfl_internals.h
@${ECHO_CMD} 'prefix = ${PREFIX}' > ${WRKSRC}/Makefile.cfg
+ @${ECHO_CMD} 'libdir = lib' >> ${WRKSRC}/Makefile.cfg
pre-build:
@cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV}\
- ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} Makefile.deps
-
-post-build:
- @cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV}\
- ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} stfl.pc
+ ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} Makefile.deps
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/libstfl.so ${STAGEDIR}${PREFIX}/lib/libstfl.so.1
- ${LN} -sf ${PREFIX}/lib/libstfl.so.1 ${STAGEDIR}${PREFIX}/lib/libstfl.so
- ${INSTALL_DATA} ${WRKSRC}/stfl.h ${STAGEDIR}${PREFIX}/include/
- ${INSTALL_DATA} ${WRKSRC}/stfl.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/
+post-install:
+ ${LN} -s libstfl.so.0.22 ${STAGEDIR}${PREFIX}/lib/libstfl.so.0
.include <bsd.port.mk>
Index: www/newsbeuter/Makefile
===================================================================
--- www/newsbeuter/Makefile (revision 341693)
+++ www/newsbeuter/Makefile (working copy)
@@ -3,6 +3,7 @@
PORTNAME= newsbeuter
PORTVERSION= 2.8
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://newsbeuter.org/downloads/
@@ -17,24 +18,16 @@ LIB_DEPENDS= stfl:${PORTSDIR}/devel/stfl
libjson.so:${PORTSDIR}/devel/json-c
OPTIONS_DEFINE= PODCAST
+OPTIONS_DEFAULT=PODCAST
+OPTIONS_SUB= yes
PODCAST_DESC= Podcast client (podbeuter)
-OPTIONS_DEFAULT= PODCAST
-
-USES= gettext iconv ncurses gmake pkgconfig perl5
+USES= gettext gmake iconv:translit ncurses perl5 pkgconfig
USE_PERL5= build
USE_SQLITE= yes
USE_GNOME= libxml2
USE_GCC= any
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MPODCAST}
-PLIST_SUB+= PODCAST=""
-.else
-PLIST_SUB+= PODCAST="@comment "
-.endif
-
post-patch:
${REINPLACE_CMD} -e "s,share/man,man,; \
/^prefix/s|=.*|=${PREFIX}|; /^CXX=/d; \
--- newsbeuter.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list