pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/emulators/minivmac Update to 36.04
details: https://anonhg.NetBSD.org/pkgsrc/rev/cc2d62c5fcbe
branches: trunk
changeset: 340928:cc2d62c5fcbe
user: ryoon <ryoon%pkgsrc.org@localhost>
date: Thu Oct 10 13:54:17 2019 +0000
description:
Update to 36.04
Building procedure is described at
https://www.gryphel.com/c/minivmac/build.html .
Changelog:
unknown
diffstat:
emulators/minivmac/Makefile | 70 ++++++++++++++++++----
emulators/minivmac/PLIST | 11 +---
emulators/minivmac/distinfo | 12 +-
emulators/minivmac/patches/patch-aa | 25 --------
emulators/minivmac/patches/patch-setup_WRBGCFLS.i | 17 +++++
5 files changed, 81 insertions(+), 54 deletions(-)
diffs (171 lines):
diff -r f336282f17eb -r cc2d62c5fcbe emulators/minivmac/Makefile
--- a/emulators/minivmac/Makefile Thu Oct 10 13:48:01 2019 +0000
+++ b/emulators/minivmac/Makefile Thu Oct 10 13:54:17 2019 +0000
@@ -1,27 +1,71 @@
-# $NetBSD: Makefile,v 1.20 2018/01/07 21:46:55 rillig Exp $
+# $NetBSD: Makefile,v 1.21 2019/10/10 13:54:17 ryoon Exp $
-DISTNAME= minivmac-0.1.7.src
-PKGNAME= minivmac-0.1.7
-PKGREVISION= 2
+DISTNAME= minivmac-36.04.src
+PKGNAME= ${DISTNAME:S/.src//}
CATEGORIES= emulators
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=minivmac/}
+MASTER_SITES= https://www.gryphel.com/d/minivmac/minivmac-${PKGVERSION_NOREV}/
EXTRACT_SUFX= .tgz
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://minivmac.sourceforge.net/
+HOMEPAGE= https://www.gryphel.com/c/minivmac/
COMMENT= Miniature Macintosh emulator
LICENSE= gnu-gpl-v2
WRKSRC= ${WRKDIR}/minivmac
-SCRIPTS_ENV+= CC=${CC:Q}
-AUTO_MKDIRS= yes
+
+SUBST_CLASSES+= prefix
+SUBST_STAGE.prefix= pre-configure
+SUBST_MESSAGE.prefix= Setting X11BASE
+SUBST_FILES.prefix+= setup/WRBGCFLS.i
+SUBST_VARS.prefix+= X11BASE COMPILER_RPATH_FLAG
+
+.include "../../mk/bsd.prefs.mk"
-do-build:
- cd ${WRKSRC}/tool/bash; ${SETENV} ${SCRIPTS_ENV} ${SH} build
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64)
+MVMTARGET= nb64
+.elif !empty(MACHINE_PLATFORM:MNetBSD-*-i386)
+MVMTARGET= nbsd
+.elif !empty(MACHINE_PLATFORM:MLinux-*-x86_64)
+MVMTARGET= lx64
+.elif !empty(MACHINE_PLATFORM:MLinux-*-i386)
+MVMTARGET= lx86
+.elif !empty(MACHINE_PLATFORM:MDarwin-*-x86_64)
+MVMTARGET= mc64
+.elif !empty(MACHINE_PLATFORM:MDarwin-*-i386)
+MVMTARGET= imch
+.elif !empty(MACHINE_PLATFORM:MFreeBSD-*-x86_86)
+MVMTARGET= fb64
+.elif !empty(MACHINE_PLATFORM:MFreeBSD-*-i386)
+MVMTARGET= fbsd
+.elif !empty(MACHINE_PLATFORM:MOpenBSD-*-x86_64)
+MVMTARGET= ob64
+.elif !empty(MACHINE_PLATFORM:MOpenBSD-*-i386)
+MVMTARGET= obsd
+.elif !empty(MACHINE_PLATFORM:MDragonFly-*-x86_64)
+MVMTARGET= db64
+.elif !empty(MACHINE_PLATFORM:MDragonFly-*-i386)
+MVMTARGET= dfbs
+.elif !empty(MACHINE_PLATFORM:MSunOS-*-x86_64)
+MVMTARGET= oi64
+.elif !empty(MACHINE_PLATFORM:MSunOS-*-i386)
+MVMTARGET= oind
+.else
+NOT_FOR_PLATFORM+= ${MACHINE_PLATFORM}
+.endif
+
+BUILD_TARGET= minivmac
+
+INSTALLATION_DIRS+= bin
+
+do-configure:
+ cd ${WRKSRC} && \
+ ${CC} setup/tool.c -o setup_t && \
+ ./setup_t -t ${MVMTARGET} > ./setup.sh && \
+ ${SH} ./setup.sh
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/drv/minivmac ${DESTDIR}${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DESTDIR}${PREFIX}/share/doc/minivmac
+ ${INSTALL_PROGRAM} ${WRKSRC}/minivmac ${DESTDIR}${PREFIX}/bin
-.include "../../x11/libXext/buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r f336282f17eb -r cc2d62c5fcbe emulators/minivmac/PLIST
--- a/emulators/minivmac/PLIST Thu Oct 10 13:48:01 2019 +0000
+++ b/emulators/minivmac/PLIST Thu Oct 10 13:54:17 2019 +0000
@@ -1,11 +1,2 @@
-@comment $NetBSD: PLIST,v 1.5 2018/01/07 21:46:56 rillig Exp $
+@comment $NetBSD: PLIST,v 1.6 2019/10/10 13:54:17 ryoon Exp $
bin/minivmac
-share/doc/minivmac/about.html
-share/doc/minivmac/autoquit.html
-share/doc/minivmac/build.html
-share/doc/minivmac/contents.html
-share/doc/minivmac/credits.html
-share/doc/minivmac/default.html
-share/doc/minivmac/license.html
-share/doc/minivmac/manual.html
-share/doc/minivmac/todo.html
diff -r f336282f17eb -r cc2d62c5fcbe emulators/minivmac/distinfo
--- a/emulators/minivmac/distinfo Thu Oct 10 13:48:01 2019 +0000
+++ b/emulators/minivmac/distinfo Thu Oct 10 13:54:17 2019 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2015/11/03 20:31:00 agc Exp $
+$NetBSD: distinfo,v 1.4 2019/10/10 13:54:17 ryoon Exp $
-SHA1 (minivmac-0.1.7.src.tgz) = 761b56ec9d4dbc2a3b200dd40a9c44b93913e308
-RMD160 (minivmac-0.1.7.src.tgz) = 132ddc014d74f0c60be5357f69f4528f0c86db97
-SHA512 (minivmac-0.1.7.src.tgz) = 6bb743bd3076c3191f291c2298f898c705bc88264abfa58fa7aa1ca59611034bc7794adb4b77df33abc64c8ab7d4366ab90093d199e9788c1a4052b2b14e2f82
-Size (minivmac-0.1.7.src.tgz) = 93155 bytes
-SHA1 (patch-aa) = c1f992d7277edb53c88d6b973cfe1046c5633434
+SHA1 (minivmac-36.04.src.tgz) = 6b5c1e00689683313a8b2c2047669939544003cf
+RMD160 (minivmac-36.04.src.tgz) = 613534f9aa4fd779d245f5511731617df4da3bb6
+SHA512 (minivmac-36.04.src.tgz) = 4de672b4a7127466e30676868cf1f49b155a1231eb7d124fd5b4236f628db8351f45db5f24564932745fa7840f6ea40707bfc46d95f3a403165f05b443367a3f
+Size (minivmac-36.04.src.tgz) = 500742 bytes
+SHA1 (patch-setup_WRBGCFLS.i) = 670784065ef5d58b74a20022eec91ff2be42fd42
diff -r f336282f17eb -r cc2d62c5fcbe emulators/minivmac/patches/patch-aa
--- a/emulators/minivmac/patches/patch-aa Thu Oct 10 13:48:01 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/10/15 12:39:12 kei Exp $
-
---- tool/bash/build.orig Thu Jul 18 03:09:52 2002
-+++ tool/bash/build Mon Oct 14 03:49:09 2002
-@@ -32,17 +32,17 @@
-
- # what compiler to use and what options
-
--CallC="gcc -c"
-+CallC="${CC} -c -I${X11BASE}/include"
- CallC="${CallC} -Wall -Wmissing-prototypes -Wstrict-prototypes"
- CallC="${CallC} -O3"
-
- # what linker to use and what options
-
--LinkLine="gcc"
-+LinkLine="${CC}"
-
- # what libraries to link with
-
--LinkLibs="-L/usr/X11R6/lib -lXext -lX11"
-+LinkLibs="-L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXext -lX11"
-
- # set this to 1 for more speed if you have a PowerPC computer,
- # or other processor with big endian addressing that can
diff -r f336282f17eb -r cc2d62c5fcbe emulators/minivmac/patches/patch-setup_WRBGCFLS.i
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/minivmac/patches/patch-setup_WRBGCFLS.i Thu Oct 10 13:54:17 2019 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-setup_WRBGCFLS.i,v 1.1 2019/10/10 13:54:17 ryoon Exp $
+
+* Detect libX11 properly
+
+--- setup/WRBGCFLS.i.orig 2018-08-19 11:02:48.000000000 +0000
++++ setup/WRBGCFLS.i
+@@ -363,8 +363,8 @@ LOCALPROC WriteBashGccMakeFile(void)
+ WriteCStrToDestFile(" -lXext");
+ #endif
+ if (gbk_targfam_nbsd == gbo_targfam) {
+- WriteCStrToDestFile(" -L/usr/X11R7/lib");
+- WriteCStrToDestFile(" -R/usr/X11R7/lib");
++ WriteCStrToDestFile(" -L@X11BASE@/lib");
++ WriteCStrToDestFile(" @COMPILER_RPATH_FLAG@@X11BASE@/lib");
+ } else if (gbk_targfam_dbsd == gbo_targfam) {
+ WriteCStrToDestFile(" -L/usr/pkg/lib");
+ } else if (gbk_targfam_minx == gbo_targfam) {
Home |
Main Index |
Thread Index |
Old Index