Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 3 Jan 2014 22:50:14 +0000 (UTC)
From:      Danilo Egea Gondolfo <danilo@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r338588 - in head/devel/rhtvision: . files
Message-ID:  <201401032250.s03MoE6G084572@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danilo
Date: Fri Jan  3 22:50:14 2014
New Revision: 338588
URL: http://svnweb.freebsd.org/changeset/ports/338588

Log:
  - Update from 2.1.0 to 2.2.1.1
  - Update MASTER_SITES
  - Add X11 and NLS options
  - Convert USE_GMAKE to USES
  - Add shebangfix to USES
  - Add USE_GCC due an dependency of GCC header files (e.g stdio_filebuf.h)
  
  while here
  - Convert "if's" in options helpers
  
  PR:		ports/185329
  Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

Added:
  head/devel/rhtvision/files/patch-classes__x11__x11src.cc   (contents, props changed)
Modified:
  head/devel/rhtvision/Makefile
  head/devel/rhtvision/distinfo   (contents, props changed)
  head/devel/rhtvision/pkg-plist   (contents, props changed)

Modified: head/devel/rhtvision/Makefile
==============================================================================
--- head/devel/rhtvision/Makefile	Fri Jan  3 22:41:45 2014	(r338587)
+++ head/devel/rhtvision/Makefile	Fri Jan  3 22:50:14 2014	(r338588)
@@ -2,49 +2,42 @@
 # $FreeBSD$
 
 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
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=${PREFIX}
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+USES=		gmake perl5 shebangfix
+SHEBANG_FILES=	config.pl confignt.pl conflib.pl linux/compress
+USE_GCC=	yes
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--prefix=${STAGEDIR}${PREFIX} \
+		--real-prefix=${PREFIX} \
+		--no-libs-here
+USE_LDCONFIG=	yes
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=	gettext
-.endif
-
-.if ${PORT_OPTIONS:MX11}
-USE_XORG=	x11 xrender xmu sm xt ice
-PLIST_SUB+=	X11_ONLY=""
 CFLAGS+=	-I${LOCALBASE}/include
-.else
-PLIST_SUB+=	X11_ONLY="@comment "
+LDFLAGS+=	-L${LOCALBASE}/lib
+
+PLIST_SUB=	VERSION="${PORTVERSION:R}"
+
+NLS_USES=		gettext
+NLS_CONFIGURE_OFF=	--no-intl
+
+X11_USE=		XORG=x11,xmu
+X11_CONFIGURE_ON=	--x-include=${LOCALBASE}/include \
+			--x-lib=${LOCALBASE}/lib
+X11_CONFIGURE_OFF=	--X11lib=no
 
-pre-configure:
-	${ECHO} "HAVE_X11 => no" > ${WRKSRC}/configure.cache
-.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>

Modified: head/devel/rhtvision/distinfo
==============================================================================
--- head/devel/rhtvision/distinfo	Fri Jan  3 22:41:45 2014	(r338587)
+++ head/devel/rhtvision/distinfo	Fri Jan  3 22:50:14 2014	(r338588)
@@ -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

Added: head/devel/rhtvision/files/patch-classes__x11__x11src.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/rhtvision/files/patch-classes__x11__x11src.cc	Fri Jan  3 22:50:14 2014	(r338588)
@@ -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

Modified: head/devel/rhtvision/pkg-plist
==============================================================================
--- head/devel/rhtvision/pkg-plist	Fri Jan  3 22:41:45 2014	(r338587)
+++ head/devel/rhtvision/pkg-plist	Fri Jan  3 22:50:14 2014	(r338588)
@@ -145,20 +145,20 @@ include/rhtvision/tv/video.h
 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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401032250.s03MoE6G084572>