cde: multiple fixes.

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: cde: multiple fixes.
From: Paolo Vincenzo Olivo <vms%retrobsd.ddns.net@localhost>
Date: Wed, 18 Jan 2023 12:47:12 +0000
Module Name:	pkgsrc-wip
Committed By:	Paolo Vincenzo Olivo <vms%retrobsd.ddns.net@localhost>
Pushed By:	vms
Date:		Wed Jan 18 13:47:12 2023 +0100
Changeset:	73e8a1a81c111061f8bebf827a6531363064f44f

Modified Files:
	TODO
	cde/MESSAGE.NetBSD
	cde/Makefile
	cde/TODO
	cde/distinfo
Added Files:
	cde/patches/patch-programs_dtlogin_Makefile.am

Log Message:
cde: multiple fixes.

* All relevant hard-coded assumption have been addressed.
* Fixed misplaced dtksh path in Makefile.
* Fixed reference to build directory in the generated dtlogin binary
* Package now working

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

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

diffstat:
 TODO                                           |  1 -
 cde/MESSAGE.NetBSD                             |  2 +-
 cde/Makefile                                   | 17 +++++++--
 cde/TODO                                       |  2 --
 cde/distinfo                                   |  1 +
 cde/patches/patch-programs_dtlogin_Makefile.am | 50 ++++++++++++++++++++++++++
 6 files changed, 67 insertions(+), 6 deletions(-)

diffs:
diff --git a/TODO b/TODO
index e66b31cbd7..b230c48b42 100644
--- a/TODO
+++ b/TODO
@@ -17,7 +17,6 @@ Suggested package updates
 	o blink-2.0.0
 	o cairo-java-1.0.8
 	o calligra-3.0.1
-	o cde-2.5.1
 	o cinelerra-4.5
 	o d4x-2.5.7.1
 	o daphne-1.0
diff --git a/cde/MESSAGE.NetBSD b/cde/MESSAGE.NetBSD
index a1e61a0d18..5ce8418053 100644
--- a/cde/MESSAGE.NetBSD
+++ b/cde/MESSAGE.NetBSD
@@ -5,7 +5,7 @@ You must register following information by hand.
 
 * /etc/rc.conf:
 rpcbind=YES
-rpcbind_flags="-wl"
+rpcbind_flags="-l"
 
 * /etc/inetd.conf:
 dtspcd		stream	tcp nowait	root	${PREFIX}/dt/bin/dtspcd dtspcd
diff --git a/cde/Makefile b/cde/Makefile
index 77b7cd8ac3..9da081c679 100644
--- a/cde/Makefile
+++ b/cde/Makefile
@@ -4,7 +4,7 @@ DISTNAME=	cde-2.5.1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=cdesktopenv/files/src/}
 
-MAINTAINER=	jelle%jellehermsen.nl@localhost
+MAINTAINER=	vins%NetBSD.org@localhost
 HOMEPAGE=	http://cdesktopenv.sourceforge.net/
 COMMENT=	Common Desktop Environment
 LICENSE=	gnu-lgpl-v2
@@ -46,7 +46,7 @@ REPLACE_AWK+=	programs/dtlogin/config/Xsession.src
 
 REPLACE_INTERPRETER+=	dtksh
 REPLACE.dtksh.old=	.*/bin/dtksh
-REPLACE.dtksh.new=	${PREFIX}/bin/dtksh
+REPLACE.dtksh.new=	${PREFIX}/dt/bin/dtksh
 REPLACE_FILES.dtksh+=	programs/dthelp/dthelpgen/dthelpgen.dtsh
 
 REPLACE_INTERPRETER+=	tclsh
@@ -110,6 +110,19 @@ post-extract:
 	${RUN}${CP} ${FILESDIR}/startcde.sh ${WRKSRC}/startcde
 
 pre-configure:
