Date: Tue, 31 Dec 2013 05:46:53 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/185329: devel/rhtvision: Update to version 2.2.1.1 Message-ID: <20131231054653.953059acb383fd4c724d1c8b@yahoo.com> Resent-Message-ID: <201312302110.rBULA68o098753@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 185329
>Category: ports
>Synopsis: devel/rhtvision: Update to version 2.2.1.1
>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: Mon Dec 30 21:10:06 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 8.4-RELEASE-p4 i386
>Organization:
>Environment:
>Description:
- Update to version 2.2.1.1
New file:
files/patch-classes__x11__x11src.cc
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/devel/rhtvision/Makefile devel/rhtvision/Makefile
--- /usr/ports/devel/rhtvision/Makefile 2013-11-06 21:50:02.000000000 +0900
+++ devel/rhtvision/Makefile 2013-12-31 00:00:00.000000000 +0900
@@ -2,49 +2,50 @@
# $FreeBSD: head/devel/rhtvision/Makefile 327726 2013-09-20 17:17:44Z bapt $
PORTNAME= rhtvision
-PORTVERSION= 2.1.0
-PORTREVISION= 1
+PORTVERSION= 2.2.1.1
CATEGORIES= devel
-MASTER_SITES= SF/tvision/UNIX/${PORTVERSION}%20CVS20070425%20Source%20and%20Debian%204.0/
-DISTNAME= rhtvision-${PORTVERSION}-3.src
+MASTER_SITES= SF/tvision/UNIX/${PORTVERSION:R}%20CVS20100714%20Source%20and%20Debian%205.0
+DISTNAME= ${PORTNAME}_${PORTVERSION:R}-${PORTVERSION:E}
MAINTAINER= ports@FreeBSD.org
COMMENT= Complete C++ Text User Interface (TUI) library
+OPTIONS_DEFINE= NLS X11
+OPTIONS_SUB= yes
+
WRKSRC= ${WRKDIR}/tvision
-USES= perl5
-USE_GMAKE= yes
-USE_LDCONFIG= yes
+
+USES= gmake perl5 shebangfix
+SHEBANG_FILES= config.pl confignt.pl conflib.pl linux/compress
+USE_GCC= any
HAS_CONFIGURE= yes
-CONFIGURE_ARGS= --prefix=${PREFIX}
+CONFIGURE_ARGS= --prefix=${STAGEDIR}${PREFIX} \
+ --real-prefix=${PREFIX} \
+ --no-libs-here
+USE_LDCONFIG= yes
+
+CFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
+
+PLIST_SUB= VERSION="${PORTVERSION:R}"
-NO_STAGE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USES+= gettext
+USES+= gettext
+.else
+CONFIGURE_ARGS+=--no-intl
.endif
.if ${PORT_OPTIONS:MX11}
-USE_XORG= x11 xrender xmu sm xt ice
-PLIST_SUB+= X11_ONLY=""
-CFLAGS+= -I${LOCALBASE}/include
+USE_XORG= x11 xmu
+CONFIGURE_ARGS+=--x-include=${LOCALBASE}/include \
+ --x-lib=${LOCALBASE}/lib
.else
-PLIST_SUB+= X11_ONLY="@comment "
-
-pre-configure:
- ${ECHO} "HAVE_X11 => no" > ${WRKSRC}/configure.cache
+CONFIGURE_ARGS+=--X11lib=no
.endif
-post-patch:
-.for f in config.pl confignt.pl conflib.pl linux/compress Makefile.in
- @${REINPLACE_CMD} -e 's,/usr/bin/perl,${PERL5},g' \
- -e 's,/usr/local,${LOCALBASE},g' \
- -e 's,/usr/X11R6,${LOCALBASE},g' \
- -e 's,\(soname.*\)Version,\1VersionMajor,g' \
- -e 's/\tmake/\t\\$$(MAKE)/g' \
- -e 's/ make/ $$(MAKE)/g' \
- ${WRKSRC}/${f}
-.endfor
+post-install:
+ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/rhtv-config
.include <bsd.port.mk>
diff -urN /usr/ports/devel/rhtvision/distinfo devel/rhtvision/distinfo
--- /usr/ports/devel/rhtvision/distinfo 2013-11-06 21:50:02.000000000 +0900
+++ devel/rhtvision/distinfo 2013-12-31 00:00:00.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (rhtvision-2.1.0-3.src.tar.gz) = a33d3e47012b8cc95fc7b195abdb605697169889f3a1557d819e3676cd8c732a
-SIZE (rhtvision-2.1.0-3.src.tar.gz) = 1107627
+SHA256 (rhtvision_2.2.1-1.tar.gz) = 30cc531c47f26341e4b7943d6493c5c988c40aac5cfaacdcb4a1f0d62e003aab
+SIZE (rhtvision_2.2.1-1.tar.gz) = 1743432
diff -urN /usr/ports/devel/rhtvision/files/patch-classes__x11__x11src.cc devel/rhtvision/files/patch-classes__x11__x11src.cc
--- /usr/ports/devel/rhtvision/files/patch-classes__x11__x11src.cc 1970-01-01 09:00:00.000000000 +0900
+++ devel/rhtvision/files/patch-classes__x11__x11src.cc 2013-12-31 00:00:00.000000000 +0900
@@ -0,0 +1,10 @@
+--- classes/x11/x11src.cc.orig
++++ classes/x11/x11src.cc
+@@ -49,6 +49,7 @@
+ #define Uses_signal
+ #define Uses_fcntl // open
+ #define Uses_snprintf
++#define Uses_sys_stat
+ #define Uses_AllocLocal
+ #define Uses_TDisplay
+ #define Uses_TScreen
diff -urN /usr/ports/devel/rhtvision/pkg-plist devel/rhtvision/pkg-plist
--- /usr/ports/devel/rhtvision/pkg-plist 2013-11-06 21:50:02.000000000 +0900
+++ devel/rhtvision/pkg-plist 2013-12-31 00:00:00.000000000 +0900
@@ -145,20 +145,20 @@
include/rhtvision/tv/view.h
include/rhtvision/tv/views.h
include/rhtvision/tv/window.h
-%%X11_ONLY%%include/rhtvision/tv/x11/key.h
-%%X11_ONLY%%include/rhtvision/tv/x11/mouse.h
-%%X11_ONLY%%include/rhtvision/tv/x11/screen.h
+%%X11%%include/rhtvision/tv/x11/key.h
+%%X11%%include/rhtvision/tv/x11/mouse.h
+%%X11%%include/rhtvision/tv/x11/screen.h
include/rhtvision/tv/yes_mss.h
-%%X11_ONLY%%@dirrm include/rhtvision/tv/x11
-@dirrm include/rhtvision/tv/linux
-@dirrm include/rhtvision/tv
-@dirrm include/rhtvision/cl
-@dirrm include/rhtvision
lib/librhtv.a
lib/librhtv.so
lib/librhtv.so.2
-lib/librhtv.so.2.1.0
+lib/librhtv.so.%%VERSION%%
lib/libtvfintl.a
-share/locale/es/LC_MESSAGES/tvision2.1.0.mo
-share/locale/pl/LC_MESSAGES/tvision2.1.0.mo
-share/locale/ru/LC_MESSAGES/tvision2.1.0.mo
+%%NLS%%share/locale/es/LC_MESSAGES/tvision%%VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/tvision%%VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/tvision%%VERSION%%.mo
+%%X11%%@dirrm include/rhtvision/tv/x11
+@dirrm include/rhtvision/tv/linux
+@dirrm include/rhtvision/tv
+@dirrm include/rhtvision/cl
+@dirrm include/rhtvision
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131231054653.953059acb383fd4c724d1c8b>