free42: Add a 2.0.x wip version, based on pkgsrc/emulators/free42

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: free42: Add a 2.0.x wip version, based on pkgsrc/emulators/free42
From: Greg Troxel <gdt%lexort.com@localhost>
Date: Sat, 01 Sep 2018 14:09:59 +0000
Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Sat Sep 1 14:09:59 2018 +0000
Changeset:	55899059956ff16fcfe33ea8ba1b9b938edd493a

Modified Files:
	Makefile
Added Files:
	free42/DESCR
	free42/Makefile
	free42/PLIST
	free42/TODO
	free42/distinfo
	free42/options.mk
	free42/patches/patch-android_jni_build-intel-lib.sh
	free42/patches/patch-gtk_Makefile
	free42/patches/patch-gtk_README

Log Message:
free42: Add a 2.0.x wip version, based on pkgsrc/emulators/free42

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=55899059956ff16fcfe33ea8ba1b9b938edd493a

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                                           |  1 +
 free42/DESCR                                       |  8 +++++
 free42/Makefile                                    | 40 ++++++++++++++++++++++
 free42/PLIST                                       |  4 +++
 free42/TODO                                        | 10 ++++++
 free42/distinfo                                    |  9 +++++
 free42/options.mk                                  | 14 ++++++++
 .../patches/patch-android_jni_build-intel-lib.sh   | 15 ++++++++
 free42/patches/patch-gtk_Makefile                  | 38 ++++++++++++++++++++
 free42/patches/patch-gtk_README                    | 15 ++++++++
 10 files changed, 154 insertions(+)

diffs:
diff --git a/Makefile b/Makefile
index d157860d63..847ad8211c 100644
--- a/Makefile
+++ b/Makefile
@@ -810,6 +810,7 @@ SUBDIR+=	foxtrotgps
 SUBDIR+=	fplll
 SUBDIR+=	fprobe
 SUBDIR+=	fragrouter
+SUBDIR+=	free42
 SUBDIR+=	freebayes
 SUBDIR+=	freebsd-svn
 SUBDIR+=	freecad
