pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/emulators/ucon64 ucon64: fix build/install problems on...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/5d6b75ab036a
branches:  trunk
changeset: 444481:5d6b75ab036a
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Jan 08 21:39:04 2021 +0000

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

Bump PKGREVISION.

diffstat:

 emulators/ucon64/Makefile |  24 ++++++++++++++++++------
 emulators/ucon64/PLIST    |  10 ++--------
 2 files changed, 20 insertions(+), 14 deletions(-)

diffs (72 lines):

diff -r 80ec8bbccfc7 -r 5d6b75ab036a emulators/ucon64/Makefile
--- a/emulators/ucon64/Makefile Fri Jan 08 21:09:25 2021 +0000
+++ b/emulators/ucon64/Makefile Fri Jan 08 21:39:04 2021 +0000
@@ -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 @@
 
 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/* \
diff -r 80ec8bbccfc7 -r 5d6b75ab036a emulators/ucon64/PLIST
--- a/emulators/ucon64/PLIST    Fri Jan 08 21:09:25 2021 +0000
+++ b/emulators/ucon64/PLIST    Fri Jan 08 21:39:04 2021 +0000
@@ -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/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



Home | Main Index | Thread Index | Old Index