pkgsrc-WIP-changes archive

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

plan9port: Add a patch to honors LDFLAGS for xshove



Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Wed Jul 8 13:54:28 2020 +0200
Changeset:	f647fdab55c570f883428343b2eef401b7fa4e93

Modified Files:
	plan9port/Makefile
	plan9port/TODO
	plan9port/distinfo
Added Files:
	plan9port/patches/patch-src_cmd_rio_mkfile

Log Message:
plan9port: Add a patch to honors LDFLAGS for xshove

Previously it was not linked against libX11.
Now plan9port finally installs but there is still a lot of TODO to clean it up
and fix it (e.g. acme and probably all other graphical programs fail to run).

Please give a look to TODO and try it if you would like to help!

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f647fdab55c570f883428343b2eef401b7fa4e93

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

diffstat:
 plan9port/Makefile                         |  5 +++++
 plan9port/TODO                             |  7 ++++++-
 plan9port/distinfo                         |  1 +
 plan9port/patches/patch-src_cmd_rio_mkfile | 12 ++++++++++++
 4 files changed, 24 insertions(+), 1 deletion(-)

diffs:
diff --git a/plan9port/Makefile b/plan9port/Makefile
index bce2bcb4d3..da892329cb 100644
--- a/plan9port/Makefile
+++ b/plan9port/Makefile
@@ -53,6 +53,11 @@ pre-build:
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/plan9
 	${MV} ${WRKSRC}/* ${DESTDIR}${PREFIX}/plan9
 
+do-configure:
+	echo "CFLAGS='${CFLAGS}'" >> ${WRKSRC}/LOCAL.config
+	echo "LDFLAGS='${LDFLAGS}'" >> ${WRKSRC}/LOCAL.config
+	echo "FONTSRV=fontsrv" >> ${WRKSRC}/LOCAL.config
+
 do-build:
 	${RUN} cd ${DESTDIR}${PREFIX}/plan9 && \
 	    ./INSTALL -b
diff --git a/plan9port/TODO b/plan9port/TODO
index 38e5a79c36..b5c3f1fe83 100644
--- a/plan9port/TODO
+++ b/plan9port/TODO
@@ -1 +1,6 @@
-- Address hardcoded assumptions (honors CFLAGS, LDFLAGS, X11BASE)
+- Address possible further hardcoded assumptions
+- acme and probably other graphical programs fails with:
+
+   % acme
+   imageinit: can't open font /lib/font/bit/lucsans/euro.8.font: No such file or directory
+
diff --git a/plan9port/distinfo b/plan9port/distinfo
index 488942ea0f..22a60eec9f 100644
--- a/plan9port/distinfo
+++ b/plan9port/distinfo
@@ -6,6 +6,7 @@ SHA512 (plan9port-20200622-95ab1308b410ad8547e38e47ec4a36f560dcece5.tar.gz) = e3
 Size (plan9port-20200622-95ab1308b410ad8547e38e47ec4a36f560dcece5.tar.gz) = 23445330 bytes
 SHA1 (patch-include_u.h) = d8681e7c663f9dd6da46d0af2eb33a8e1b014fbd
 SHA1 (patch-src_cmd_devdraw_mkwsysrules.sh) = 7418cfbedafa74145c4c3395fe11b2bb3b6b50ef
+SHA1 (patch-src_cmd_rio_mkfile) = beede09cfca844210aee0d1a24b1f569ade3d5d9
 SHA1 (patch-src_libthread_NetBSD-386-asm.s) = 474ee6eaf11115b31b1abf4e1536eceab4b5e0c7
 SHA1 (patch-src_libthread_NetBSD-power-asm.s) = 516705bd9d87e4c4010b7eff2add38a9ec1abbda
 SHA1 (patch-src_libthread_NetBSD.c) = 88a67788c005fd0bb7df3a6b205577f6a7377949
diff --git a/plan9port/patches/patch-src_cmd_rio_mkfile b/plan9port/patches/patch-src_cmd_rio_mkfile
new file mode 100644
index 0000000000..387b48fb88
--- /dev/null
+++ b/plan9port/patches/patch-src_cmd_rio_mkfile
@@ -0,0 +1,12 @@
+$NetBSD$
+
+Properly honors LDFLAGS.
+
+--- src/cmd/rio/mkfile.orig	2020-06-22 15:22:27.000000000 +0000
++++ src/cmd/rio/mkfile
+@@ -39,4 +39,4 @@ xevents.$O printevent.$O: printevent.h
+ error.$O: showevent/ShowEvent.c
+ 
+ $O.xshove: xshove.$O
+-	$LD -o $O.xshove xshove.$O -lX11
++	$LD -o $O.xshove xshove.$O $LDFLAGS


Home | Main Index | Thread Index | Old Index