diff --git a/free42/DESCR b/free42/DESCR
new file mode 100644
index 0000000000..aea57d3e45
--- /dev/null
+++ b/free42/DESCR
@@ -0,0 +1,8 @@
+Free42 is a software clone of the Hewlett-Packard 42S calculator. If you know
+how to use an HP-42S, you know how to use Free42.
+If you're new to the HP-42S and its clones, you may want to take a peek at the
+manual. You can get a scan of the original manual, wrapped in a rather large
+PDF file, by ordering the HP Museum CD/DVD-ROM set (highly recommended for any
+HP calculator enthusiast). Go to http://hpmuseum.org/ to learn more.
+Alternatively, you can get a free manual for the HP-42S and Free42 at
+http://thomasokken.com/free42/42s.pdf
diff --git a/free42/Makefile b/free42/Makefile
new file mode 100644
index 0000000000..0f23c17759
--- /dev/null
+++ b/free42/Makefile
@@ -0,0 +1,40 @@
+# $NetBSD: Makefile,v 1.12 2018/07/18 00:06:14 joerg Exp $
+
+DISTNAME=	free42
+PKGNAME=	${DISTNAME}-2.0.21
+PKGREVISION=	7
+DIST_SUBDIR=	${PKGNAME_NOREV}
+CATEGORIES=	emulators
+MASTER_SITES=	http://thomasokken.com/free42/download/
+EXTRACT_SUFX=	.tgz
+
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=	http://thomasokken.com/free42/
+COMMENT=	HP42S Calculator Simulator
+LICENSE=	gnu-gpl-v2
+
+USE_TOOLS+=	gmake pkg-config
+USE_LANGUAGES+=	c++03
+BUILD_DIRS=	gtk
+
+.include "options.mk"
+
+BUILD_TARGET=	free42${VARIANT}
+
+CXXFLAGS.NetBSD+=	-DNO_SINCOS
+MAKE_ENV.Linux+=	AUDIO_ALSA=1
+
+INSTALLATION_DIRS+= bin
+INSTALLATION_DIRS+= share/doc/free42
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/${BUILD_DIRS}/${BUILD_TARGET} \
+		${DESTDIR}/${PREFIX}/bin/free42
+	${INSTALL_DATA} ${WRKSRC}/README \
+		${DESTDIR}/${PREFIX}/share/doc/free42
+	${INSTALL_DATA} ${WRKSRC}/${BUILD_DIRS}/README \
+		${DESTDIR}/${PREFIX}/share/doc/free42/README.gtk
+
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/libXmu/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/free42/PLIST b/free42/PLIST
new file mode 100644
index 0000000000..7f8b1d7f04
--- /dev/null
+++ b/free42/PLIST
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST,v 1.1 2014/03/10 08:38:25 he Exp $
+bin/free42
+share/doc/free42/README
+share/doc/free42/README.gtk
diff --git a/free42/TODO b/free42/TODO
new file mode 100644
index 0000000000..891000b343
--- /dev/null
+++ b/free42/TODO
@@ -0,0 +1,10 @@
+This is wip to udpate free42 to recent upstream.  Now, upstream uses
+an intel bcd library, which does not straightforwardly build on
+NetBSD.
+
+* hook intel library into the build
+
+* make intel library adequatly portable (or make it its own package)
+
+* consider using the "upstream" distribution tarballs, which are
+  versioned, and do not have the hp-logo skin
diff --git a/free42/distinfo b/free42/distinfo
new file mode 100644
index 0000000000..c0dcda359c
--- /dev/null
+++ b/free42/distinfo
@@ -0,0 +1,9 @@
+$NetBSD: distinfo,v 1.2 2017/03/23 17:06:49 joerg Exp $
+
+SHA1 (free42-2.0.21/free42.tgz) = c5bb4179050e208b84298a2874cd4ac16e7514f1
+RMD160 (free42-2.0.21/free42.tgz) = c95ca9554d42dce9de813a2b05ccbf8ed654d259
+SHA512 (free42-2.0.21/free42.tgz) = 3d63d0d414a4519d50c019731ade33414b23f0fbd1a868bb6b6121a7d8ddf47e5221fead2542d42eea86f78dcb5d8a95221af7d8ae8b95de4179737b1d697463
+Size (free42-2.0.21/free42.tgz) = 52170086 bytes
+SHA1 (patch-android_jni_build-intel-lib.sh) = 184aba4123d17592f899741d8a272353bfc3d9e3
+SHA1 (patch-gtk_Makefile) = 1830fc000df2fe5383e89536d24926204ff15907
+SHA1 (patch-gtk_README) = 83ab97efb8f9046cba6056798344b76128562d5d
diff --git a/free42/options.mk b/free42/options.mk
new file mode 100644
index 0000000000..45f893ffd7
--- /dev/null
+++ b/free42/options.mk
@@ -0,0 +1,14 @@
+# $NetBSD: options.mk,v 1.1 2014/03/10 08:38:25 he Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.free42
+PKG_SUPPORTED_OPTIONS=	bcd_math
+PKG_SUGGESTED_OPTIONS=
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mbcd_math)
+MAKE_ENV+=	BCD_MATH=1
+VARIANT=	dec
+.else
+VARIANT=	bin
+.endif
diff --git a/free42/patches/patch-android_jni_build-intel-lib.sh b/free42/patches/patch-android_jni_build-intel-lib.sh
new file mode 100644
index 0000000000..78b902bfd5
--- /dev/null
+++ b/free42/patches/patch-android_jni_build-intel-lib.sh
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Remediate bashism.
+
+--- android/jni/build-intel-lib.sh.orig	2018-06-24 18:40:42.000000000 +0000
++++ android/jni/build-intel-lib.sh
+@@ -4,7 +4,7 @@ if [ -f libgcc111libbid.a ]; then exit 0
+ 
+ mkdir bin
+ export PATH="`/bin/pwd`/bin:$PATH"
+-if [ `hostname` == "air" ]
++if [ `hostname` = "air" ]
+ then
+     TOOLCHAIN=arm-linux-androideabi-4.8
+ else
diff --git a/free42/patches/patch-gtk_Makefile b/free42/patches/patch-gtk_Makefile
new file mode 100644
index 0000000000..467947e568
--- /dev/null
+++ b/free42/patches/patch-gtk_Makefile
@@ -0,0 +1,38 @@
+$NetBSD: patch-gtk_Makefile,v 1.1 2014/03/10 08:38:25 he Exp $
+
+Remove references to X11 headers and libs, allow them to
+be controlled by pkgsrc.  Also allow CXXFLAGS to be added to.
+
+--- gtk/Makefile.orig	2018-06-24 18:40:43.000000000 +0000
++++ gtk/Makefile
+@@ -15,12 +15,11 @@
+ # along with this program; if not, see http://www.gnu.org/licenses/.
+ ###############################################################################
+ 
+-CFLAGS = -MMD \
++CFLAGS += -MMD \
+ 	 -Wall \
+ 	 -Wno-parentheses \
+ 	 -Wno-write-strings \
+ 	 -g \
+-	 -I/usr/X11R6/include \
+ 	 $(shell pkg-config --cflags gtk+-2.0) \
+ 	 -DVERSION="\"$(shell cat ../VERSION)\"" \
+ 	 -DDECIMAL_CALL_BY_REFERENCE=1 \
+@@ -29,13 +28,14 @@ CFLAGS = -MMD \
+ 	 -DDECIMAL_GLOBAL_EXCEPTION_FLAGS=1 \
+ 	 -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1
+ 
+-CXXFLAGS = $(CFLAGS) \
++CXXFLAGS += $(CFLAGS) \
+ 	 -fno-exceptions \
+ 	 -fno-rtti \
+ 	 -D_WCHAR_T_DEFINED
+ 
+ LDFLAGS = -L/usr/X11R6/lib
+-LIBS = gcc111libbid.a -lXmu $(shell pkg-config --libs gtk+-2.0)
++LIBS = -lXmu $(shell pkg-config --libs gtk+-2.0)
++# XXX if bcd_math, then add gcc111libbid.a
+ 
+ ifeq "$(shell uname -s)" "Linux"
+ LDFLAGS += -Wl,--hash-style=both
diff --git a/free42/patches/patch-gtk_README b/free42/patches/patch-gtk_README
new file mode 100644
index 0000000000..18b0648f66
--- /dev/null
+++ b/free42/patches/patch-gtk_README
@@ -0,0 +1,15 @@
+$NetBSD: patch-gtk_README,v 1.1 2014/03/10 08:38:25 he Exp $
+
+Fix URL to alternative HP-42S manual.
+
+--- gtk/README.orig	2013-12-09 00:49:20.000000000 +0000
++++ gtk/README
+@@ -39,7 +39,7 @@ The ultimate documentation for Free42 is
+ obtain this manual in PDF format by purchasing the CD or DVD set from The
+ Museum of HP Calculators (http://hpmuseum.org/). Alternatively, there is an
+ independently written HP-42S/Free42 manual, by Jose Lauro Strapasson, which
+-you can download free at http://joselauro.com/42s.pdf.
++you can download free at http://thomasokken.com/free42/42s.pdf
+ 
+ 
+ Keyboard Mapping
Prev by Date: go-gopacket: Set LDFLAGS so that cgo can find libpcap
Next by Date: go-gopacket: Add a missing PLIST entry on Linux
Previous by Thread: go-gopacket: Set LDFLAGS so that cgo can find libpcap
Next by Thread: go-gopacket: Add a missing PLIST entry on Linux
Indexes:
Home | Main Index | Thread Index | Old Index