Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 18 Nov 2018 08:51:09 +0000 (UTC)
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r485218 - in head/emulators/gxemul: . files
Message-ID:  <201811180851.wAI8p92d049222@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tobik
Date: Sun Nov 18 08:51:08 2018
New Revision: 485218
URL: https://svnweb.freebsd.org/changeset/ports/485218

Log:
  emulators/gxemul: Update to 0.6.0.2
  
  - Build with Clang
  - Update WWW; the sf.net project is gone
  - vga.h is now included with "../include/vga.h" so the conflict with
    svgalib should be gone
  - Make sure various build dependencies are not accidentally auto-detected
  - Add missing xterm dependency; gxemul tries to run xterm when run
    under X for serial console output
  - Take maintainership
  
  Changes:	http://gavare.se/gxemul/gxemul-stable/doc/RELEASE.html

Added:
  head/emulators/gxemul/files/patch-configure   (contents, props changed)
Deleted:
  head/emulators/gxemul/files/patch-src_include_refcount__ptr.h
Modified:
  head/emulators/gxemul/Makefile
  head/emulators/gxemul/distinfo
  head/emulators/gxemul/pkg-descr

Modified: head/emulators/gxemul/Makefile
==============================================================================
--- head/emulators/gxemul/Makefile	Sun Nov 18 08:01:37 2018	(r485217)
+++ head/emulators/gxemul/Makefile	Sun Nov 18 08:51:08 2018	(r485218)
@@ -2,42 +2,32 @@
 # $FreeBSD$
 
 PORTNAME=	gxemul
-PORTVERSION=	0.6.0.1
-PORTREVISION=	6
+PORTVERSION=	0.6.0.2
 CATEGORIES=	emulators
-MASTER_SITES=	http://gxemul.sourceforge.net/src/ \
-		http://gavare.se/gxemul/src/
+MASTER_SITES=	http://gavare.se/gxemul/src/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	tobik@FreeBSD.org
 COMMENT=	Instruction-level machine emulator
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USE_GCC=	yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--without-unittests
-ALL_TARGET=	build
-MAKE_JOBS_UNSAFE=	yes
+# Avoid auto-detecting Doxygen.  We do not need source code documentation.
+# The handbook is quite comprehensive already.
+BINARY_ALIAS=	doxygen=${FALSE}
+CONFIGURE_ARGS=	--disable-valgrind --without-unittests
+CONFIGURE_ENV=	CXX=${CXX} LOCALBASE=${LOCALBASE} PREFIX=${PREFIX}
 
-# svgalib installs vga.h, which conflicts with gxemul when building with
-# a virtual VGA adaptor.
-CONFLICTS=	svgalib-[0-9]*
-
 PORTDOCS=	*
 PLIST_FILES=	bin/gxemul man/man1/gxemul.1.gz
 
 OPTIONS_DEFINE=		DOCS X11
 OPTIONS_DEFAULT=	X11
 
-X11_USE=		xorg=x11
 X11_CONFIGURE_OFF=	--disable-x
-
-post-patch:
-	@${REINPLACE_CMD} -Ee \
-		's|/usr/X11R6|${LOCALBASE}|g; \
-		 /CXXFLAGS=/s|-O[0-9]?||g; \
-		 /CXXFLAGS=/s|-f[a-zA-Z-]+||g' ${WRKSRC}/configure
+X11_RUN_DEPENDS=	xterm:x11/xterm
+X11_USE=		xorg=x11
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gxemul \

Modified: head/emulators/gxemul/distinfo
==============================================================================
--- head/emulators/gxemul/distinfo	Sun Nov 18 08:01:37 2018	(r485217)
+++ head/emulators/gxemul/distinfo	Sun Nov 18 08:51:08 2018	(r485218)
@@ -1,2 +1,3 @@
-SHA256 (gxemul-0.6.0.1.tar.gz) = 0790823d8d7f8848c98318ace829f7a0159a5f9b79d80bd8c367fb17014dcda9
-SIZE (gxemul-0.6.0.1.tar.gz) = 5420978
+TIMESTAMP = 1542524977
+SHA256 (gxemul-0.6.0.2.tar.gz) = 0a0ceb4b5de6463487b28729d40e8e0a6e76ea955306e97aa5a5c74afaeb6636
+SIZE (gxemul-0.6.0.2.tar.gz) = 5498962

Added: head/emulators/gxemul/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/gxemul/files/patch-configure	Sun Nov 18 08:51:08 2018	(r485218)
@@ -0,0 +1,38 @@
+--- configure.orig	2018-09-06 07:41:13 UTC
++++ configure
+@@ -360,10 +360,10 @@ if [ z$NOX11 = z ]; then
+ 
+ 	XOK=0
+ 
+-	XINCLUDE=-I/usr/X11R6/include
++	XINCLUDE=-I${LOCALBASE}/include
+ 	$CXX $CXXFLAGS _test_x11.cc -c -o _test_x11.o $XINCLUDE 2> /dev/null
+ 
+-	XLIB="-L/usr/X11R6/lib -lX11"
++	XLIB="-L${LOCALBASE}/lib -lX11"
+ 	$CXX $CXXFLAGS _test_x11.o -o _test_x11 $XLIB 2> /dev/null
+ 
+ 	if [ -x _test_x11 ]; then
+@@ -578,22 +578,6 @@ else
+ 	fi
+ fi
+ rm -f _testprog _testprog.error _testprog.stdout
+-
+-
+-#  -O optimization for non-debug builds. Try -O and -O3.
+-if [ ! z"$DEBUG" = zYES ]; then
+-	$CXX $CXXFLAGS -O _testprog.cc -o _testprog 2> /dev/null
+-	if [ -x _testprog ]; then
+-		rm -f _testprog
+-		$CXX $CXXFLAGS -O3 _testprog.cc -o _testprog 2> /dev/null
+-		if [ -x _testprog ]; then
+-			CXXFLAGS="-O3 $CXXFLAGS"
+-		else
+-			CXXFLAGS="-O $CXXFLAGS"
+-		fi
+-	fi
+-fi
+-rm -f _testprog
+ 
+ 
+ #  -fpeephole

Modified: head/emulators/gxemul/pkg-descr
==============================================================================
--- head/emulators/gxemul/pkg-descr	Sun Nov 18 08:01:37 2018	(r485217)
+++ head/emulators/gxemul/pkg-descr	Sun Nov 18 08:51:08 2018	(r485218)
@@ -17,4 +17,4 @@ emulated well enough to run at least one "guest OS":
  * SuperH: Sega Dreamcast (NetBSD/dreamcast, Linux/dreamcast),
    Landisk (OpenBSD/landisk)
 
-WWW: http://gxemul.sourceforge.net/
+WWW: http://gavare.se/gxemul/



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