pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
cde: fix building on NetBSD-10
Module Name: pkgsrc-wip
Committed By: Paolo Vincenzo Olivo <vms%retrobsd.ddns.net@localhost>
Pushed By: vms
Date: Wed Jan 18 22:45:34 2023 +0100
Changeset: dec5940fa2302ef45b8072a399488a524257239a
Modified Files:
cde/Makefile
cde/PLIST
cde/TODO
cde/distinfo
Added Files:
cde/MESSAGE
cde/files/README.netbsd
cde/files/README.pkgsrc
cde/patches/patch-lib_DtMmdb_btree__berkeley_memmove.c
cde/patches/patch-lib_DtMmdb_btree__berkeley_snprintf.c
cde/patches/patch-programs_dtcm_libDtCmP_util.h
Removed Files:
cde/MESSAGE.NetBSD
Log Message:
cde: fix building on NetBSD-10
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=dec5940fa2302ef45b8072a399488a524257239a
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
cde/MESSAGE | 7 ++++
cde/MESSAGE.NetBSD | 35 ------------------
cde/Makefile | 17 ++++++---
cde/PLIST | 2 ++
cde/TODO | 2 --
cde/distinfo | 3 ++
cde/files/README.netbsd | 17 +++++++++
cde/files/README.pkgsrc | 42 ++++++++++++++++++++++
.../patch-lib_DtMmdb_btree__berkeley_memmove.c | 15 ++++++++
.../patch-lib_DtMmdb_btree__berkeley_snprintf.c | 19 ++++++++++
cde/patches/patch-programs_dtcm_libDtCmP_util.h | 14 ++++++++
11 files changed, 132 insertions(+), 41 deletions(-)
diffs:
diff --git a/cde/MESSAGE b/cde/MESSAGE
new file mode 100644
index 0000000000..bfbe09715a
--- /dev/null
+++ b/cde/MESSAGE
@@ -0,0 +1,7 @@
+===========================================================================
+$NetBSD: MESSAGE.NetBSD,v 1.1 2014/07/30 09:23:05 obache Exp $
+
+Look up the READMEs installed inside ${PREFIX}/share/doc/cde to find out
+how to configure CDE for your platform.
+
+===========================================================================
diff --git a/cde/MESSAGE.NetBSD b/cde/MESSAGE.NetBSD
deleted file mode 100644
index 5ce8418053..0000000000
--- a/cde/MESSAGE.NetBSD
+++ /dev/null
@@ -1,35 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.NetBSD,v 1.1 2014/07/30 09:23:05 obache Exp $
-
-You must register following information by hand.
-
-* /etc/rc.conf:
-rpcbind=YES
-rpcbind_flags="-l"
-
-* /etc/inetd.conf:
-dtspcd stream tcp nowait root ${PREFIX}/dt/bin/dtspcd dtspcd
-cmsd/2-5 dgram rpc/udp wait root ${PREFIX}/dt/bin/rpc.cmsd rpc.cmsd
-ttdbserver/1 stream rpc/tcp wait root ${PREFIX}/dt/bin/rpc.ttdbserver rpc.ttdbserver
-
-* /etc/rpc:
-cmsd 100068 dtcalendar
-ttdbserver 100083 ttooltalk
-
-* /etc/X11/xorg.conf.d/99-fonts.conf
-Section "Files"
- FontPath "${PREFIX}/share/fonts/100dpi/"
- FontPath "${PREFIX}/share/fonts/75dpi/"
-EndSection
-
-To use CDE applications, adjust your environment as follows:
-
- $ export PATH=$PATH:${PREFIX}/dt/bin
- $ export MANPATH=$MANPATH:${PREFIX}/dt/man
-
-To start the Common Desktop Environment,
-
- $ env LANG=C startx ${PREFIX}/dt/bin/Xsession
-
-Or use the provided `startcde' script.
-===========================================================================
diff --git a/cde/Makefile b/cde/Makefile
index a9fd9b5060..efd1ebcf37 100644
--- a/cde/Makefile
+++ b/cde/Makefile
@@ -66,7 +66,8 @@ SUBST_MESSAGE.iconv= Fix for GNU iconv.
SUBST_CLASSES+= paths
SUBST_STAGE.paths= pre-configure
SUBST_FILES.paths+= configure.ac
-SUBST_FILES.paths+= startcde
+SUBST_FILES.paths+= pkgsrc/startcde
+SUBST_FILES.paths+= pkgsrc/README.*
SUBST_FILES.paths+= programs/dtlogin/Makefile.am
SUBST_VARS.paths= PREFIX VARBASE PKG_SYSCONFDIR X11BASE
SUBST_MESSAGE.paths= Replacing path placeholders.
@@ -108,7 +109,11 @@ INSTALLATION_DIRS+= bin share/doc/${PKGBASE}
INSTALLATION_DIRS+= share/examples/${PKGBASE}/pam.d
post-extract:
- ${RUN}${CP} ${FILESDIR}/startcde.sh ${WRKSRC}/startcde
+ ${RUN}${MKDIR} ${WRKSRC}/pkgsrc
+ ${RUN}${CP} ${FILESDIR}/startcde.sh ${WRKSRC}/pkgsrc/startcde
+.for f in README.*
+ ${RUN}${CP} ${FILESDIR}/${f} ${WRKSRC}/pkgsrc
+.endfor
pre-configure:
${RUN}${CHMOD} u+w ${WRKDIR}/*
@@ -131,9 +136,13 @@ post-install:
${SH} -c '${STRIP} --strip-unneeded {} > /dev/null 2>&1' \;
${INSTALL_DATA} ${WRKSRC}/lib/pam/libpam/pam.conf \
${DESTDIR}${EGDIR}/pam.d/cde.conf
- ${INSTALL_SCRIPT} ${WRKSRC}/startcde ${DESTDIR}${PREFIX}/bin
+ ${INSTALL_SCRIPT} ${WRKSRC}/pkgsrc/startcde ${DESTDIR}${PREFIX}/bin
.for f in CONTRIBUTORS COPYING HISTORY README.md
- ${RUN}${MV} ${DESTDIR}${PREFIX}/dt/${f} \
+ ${RUN}${MV} ${DESTDIR}${PREFIX}/dt/${f} \
+ ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
+.endfor
+.for r in README.*
+ ${INSTALL_DATA} ${WRKSRC}/pkgsrc/${r} \
${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
.endfor
diff --git a/cde/PLIST b/cde/PLIST
index faced15829..ee14fe0538 100644
--- a/cde/PLIST
+++ b/cde/PLIST
@@ -3528,5 +3528,7 @@ share/doc/cde/CONTRIBUTORS
share/doc/cde/COPYING
share/doc/cde/HISTORY
share/doc/cde/README.md
+share/doc/cde/README.netbsd
+share/doc/cde/README.pkgsrc
share/examples/cde/pam.d/cde.conf
@pkgdir etc/dt/cde/fontaliases
diff --git a/cde/TODO b/cde/TODO
index 9316831419..ecbef7b276 100644
--- a/cde/TODO
+++ b/cde/TODO
@@ -1,5 +1,3 @@
-* Fix building without -std=c99.
* Make PAM support optional.
* Add nls build option for supported locales.
-* MESSAGE.NetBSD -> README.NetBSD + README.pkgsrc
* Testing required.
diff --git a/cde/distinfo b/cde/distinfo
index 87c40793bf..d32c4b72ad 100644
--- a/cde/distinfo
+++ b/cde/distinfo
@@ -4,6 +4,9 @@ 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-lib_DtMmdb_btree__berkeley_memmove.c) = 50249e82ee21c012c46bd633fd8f3b640bc6dbc9
+SHA1 (patch-lib_DtMmdb_btree__berkeley_snprintf.c) = 93270c3217129086174c22b964e62c14c57f7d47
+SHA1 (patch-programs_dtcm_libDtCmP_util.h) = 15f6d2595d30bbb1b432f4e557182e90dcd9803d
SHA1 (patch-programs_dtlogin_Makefile.am) = 775e5417f7f0c38a70f6e3f85629940351ffad6a
SHA1 (patch-programs_dtsearchpath_dtappg_Makefile.am) = b0a13e4b1b935c055736daa48302dafc1f9333c4
SHA1 (patch-programs_dtterm_Makefile.am) = fb54156e1dd1c27a979c6aeb26e1679e1eb07ab6
diff --git a/cde/files/README.netbsd b/cde/files/README.netbsd
new file mode 100644
index 0000000000..54dfe8876a
--- /dev/null
+++ b/cde/files/README.netbsd
@@ -0,0 +1,17 @@
+-----------------------------------------------------------------------
+For CDE to properly work on NetBSD,
+the following information must be registered by hand.
+
+/etc/rc.conf:
+rpcbind=YES
+rpcbind_flags="-l"
+
+/etc/inetd.conf:
+dtspcd stream tcp nowait root @PREFIX@/dt/bin/dtspcd dtspcd
+cmsd/2-5 dgram rpc/udp wait root @PREFIX@/dt/bin/rpc.cmsd rpc.cmsd
+ttdbserver/1 stream rpc/tcp wait root @PREFIX@/dt/bin/rpc.ttdbserver rpc.ttdbserver
+
+/etc/rpc:
+cmsd 100068 dtcalendar
+ttdbserver 100083 ttooltalk
+-----------------------------------------------------------------------
diff --git a/cde/files/README.pkgsrc b/cde/files/README.pkgsrc
new file mode 100644
index 0000000000..983c41427b
--- /dev/null
+++ b/cde/files/README.pkgsrc
@@ -0,0 +1,42 @@
+-----------------------------------------------------------------------
+To provide support for CDE font aliases, the required font paths must
+appended to the standard X server configuration.
+
+This can be done by creating a `99-fonts.conf' file with the following
+content:
+
+Section "Files"
+ FontPath "${PREFIX}/share/fonts/100dpi/"
+ FontPath "${PREFIX}/share/fonts/75dpi/"
+EndSection
+
+Place the file inside either:
+
+ - /etc/X11/xorg.conf.d # native X11
+ - @PREFIX@/etc/X11/xorg.conf.d # modular X11
+
+-----------------------------------------------------------------------
+
+To use CDE applications, adjust your environment as follows:
+
+ $ export PATH=$PATH:${PREFIX}/dt/bin
+ $ export MANPATH=$MANPATH:${PREFIX}/dt/man
+
+-----------------------------------------------------------------------
+
+To start the Common Desktop Environment,
+
+ $ env LANG=C startx ${PREFIX}/dt/bin/Xsession
+
+Or use the provided `@PREFIX@/bin/startcde' script.
+
+-----------------------------------------------------------------------
+
+To start the Dt Login Manager,
+
+ $ cp @PREFIX@/share/examples/rc.d/dtlogin /etc/rc.d
+ $ service dtlogin onestart
+
+To enable the dtlogin service at startup,
+
+ $ echo dtlogin=YES >> /etc/rc.conf
diff --git a/cde/patches/patch-lib_DtMmdb_btree__berkeley_memmove.c b/cde/patches/patch-lib_DtMmdb_btree__berkeley_memmove.c
new file mode 100644
index 0000000000..87faf4bdf1
--- /dev/null
+++ b/cde/patches/patch-lib_DtMmdb_btree__berkeley_memmove.c
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Avoid conflicting types for memmove(3).
+
+--- lib/DtMmdb/btree_berkeley/memmove.c.orig 2022-10-01 17:18:27.000000000 +0000
++++ lib/DtMmdb/btree_berkeley/memmove.c
+@@ -62,7 +62,7 @@ static char sccsid[] = "@(#)bcopy.c 8.1
+ #endif /* LIBC_SCCS and not lint */
+
+ #include "cdefs.h"
+-#include <string.h>
++#include <stddef.h>
+
+ /*
+ * sizeof(word) MUST BE A POWER OF TWO
diff --git a/cde/patches/patch-lib_DtMmdb_btree__berkeley_snprintf.c b/cde/patches/patch-lib_DtMmdb_btree__berkeley_snprintf.c
new file mode 100644
index 0000000000..34fe1a13b3
--- /dev/null
+++ b/cde/patches/patch-lib_DtMmdb_btree__berkeley_snprintf.c
@@ -0,0 +1,19 @@
+$NetBSD$
+
+Avoid conflicting types for snprintf().
+
+--- lib/DtMmdb/btree_berkeley/snprintf.c.orig 2022-10-01 17:18:27.000000000 +0000
++++ lib/DtMmdb/btree_berkeley/snprintf.c
+@@ -21,12 +21,10 @@
+ * Floor, Boston, MA 02110-1301 USA
+ */
+ /* $XConsortium: snprintf.c /main/3 1996/06/11 17:14:27 cde-hal $ */
+-#include <sys/types.h>
+ #include "cdefs.h"
+
+ #include <compat.h>
+ #include <string.h>
+-#include <stdio.h>
+
+ #ifdef __STDC__
+ #include <stdarg.h>
diff --git a/cde/patches/patch-programs_dtcm_libDtCmP_util.h b/cde/patches/patch-programs_dtcm_libDtCmP_util.h
new file mode 100644
index 0000000000..936590b839
--- /dev/null
+++ b/cde/patches/patch-programs_dtcm_libDtCmP_util.h
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Do not redefine strncat().
+
+--- programs/dtcm/libDtCmP/util.h.orig 2022-10-01 17:18:27.000000000 +0000
++++ programs/dtcm/libDtCmP/util.h
+@@ -269,7 +269,6 @@ extern void print_tick(time_t);
+ extern boolean_t same_path(char*, char*);
+ extern boolean_t same_user(char*, char*);
+ extern char * str_to_cr(char*);
+-extern char * strncat(char *, const char *, size_t n);
+ extern char * substr(char*, int, int n);
+ extern void syserr(char*, int, int, int);
+ extern Lines * text_to_lines (char*, int);
Home |
Main Index |
Thread Index |
Old Index