CVS commit: pkgsrc/emulators/ucon64

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Jan  8 21:39:04 UTC 2021

Modified Files:
        pkgsrc/emulators/ucon64: Makefile PLIST

Log Message:
ucon64: fix build/install problems on Darwin, NetBSD/i386, and Centos.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/emulators/ucon64/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/emulators/ucon64/PLIST

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

Modified files:

Index: pkgsrc/emulators/ucon64/Makefile
diff -u pkgsrc/emulators/ucon64/Makefile:1.18 pkgsrc/emulators/ucon64/Makefile:1.19
--- pkgsrc/emulators/ucon64/Makefile:1.18       Sun Dec 20 15:15:01 2020
+++ pkgsrc/emulators/ucon64/Makefile    Fri Jan  8 21:39:04 2021
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2020/12/20 15:15:01 fcambus Exp $
+# $NetBSD: Makefile,v 1.19 2021/01/08 21:39:04 wiz Exp $
 
 DISTNAME=              ucon64-2.2.1-src
 PKGNAME=               ${DISTNAME:S/-src//}
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            emulators
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=ucon64/}
 
@@ -13,19 +13,31 @@ LICENSE=            gnu-gpl-v2
 
 WRKSRC=                        ${WRKDIR}/${DISTNAME}/src
 
+.include "../../mk/bsd.prefs.mk"
+
+# code assumes 64-bit target on NetBSD
+.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} != "i386"
 CONFIGURE_ARGS+=               --with-libcd64
+.endif
+
+.if ${OPSYS} == "Darwin"
+EXT=   dylib
+.else
+EXT=   so
+.endif
+
+PLIST_SUBST+=                  EXT=${EXT}
+
 CONFIGURE_ARGS+=               --with-libdiscmage
 GNU_CONFIGURE=                 yes
 USE_TOOLS+=                    gmake
 CHECK_PORTABILITY_SKIP+=       install_beos.sh
 
-INSTALLATION_DIRS=     bin lib share/examples/ucon64 share/doc/ucon64/images
+INSTALLATION_DIRS=     bin lib share/doc/ucon64/images
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/ucon64 ${DESTDIR}${PREFIX}/bin
-       ${INSTALL_LIB} ${WRKSRC}/libdiscmage/discmage.so ${DESTDIR}${PREFIX}/lib
-       ${INSTALL_DATA} ${WRKSRC}/[a-z]*.txt \
-               ${DESTDIR}${PREFIX}/share/examples/ucon64
+       ${INSTALL_LIB} ${WRKSRC}/libdiscmage/discmage.${EXT} ${DESTDIR}${PREFIX}/lib
        ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/*.html \
                ${DESTDIR}${PREFIX}/share/doc/ucon64
        ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/images/* \

Index: pkgsrc/emulators/ucon64/PLIST
diff -u pkgsrc/emulators/ucon64/PLIST:1.6 pkgsrc/emulators/ucon64/PLIST:1.7
--- pkgsrc/emulators/ucon64/PLIST:1.6   Sat Dec  5 13:16:36 2020
+++ pkgsrc/emulators/ucon64/PLIST       Fri Jan  8 21:39:04 2021
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.6 2020/12/05 13:16:36 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2021/01/08 21:39:04 wiz Exp $
 bin/ucon64
-lib/discmage.so
+lib/discmage.${EXT}
 share/doc/ucon64/changes.html
 share/doc/ucon64/developers.html
 share/doc/ucon64/faq.html
@@ -35,9 +35,3 @@ share/doc/ucon64/images/v64jr.png
 share/doc/ucon64/install.html
 share/doc/ucon64/license.html
 share/doc/ucon64/readme.html
-share/examples/ucon64/genpal.txt
-share/examples/ucon64/mdntsc.txt
-share/examples/ucon64/snescopy.txt
-share/examples/ucon64/snesntsc.txt
-share/examples/ucon64/snespal.txt
-share/examples/ucon64/snesslow.txt