summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordholland <dholland>2012-03-26 03:28:11 +0000
committerdholland <dholland>2012-03-26 03:28:11 +0000
commit4efb317bafbdb18df378394766cd3397ef39cd03 (patch)
treeb482c0de7e5ff810eaa8c2ae2754f219e160b12f
parentc70028d717609beaa175cfe10936b5f7b841db48 (diff)
downloadpkgsrc-4efb317bafbdb18df378394766cd3397ef39cd03.tar.gz
This package's upstream distfile has hit on the wonderful idea of
shipping symlinks into /usr/share/automake-1.11 instead of copies of various semi-standard gnuish files, including some scripts needed by the build. Remove the patch that causes the build to try to run things direct from ${PREFIX}/share/automake-1.11, as that's not the way things are supposed to be done in a buildlink universe. However, adding a bl3.mk to automake to allow using this stuff is itself wrong. So instead, work around this mess by adding a post-extract hack that deletes the symlinks and replaces them with the actual files from automake. Also, add a build dependence on automake so the files are actually there when we try to reference them. (hi reinoud!) No revbump needed as the package didn't build. Grumble.
-rw-r--r--emulators/b-em/distinfo4
-rw-r--r--emulators/b-em/hacks.mk13
-rw-r--r--emulators/b-em/patches/patch-src-makefile.in12
3 files changed, 16 insertions, 13 deletions
diff --git a/emulators/b-em/distinfo b/emulators/b-em/distinfo
index c0a03fb6d67..e4ce2c263bd 100644
--- a/emulators/b-em/distinfo
+++ b/emulators/b-em/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2012/02/20 15:45:19 reinoud Exp $
+$NetBSD: distinfo,v 1.2 2012/03/26 03:28:11 dholland Exp $
SHA1 (B-emv2.1aLinux.tar.gz) = a5e674009eaeab5aeb9b50f3c699c6d0ea110c38
RMD160 (B-emv2.1aLinux.tar.gz) = b31a4812fabad9d6d67372361955b3de3686943b
@@ -7,7 +7,7 @@ SHA1 (patch-src-b-em.h) = d450f335c15f539cf3f81a800dec87472c134cab
SHA1 (patch-src-cmos.c) = dfddf6a6bc4b494e11b7882363a6e79280480b20
SHA1 (patch-src-fdi2raw.c) = 98a00eb3059c92b0c2e8009275e5b4a7dfee9b0c
SHA1 (patch-src-linux.c) = b36cf4f3c957cab24bf67cd34688231e3b292d02
-SHA1 (patch-src-makefile.in) = ae5e7fbd9d13cdd6af89512e10a2d23c4716c0cf
+SHA1 (patch-src-makefile.in) = 0de839eb598b06dec2db57558f9909568988f3d9
SHA1 (patch-src-resources.h) = 6f62502882e82e56f8bd606dd8618e3eccb7b786
SHA1 (patch-src-tapenoise.c) = b279aabb6eec7a816a8fe2178e44d326e5ebdbe1
SHA1 (patch-src-win.c) = 119f41dc2c80a53f5edbeb7e42d85238d1d21b82
diff --git a/emulators/b-em/hacks.mk b/emulators/b-em/hacks.mk
new file mode 100644
index 00000000000..5bbf374c6e0
--- /dev/null
+++ b/emulators/b-em/hacks.mk
@@ -0,0 +1,13 @@
+# This package's distfile has the wonderful idea of containing
+# symlinks to various things in /usr/share/automake-1.11/. What
+# will they think of next?
+
+BUILD_DEPENDS+= automake>=1.11<1.12:../../devel/automake
+
+post-extract:
+ @echo 'Fixing symlinks to external files'
+.for FILE in compile COPYING depcomp INSTALL
+ [ -h ${WRKSRC}/${FILE} ] || exit 1
+ rm -f ${WRKSRC}/${FILE}
+ cp ${PREFIX}/share/automake-1.11/${FILE} ${WRKSRC}/${FILE}
+.endfor
diff --git a/emulators/b-em/patches/patch-src-makefile.in b/emulators/b-em/patches/patch-src-makefile.in
index 9b608c8e93a..533f287065d 100644
--- a/emulators/b-em/patches/patch-src-makefile.in
+++ b/emulators/b-em/patches/patch-src-makefile.in
@@ -1,17 +1,7 @@
-$NetBSD: patch-src-makefile.in,v 1.1 2012/02/20 15:45:19 reinoud Exp $
+$NetBSD: patch-src-makefile.in,v 1.2 2012/03/26 03:28:12 dholland Exp $
--- src/Makefile.in.orig 2010-10-17 16:02:04.000000000 +0000
+++ src/Makefile.in
-@@ -76,7 +76,8 @@ am__DEPENDENCIES_1 =
- @OS_WIN_FALSE@b_em_DEPENDENCIES = $(am__DEPENDENCIES_1)
- SCRIPTS = $(noinst_SCRIPTS)
- DEFAULT_INCLUDES = -I.@am__isrc@
--depcomp = $(SHELL) $(top_srcdir)/depcomp
-+#depcomp = $(SHELL) $(top_srcdir)/depcomp
-+depcomp = $(SHELL) $(PREFIX)/share/automake-1.11/depcomp
- am__depfiles_maybe = depfiles
- am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -1277,7 +1278,7 @@ install-exec: install-exec-am
install-data: install-data-am
uninstall: uninstall-am