Index: head/emulators/gxemul/Makefile =================================================================== --- head/emulators/gxemul/Makefile (revision 485217) +++ head/emulators/gxemul/Makefile (revision 485218) @@ -1,53 +1,43 @@ # Created by: Janni # $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 \ ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/man/gxemul.1 \ ${STAGEDIR}${MAN1PREFIX}/man/man1 do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} @(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . \ ${STAGEDIR}${DOCSDIR}) .include Index: head/emulators/gxemul/distinfo =================================================================== --- head/emulators/gxemul/distinfo (revision 485217) +++ head/emulators/gxemul/distinfo (revision 485218) @@ -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 Index: head/emulators/gxemul/files/patch-src_include_refcount__ptr.h =================================================================== --- head/emulators/gxemul/files/patch-src_include_refcount__ptr.h (revision 485217) +++ head/emulators/gxemul/files/patch-src_include_refcount__ptr.h (nonexistent) @@ -1,11 +0,0 @@ ---- src/include/refcount_ptr.h.orig 2014-08-17 08:45:13 UTC -+++ src/include/refcount_ptr.h -@@ -33,6 +33,8 @@ template - class refcount_ptr; - - -+#include -+ - /** - * \brief Base class for reference countable objects. - * Property changes on: head/emulators/gxemul/files/patch-src_include_refcount__ptr.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/gxemul/files/patch-configure =================================================================== --- head/emulators/gxemul/files/patch-configure (nonexistent) +++ head/emulators/gxemul/files/patch-configure (revision 485218) @@ -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 Property changes on: head/emulators/gxemul/files/patch-configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/emulators/gxemul/pkg-descr =================================================================== --- head/emulators/gxemul/pkg-descr (revision 485217) +++ head/emulators/gxemul/pkg-descr (revision 485218) @@ -1,20 +1,20 @@ GXemul is a free instruction-level machine emulator, emulating not only the CPU, but also other hardware components, making it possible to use the emulator to run unmodified operating systems such as NetBSD, OpenBSD, or Linux. A few different machine types are emulated. The following machine types are emulated well enough to run at least one "guest OS": * ARM: CATS (NetBSD/cats, OpenBSD/cats), IQ80321 (NetBSD/evbarm), NetWinder (NetBSD/netwinder) * MIPS: DECstation 5000/200 (NetBSD/pmax, OpenBSD/pmax, Ultrix, Linux/DECstation, Sprite), Acer Pica-61 (NetBSD/arc), NEC MobilePro 770, 780, 800, 880 (NetBSD/hpcmips), Cobalt (NetBSD/cobalt), Malta (NetBSD/evbmips, Linux/Malta) Algorithmics P5064 (NetBSD/algor), SGI O2 (aka IP32) (NetBSD/sgi) * PowerPC: IBM 6050/6070 (PReP, PowerPC Reference Platform) (NetBSD/prep), MacPPC (generic "G4" Macintosh) (NetBSD/macppc) * SuperH: Sega Dreamcast (NetBSD/dreamcast, Linux/dreamcast), Landisk (OpenBSD/landisk) -WWW: http://gxemul.sourceforge.net/ +WWW: http://gavare.se/gxemul/