pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/emulators/ski Fixes so ski will actually run on NetBSD...
details: https://anonhg.NetBSD.org/pkgsrc/rev/57ad0239671a
branches: trunk
changeset: 351103:57ad0239671a
user: scole <scole%pkgsrc.org@localhost>
date: Sun Aug 14 18:27:05 2016 +0000
description:
Fixes so ski will actually run on NetBSD, add options.mk for motif/x11 versions
diffstat:
emulators/ski/DESCR | 4 +-
emulators/ski/Makefile | 28 +-
emulators/ski/PLIST | 13 +-
emulators/ski/distinfo | 17 +-
emulators/ski/options.mk | 35 +
emulators/ski/patches/patch-XSki.netbsd | 483 +++++++++++++++++++++++
emulators/ski/patches/patch-ad | 18 +-
emulators/ski/patches/patch-ae | 19 +-
emulators/ski/patches/patch-an | 7 +-
emulators/ski/patches/patch-ap | 13 +-
emulators/ski/patches/patch-src-line_separator.h | 13 +
emulators/ski/patches/patch-src_eparse.y | 50 ++
emulators/ski/patches/patch-src_freebsd_signal.h | 42 ++
emulators/ski/patches/patch-src_program.c | 43 ++
emulators/ski/patches/patch-src_ssDCmd.c | 32 +
emulators/ski/patches/patch-src_ssX.c | 39 +
16 files changed, 810 insertions(+), 46 deletions(-)
diffs (truncated from 1073 to 300 lines):
diff -r 6b5d2868a453 -r 57ad0239671a emulators/ski/DESCR
--- a/emulators/ski/DESCR Sun Aug 14 17:11:57 2016 +0000
+++ b/emulators/ski/DESCR Sun Aug 14 18:27:05 2016 +0000
@@ -9,4 +9,6 @@
Run the ski binary from within an xterm window.
-BUGS: the xserver version xski doesn't currently work.
+BUGS: manual pages out of date, rpm build target broken, ctrl-c breaks
+ curses ski program not emulator, doesn't decode source code yet,
+ "cstack" and "pm" commands not implemented, probably others.
diff -r 6b5d2868a453 -r 57ad0239671a emulators/ski/Makefile
--- a/emulators/ski/Makefile Sun Aug 14 17:11:57 2016 +0000
+++ b/emulators/ski/Makefile Sun Aug 14 18:27:05 2016 +0000
@@ -1,14 +1,18 @@
-# $NetBSD: Makefile,v 1.17 2015/08/18 07:31:07 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2016/08/14 18:27:05 scole Exp $
#
DISTNAME= ski-1.3.2
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ski/}
MAINTAINER= cherry%zyx.in@localhost
HOMEPAGE= http://ski.sourceforge.net/
COMMENT= The ia64 instruction set simulator
+LICENSE= gnu-gpl-v2
+
+.include "../../mk/bsd.prefs.mk"
+.include "options.mk"
BUILD_DEPENDS+= libelf>=0.8.13:../../devel/libelf
@@ -18,18 +22,32 @@
CPPFLAGS+= -I${PREFIX}/include/libelf -L ${PREFIX}/lib
+# XXX prevent thousands of warnings for combfns
+#CFLAGS+= -Wno-unused-variable -Wno-unused-but-set-variable
+
USE_TOOLS+= pkg-config aclocal autoconf automake autoreconf yacc
USE_LIBTOOL= yes
USE_NCURSES= yes
+SUBST_CLASSES+= xski-app
+SUBST_STAGE.xski-app= pre-configure
+SUBST_MESSAGE.xski-app= Fixing X11 Makefile.am app-default paths.
+SUBST_FILES.xski-app= Makefile.am
+SUBST_SED.xski-app= -e 's,/etc/X11/app-defaults,${PREFIX}/lib/X11/app-defaults,g'
+
+SUBST_CLASSES+= ssx-app
+SUBST_STAGE.ssx-app= post-patch
+SUBST_MESSAGE.ssx-app= Fixing X11 ssX.c app-default paths.
+SUBST_FILES.ssx-app= src/ssX.c
+SUBST_SED.ssx-app= -e 's,XSKI_RESOURCE_FILE,${PREFIX}/lib/X11/app-defaults/XSki,g'
+
pre-configure:
# cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${SH} ./autogen.sh ${CONFIGURE_ARGS}
cd ${WRKSRC} && autoreconf -fi -I macros
post-install:
- ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/X11/app-defaults
- ${INSTALL_DATA} ${WRKSRC}/src/XSki \
- ${DESTDIR}${PREFIX}/lib/X11/app-defaults/XSki
+ ${INSTALL_DATA} ${WRKSRC}/doc/manual/SkiManualMasterDoc.pdf \
+ ${DESTDIR}${PREFIX}/share/ski
.include "../../devel/gperf/buildlink3.mk"
.include "../../devel/libelf/buildlink3.mk"
diff -r 6b5d2868a453 -r 57ad0239671a emulators/ski/PLIST
--- a/emulators/ski/PLIST Sun Aug 14 17:11:57 2016 +0000
+++ b/emulators/ski/PLIST Sun Aug 14 18:27:05 2016 +0000
@@ -1,9 +1,11 @@
-@comment $NetBSD: PLIST,v 1.3 2011/07/27 11:14:22 cherry Exp $
+@comment $NetBSD: PLIST,v 1.4 2016/08/14 18:27:05 scole Exp $
bin/ski
bin/bski
bin/bskinc
bin/ski-config
bin/ski-fake-xterm
+${PLIST.xski}bin/xski
+${PLIST.gski}bin/gski
include/ski-1.3/asm.h
include/ski-1.3/bits.h
include/ski-1.3/coreui.h
@@ -19,13 +21,14 @@
include/ski-1.3/state.h
include/ski-1.3/std.h
include/ski-1.3/types.h
-lib/X11/app-defaults/XSki
+${PLIST.xski}lib/X11/app-defaults/XSki
lib/libski-1.3.so.2
lib/libski-1.3.so.2.0.0
lib/libski.a
-lib/libski.la
-lib/libski.so
man/man1/bski.1
man/man1/bskinc.1
man/man1/ski.1
-share/ski/gski.glade
+${PLIST.xski}man/man1/xski.1
+${PLIST.gski}man/man1/gski.1
+${PLIST.gski}share/ski/gski.glade
+share/ski/SkiManualMasterDoc.pdf
diff -r 6b5d2868a453 -r 57ad0239671a emulators/ski/distinfo
--- a/emulators/ski/distinfo Sun Aug 14 17:11:57 2016 +0000
+++ b/emulators/ski/distinfo Sun Aug 14 18:27:05 2016 +0000
@@ -1,14 +1,15 @@
-$NetBSD: distinfo,v 1.5 2015/11/03 20:31:01 agc Exp $
+$NetBSD: distinfo,v 1.6 2016/08/14 18:27:05 scole Exp $
SHA1 (ski-1.3.2.tar.gz) = fc067041a70cf45cad6af42da7ffe5bf100d7c65
RMD160 (ski-1.3.2.tar.gz) = 1ff739eac7b8163026d208ee9b51d134f524e73f
SHA512 (ski-1.3.2.tar.gz) = 21f2e1dd87cb517602d4d6ef62707ec6042c1b6ec5dfd063db7315d13bbc3fb47b491c15b7efb0433fc82f27c7924e2d50b2f57fe24e49aeb864ce2c3c2c8bd0
Size (ski-1.3.2.tar.gz) = 2715791 bytes
+SHA1 (patch-XSki.netbsd) = 866b050bf751cf1bff147835db17570c754b891b
SHA1 (patch-aa) = 60003cef1eef2bbb6ce535c137fa15a76b0e4f13
SHA1 (patch-ab) = 23076061dac3a0488d2f5b7b0ac022d095568d80
SHA1 (patch-ac) = 769b847c5564565617be8043e0c736e12c296d40
-SHA1 (patch-ad) = d1680c77d837a8c3c371e7bd624cb1fa87ea6724
-SHA1 (patch-ae) = 036804384c4a4a694529092a8819c90abbc6e9ae
+SHA1 (patch-ad) = b61f9b4fd9b16f1ee18144cc167c45ae7410bc57
+SHA1 (patch-ae) = 954ef900e9cd64b485c9057a5fb01e283dcf6ed5
SHA1 (patch-af) = f4048bccb6809ad69527352bcc4c32f8b109b437
SHA1 (patch-ag) = 973a8f5c1cc5cc36bb8aa1e1e21769f51194967e
SHA1 (patch-ah) = 31e4807b546c69aa43c7bddc4f16ba3b99d8da3e
@@ -17,6 +18,12 @@
SHA1 (patch-ak) = 0abaa09fb172ebbc8715908f5c6f49936b22aefa
SHA1 (patch-al) = 1911d6c8e051ab2b64055cf1c64856188268619e
SHA1 (patch-am) = 0965936933424ab4af4d1fa3384808f4e92f9b04
-SHA1 (patch-an) = 73629a59de77f233be3748d19c5d17d8e18e8af5
+SHA1 (patch-an) = 72f18e509d371e4724a35b4be195a21dbcdac859
SHA1 (patch-ao) = 8f2eabd4d8dc6ccef593a5f50d00485a905ee523
-SHA1 (patch-ap) = b392a3b89273db3f55ed7d88ca167229f6e3c802
+SHA1 (patch-ap) = a98cd0aa55a002020c26fb70e5549bd16270bf39
+SHA1 (patch-src-line_separator.h) = 2c9b0c2fdace6bc59735cbeb9588aea21b19b1db
+SHA1 (patch-src_eparse.y) = c82918d36047e51273cc1aa0e20a4ce1649668f5
+SHA1 (patch-src_freebsd_signal.h) = 265bd4e3f18dcfda791595b1356b37398c055349
+SHA1 (patch-src_program.c) = d364a8a0ababfbc48333d5e48962f53677bcfeb9
+SHA1 (patch-src_ssDCmd.c) = 9062b2107f72171644e27d83ec45260aa40019fe
+SHA1 (patch-src_ssX.c) = 01c24b8d6b62b51798ae4a33e69cfb323a66f8d5
diff -r 6b5d2868a453 -r 57ad0239671a emulators/ski/options.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/ski/options.mk Sun Aug 14 18:27:05 2016 +0000
@@ -0,0 +1,35 @@
+# $NetBSD: options.mk,v 1.1 2016/08/14 18:27:05 scole Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.ski
+PKG_SUPPORTED_OPTIONS= debug gtk motif
+PKG_SUGGESTED_OPTIONS= gtk motif
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mdebug)
+CPPFLAGS+= -g
+INSTALL_UNSTRIPPED= yes
+.endif
+
+PLIST_VARS+= xski
+.if !empty(PKG_OPTIONS:Mmotif)
+PLIST.xski= yes
+CONFIGURE_ARGS+= --with-x11
+INSTALLATION_DIRS+= lib/X11/app-defaults
+
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../x11/libxcb/buildlink3.mk"
+.include "../../x11/motif/buildlink3.mk"
+.endif
+
+PLIST_VARS+= gski
+.if !empty(PKG_OPTIONS:Mgtk)
+PLIST.gski= yes
+CONFIGURE_ARGS+= --with-gtk
+
+.include "../../devel/libglade/buildlink3.mk"
+.include "../../devel/libgnomeui/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../x11/libxcb/buildlink3.mk"
+.endif
diff -r 6b5d2868a453 -r 57ad0239671a emulators/ski/patches/patch-XSki.netbsd
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/ski/patches/patch-XSki.netbsd Sun Aug 14 18:27:05 2016 +0000
@@ -0,0 +1,483 @@
+$NetBSD: patch-XSki.netbsd,v 1.1 2016/08/14 18:27:05 scole Exp $
+
+Include X resource file for NetBSD which is a copy of the FreeBSD one.
+
+--- XSki.netbsd.orig 2016-04-19 12:56:13.000000000 -0400
++++ XSki.netbsd 2016-04-19 12:56:25.000000000 -0400
+@@ -0,0 +1,476 @@
++!
++! Copyright (C) 1995-2007, Hewlett-Packard Development Company, L.P.
++!
++! This program is free software; you can redistribute it and/or modify
++! it under the terms of the GNU General Public License as published by
++! the Free Software Foundation; either version 2 of the License, or
++! (at your option) any later version.
++!
++! This program is distributed in the hope that it will be useful,
++! but WITHOUT ANY WARRANTY; without even the implied warranty of
++! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++! GNU General Public License for more details.
++!
++! You should have received a copy of the GNU General Public License along
++! with this program; if not, write to the Free Software Foundation, Inc.,
++! 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
++!
++
++! *XmText.fontList: <font>
++
++*background: rgb:C0/C0/C0
++main.geometry: +0+0
++
++*showUrs: True
++*showGrs: True
++*showFrs: True
++*showSrs: True
++*showIArs: True
++
++*regwUrs.rows: 7
++*regwGrs.rows: 7
++*regwFrs.rows: 4
++*regwSrs.rows: 2
++*regwIArs.rows: 4
++
++*viewProgram: True
++*viewData: True
++*viewvga: False
++*viewRegisters: True
++
++*help.sensitive: False
++*bb4.sensitive: False
++*bb5.sensitive: False
++*prgwRC.goto.sensitive: False
++*datwRC.goto.sensitive: False
++
++*File.mnemonic: F
++*View.mnemonic: V
++*Configure.mnemonic: C
++*Help.mnemonic: H
++
++*load.labelString: Open...
++*load.mnemonic: O
++*save.labelString: Save...
++*save.mnemonic: S
++*trace.labelString: Trace...
++*trace.mnemonic: T
++*traceOn.labelString: Enable Trace
++*traceOff.labelString: Disable Trace
++*read.labelString: Read...
++*read.mnemonic: R
++*quit.labelString: Quit
++*quit.mnemonic: Q
++
++*LoadFSD.fileTypeMask: FILE_REGULAR
++*LoadFSD.textColumns: 50
++*load_syms.labelString: Load all symbols
++*load_syms.alignment: ALIGNMENT_BEGINNING
++
++*program.labelString: Program
++*program.mnemonic: P
++*data.labelString: Data
++*data.mnemonic: D
++*registers.labelString: Registers
++*registers.mnemonic: R
++*cache.labelString: Cache
++*cache.mnemonic: C
++*tlb.labelString: TLB
++*tlb.mnemonic: T
++*callstack.labelString: Call Stack
++*breakpoints.labelString: Breakpoints
++*breakpoints.mnemonic: B
++*symbols.labelString: Symbols
++*symbols.mnemonic: S
++
++*context.labelString: Context-Sensitive Help
++*context.mnemonic: C
++*overview.labelString: Overview
++*overview.mnemonic: O
++*commands.labelString: Commands
++*product.labelString: Product Information
++*product.mnemonic: P
++
++*loadFSD_popup.title: Open File
++*prodInfo_popup.title: Help -- Product Information
++
++! Processor Selection
++*p0.labelString: 0
++*p1.labelString: 1
++*p2.labelString: 2
++*procOption.labelString: Processor
++
++! Button Box
++*bbox.orientation: HORIZONTAL
++*bbox.packing: PACK_TIGHT
++*bb0.labelString: Step
++*bb0.translations: Shift<Btn1Down>: SimCmd("step 10")\n\
Home |
Main Index |
Thread Index |
Old Index