[pkgsrc/trunk]: pkgsrc/emulators/x48 Fix problem related to search of X11 app...

[he <he%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c84ee2e21f01
branches:  trunk
changeset: 621436:c84ee2e21f01
user:      he <he%pkgsrc.org@localhost>
date:      Tue Jul 09 10:24:22 2013 +0000

description:
Fix problem related to search of X11 application defaults: pick
it up from the path specified in the package Makefile.
Also fix the default ROM path fixup so that it actually works.
Bump PKGREVISION.

diffstat:

 emulators/x48/Makefile                    |  11 +++++++----
 emulators/x48/distinfo                    |   3 ++-
 emulators/x48/patches/patch-src_x48_x11.c |  18 ++++++++++++++++++
 3 files changed, 27 insertions(+), 5 deletions(-)

diffs (75 lines):

diff -r 6979e49f68af -r c84ee2e21f01 emulators/x48/Makefile
--- a/emulators/x48/Makefile    Tue Jul 09 10:16:02 2013 +0000
+++ b/emulators/x48/Makefile    Tue Jul 09 10:24:22 2013 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2013/07/08 08:37:10 he Exp $
+# $NetBSD: Makefile,v 1.17 2013/07/09 10:24:22 he Exp $
 #
 
 DISTNAME=      x48-0.6.4
+PKGREVISION=   1
 CATEGORIES=    emulators
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=x48.berlios/}
 DISTFILES=     ${PKGNAME}${EXTRACT_SUFX}
@@ -21,20 +22,22 @@
 USE_TOOLS+=    gmake
 
 DATADIR=       lib/x48
+APPDEFS=       lib/X11/app-defaults
 
 INSTALLATION_DIRS+=    share/doc/x48/romdump
 INSTALLATION_DIRS+=    ${DATADIR}
-INSTALLATION_DIRS+=    lib/X11/app-defaults
+INSTALLATION_DIRS+=    ${APPDEFS}
 
 CONFIGURE_ARGS=        --disable-shm
 
 CPPFLAGS+=     -DHAVE_STDLIB
+CPPFLAGS+=     -DX11APPDEFS=\"${PREFIX}/${APPDEFS}\"
 
 SUBST_CLASSES= fix-ad
 SUBST_STAGE.fix-ad=    post-configure
 SUBST_MESSAGE.fix-ad=  Fix default rom path
-SUBST_FILES.fix-ad=    X48.ad
-SUBST_SED.fix-ad=      -e 's,"rom.dump,"${DATADIR}/gxrom-r,'
+SUBST_FILES.fix-ad=    src/X48.ad
+SUBST_SED.fix-ad=      -e 's,rom.dump,${PREFIX}/${DATADIR}/gxrom-r,'
 
 
 pre-configure:
diff -r 6979e49f68af -r c84ee2e21f01 emulators/x48/distinfo
--- a/emulators/x48/distinfo    Tue Jul 09 10:16:02 2013 +0000
+++ b/emulators/x48/distinfo    Tue Jul 09 10:24:22 2013 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2013/07/08 08:37:10 he Exp $
+$NetBSD: distinfo,v 1.9 2013/07/09 10:24:22 he Exp $
 
 SHA1 (gxrom-r.bz2) = c60a83cd57681c3cb359f0cd2505ede686fdb4c8
 RMD160 (gxrom-r.bz2) = 1dafce5902310161cb60f3dde401941565fd031c
@@ -14,3 +14,4 @@
 SHA1 (patch-src_emulate.c) = 75a62b9038a07baff779ed7fad46252e276e69b0
 SHA1 (patch-src_global.h) = 48f076bdf72fb7a6df92e1bb961997fb3844ab30
 SHA1 (patch-src_serial.c) = 9b681d0d94ad53c9d770e54d56eddbda900627b1
+SHA1 (patch-src_x48_x11.c) = 4615a57f65e23f4352ea2717306f0095ef9464b0
diff -r 6979e49f68af -r c84ee2e21f01 emulators/x48/patches/patch-src_x48_x11.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/x48/patches/patch-src_x48_x11.c Tue Jul 09 10:24:22 2013 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_x48_x11.c,v 1.1 2013/07/09 10:24:22 he Exp $
+
+Pick X11 application defaults from path specified in the package
+Makefile.
+
+--- src/x48_x11.c.orig 2011-11-15 03:03:40.000000000 +0000
++++ src/x48_x11.c
+@@ -1100,8 +1100,9 @@ char **argv;
+     }
+ 
+   /* 2. /usr/lib/X11/app-defaults/X48 */
++  /* Erm...  Rather, get this from package Makefile via CPPFLAGS */
+ 
+-  merge_app_defaults("/usr/lib/X11/app-defaults", &rdb);
++  merge_app_defaults(X11APPDEFS, &rdb);
+ 
+   /* 3. Values in $XUSERFILESEARCHPATH/X48, or $XAPPLRESDIR/X48 */
+