+	${RUN}${CHMOD} u+w ${WRKDIR}/*
+	${RUN}for f in `${FIND} ${WRKSRC} -type f ! -path doc | ${XARGS} ${GREP} -l '/usr/bin/X11'`; do \
+		${ECHO} Replacing X11 binary path in $$f ; \
+		${SED} -e 's:/usr/bin/X11:${X11BASE}/bin:g' $$f > $$f.pdone && ${MV} $$f.pdone $$f; \
+	done
+	${RUN}for f in `${FIND} ${WRKSRC} -type f ! -path doc | ${XARGS} ${GREP} -l '/usr/dt'`; do \
+		${ECHO} Replacing CDE prefix in $$f ; \
+		${SED} -e 's:/usr/dt:${PREFIX}/dt:g' $$f > $$f.pdone && ${MV} $$f.pdone $$f; \
+	done
+	${RUN}for f in `${FIND} ${WRKSRC} -type f ! -path doc | ${XARGS} ${GREP} -l '/etc/dt'`; do \
+		${ECHO} Replacing CDE syscondir in $$f ; \
+		${SED} -e 's:/etc/dt:${PKG_SYSCONFDIR}/dt:g' $$f > $$f.pdone && ${MV} $$f.pdone $$f; \
+	done
 	${RUN}set -e; cd ${WRKSRC} && autoreconf -fiv
 
 post-install:
diff --git a/cde/TODO b/cde/TODO
index 63468ff5e9..9316831419 100644
--- a/cde/TODO
+++ b/cde/TODO
@@ -1,7 +1,5 @@
 * Fix building without -std=c99.
-* Address further potential hardcoded assumptions.
 * Make PAM support optional.
 * Add nls build option for supported locales.
-* Fix other PLIST warnings.
 * MESSAGE.NetBSD -> README.NetBSD + README.pkgsrc
 * Testing required.
diff --git a/cde/distinfo b/cde/distinfo
index a2e8ce2695..87c40793bf 100644
--- a/cde/distinfo
+++ b/cde/distinfo
@@ -4,6 +4,7 @@ BLAKE2s (cde-2.5.1.tar.gz) = 33d94122ff02dbabc3ea246f2af18b12a3d05b48ade9137c9c6
 SHA512 (cde-2.5.1.tar.gz) = cacb9a1df21eb9959886ec2f6816fe99ec585e7264f548a85b03990f0e7fbc2dc6fa440cfe5e9ad29281360c30789c1b9ef3f96e1a711bfd2157064c640e803e
 Size (cde-2.5.1.tar.gz) = 57543245 bytes
 SHA1 (patch-configure.ac) = 7730332dd970729872687757701454dd285a8100
+SHA1 (patch-programs_dtlogin_Makefile.am) = 775e5417f7f0c38a70f6e3f85629940351ffad6a
 SHA1 (patch-programs_dtsearchpath_dtappg_Makefile.am) = b0a13e4b1b935c055736daa48302dafc1f9333c4
 SHA1 (patch-programs_dtterm_Makefile.am) = fb54156e1dd1c27a979c6aeb26e1679e1eb07ab6
 SHA1 (patch-programs_fontaliases_Makefile.am) = 97fe75753d788e9a9fa5c22191745f8714fd52ad
diff --git a/cde/patches/patch-programs_dtlogin_Makefile.am b/cde/patches/patch-programs_dtlogin_Makefile.am
new file mode 100644
index 0000000000..6d80f24abd
--- /dev/null
+++ b/cde/patches/patch-programs_dtlogin_Makefile.am
@@ -0,0 +1,50 @@
+$NetBSD$
+
+Avoid reference to build dir in dtlogin. 
+Fix X11 binary path.
+
+--- programs/dtlogin/Makefile.am.orig	2022-10-01 17:18:27.000000000 +0000
++++ programs/dtlogin/Makefile.am
+@@ -11,10 +11,11 @@ DTPAMSVCLIB =
+ endif
+ 
+ XDMDIR = $(CDE_LOGFILES_TOP)
++XBINDIR = @X11BASE@/bin
+ 
+ DEF_SERVER = $(XBINDIR)/X
+-DEF_USER_PATH = $(PATH):$(XBINDIR)
+-DEF_SYSTEM_PATH = $(PATH):$(XBINDIR)
++DEF_USER_PATH = /bin:/usr/bin:@PREFIX@/bin:$(XBINDIR)
++DEF_SYSTEM_PATH = /bin:/usr/bin:@PREFIX@/bin:$(XBINDIR)
+ 
+ DEF_BM_PATH = $(CDE_CONFIGURATION_TOP)/appconfig/icons/%L/%B%M.bm:$(CDE_CONFIGURATION_TOP)/appconfig/icons/%L/%B%M.pm:$(CDE_CONFIGURATION_TOP)/appconfig/icons/%L/%B:$(CDE_CONFIGURATION_TOP)/appconfig/icons/C/%B%M.bm:$(CDE_CONFIGURATION_TOP)/appconfig/icons/C/%B%M.pm:$(CDE_CONFIGURATION_TOP)/appconfig/icons/C/%B:$(CDE_INSTALLATION_TOP)/appconfig/icons/%L/%B%M.bm:$(CDE_INSTALLATION_TOP)/appconfig/icons/%L/%B%M.pm:$(CDE_INSTALLATION_TOP)/appconfig/icons/%L/%B:$(CDE_INSTALLATION_TOP)/appconfig/icons/C/%B%M.bm:$(CDE_INSTALLATION_TOP)/appconfig/icons/C/%B%M.pm:$(CDE_INSTALLATION_TOP)/appconfig/icons/C/%B
+ DEF_PM_PATH = $(CDE_CONFIGURATION_TOP)/appconfig/icons/%L/%B%M.pm:$(CDE_CONFIGURATION_TOP)/appconfig/icons/%L/%B%M.bm:$(CDE_CONFIGURATION_TOP)/appconfig/icons/%L/%B:$(CDE_CONFIGURATION_TOP)/appconfig/icons/C/%B%M.pm:$(CDE_CONFIGURATION_TOP)/appconfig/icons/C/%B%M.bm:$(CDE_CONFIGURATION_TOP)/appconfig/icons/C/%B:$(CDE_INSTALLATION_TOP)/appconfig/icons/%L/%B%M.pm:$(CDE_INSTALLATION_TOP)/appconfig/icons/%L/%B%M.bm:$(CDE_INSTALLATION_TOP)/appconfig/icons/%L/%B:$(CDE_INSTALLATION_TOP)/appconfig/icons/C/%B%M.pm:$(CDE_INSTALLATION_TOP)/appconfig/icons/C/%B%M.bm:$(CDE_INSTALLATION_TOP)/appconfig/icons/C/%B
+@@ -66,28 +67,20 @@ dtchooser_LDADD = $(DTCLIENTLIBS) $(XDMC
+ 
+ if LINUX
+ AM_CFLAGS += -DHASDES -DHASXDMAUTH
+-XBINDIR = /usr/bin
+ dtlogin_SOURCES += xdmauth.c
+ endif
+ 
+ if FREEBSD
+ AM_CFLAGS += -DHASDES -DHASXDMAUTH
+-XBINDIR = /usr/local/bin
+ dtlogin_SOURCES += xdmauth.c
+ endif
+ 
+ if OPENBSD
+-XBINDIR = /usr/X11R6/bin
+ AM_CFLAGS += -DHASDES -DHASXDMAUTH
+ dtlogin_SOURCES += xdmauth.c
+ endif
+ 
+-if NETBSD
+-XBINDIR = /usr/X11R7/bin
+-endif
+-
+ if SOLARIS
+-XBINDIR = /usr/bin/X11
+ dtlogin_LDADD += -lgen -lresolv -lbsm -lcmd
+ dtgreet_LDADD += -lgen -lresolv -lbsm -lcmd
+ dtchooser_LDADD += -lgen -lresolv -lbsm -lcmd
Prev by Date: emacs-git: enable tree-sitter
Next by Date: cde: add missing file to SUBST_FILES.paths
Previous by Thread: emacs-git: enable tree-sitter
Next by Thread: cde: add missing file to SUBST_FILES.paths
Indexes:
Home | Main Index | Thread Index | Old Index