diff options
| author | mbr <mbr@FreeBSD.org> | 2003-01-12 23:08:05 +0800 |
|---|---|---|
| committer | mbr <mbr@FreeBSD.org> | 2003-01-12 23:08:05 +0800 |
| commit | 2f28586f9a18803b867f1a72c8bd5595c47590e3 (patch) | |
| tree | 29745098814f082cf8d01b1fcf165943de3f04da /editors/openoffice-1.0 | |
| parent | 3ff75fbee0cd867de7c9f7e0523a80a440f1e0fb (diff) | |
| download | freebsd-ports-gnome-2f28586f9a18803b867f1a72c8bd5595c47590e3.tar.gz freebsd-ports-gnome-2f28586f9a18803b867f1a72c8bd5595c47590e3.tar.zst freebsd-ports-gnome-2f28586f9a18803b867f1a72c8bd5595c47590e3.zip | |
Remove the procfs dependency. Use the PS_STRINGS macro to get argv[].
Diffstat (limited to 'editors/openoffice-1.0')
| -rw-r--r-- | editors/openoffice-1.0/Makefile | 15 | ||||
| -rw-r--r-- | editors/openoffice-1.0/files/patch-sal+osl+unx+system.h | 28 | ||||
| -rw-r--r-- | editors/openoffice-1.0/pkg-message | 8 |
3 files changed, 23 insertions, 28 deletions
diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile index 1ceb2134c072..af95b9deeb4e 100644 --- a/editors/openoffice-1.0/Makefile +++ b/editors/openoffice-1.0/Makefile @@ -35,7 +35,6 @@ TCSH?= /bin/tcsh .include <bsd.port.pre.mk> -PROCFS!= ${MOUNT} | ${GREP} ^procfs | ${AWK} '{print $1}' INSTALLATION_BASEDIR= OpenOffice.org1.0 DIST_SUBDIR= openoffice DICT_DIR= ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/ @@ -166,20 +165,6 @@ CONFIGURE_ARGS+= --enable-gcc3 pre-fetch: @${ECHO} @${ECHO} "REQUIREMENTS:" -.if ${PROCFS} - @${ECHO} - @${ECHO} Check if procfs is running: YES -.else - @${ECHO} ----------------------------------------------------------- - @${ECHO} - @${ECHO} OpenOffice setup still needs a running procfs, which may - @${ECHO} not be activated. Please read the procfs\(5\) manpage and - @${ECHO} ensure the the following line is in /etc/fstab: - @${ECHO} - @${ECHO} proc /proc procfs rw 0 0 - @${ECHO} - @${ECHO} ----------------------------------------------------------- -.endif .if !defined(USE_GCC) || !defined(WITH_DEBUG) @${ECHO} @${ECHO} "OPTIONS:" diff --git a/editors/openoffice-1.0/files/patch-sal+osl+unx+system.h b/editors/openoffice-1.0/files/patch-sal+osl+unx+system.h index d75cac79f29e..c4e255952fc7 100644 --- a/editors/openoffice-1.0/files/patch-sal+osl+unx+system.h +++ b/editors/openoffice-1.0/files/patch-sal+osl+unx+system.h @@ -1,6 +1,20 @@ ---- ../sal/osl/unx/system.h.orig Mon Mar 11 01:41:13 2002 -+++ ../sal/osl/unx/system.h Mon Mar 11 01:41:25 2002 -@@ -216,12 +216,9 @@ +--- ../sal/osl/unx/system.h.orig Wed Jun 5 16:24:19 2002 ++++ ../sal/osl/unx/system.h Sun Jan 12 15:48:03 2003 +@@ -205,6 +205,13 @@ + # include <sys/ioctl.h> + # include <sys/time.h> + # include <sys/uio.h> ++# include <sys/exec.h> ++# include <vm/vm.h> ++# include <vm/vm_param.h> ++# include <vm/pmap.h> ++# include <vm/swap_pager.h> ++# include <machine/vmparam.h> ++# include <machine/pmap.h> + # include <sys/un.h> + # include <netinet/tcp.h> + # define IORESOURCE_TRANSFER_BSD +@@ -216,12 +223,13 @@ # elif BYTE_ORDER == PDP_ENDIAN # define _PDP_ENDIAN # endif @@ -10,8 +24,12 @@ -# define NO_PTHREAD_PRIORITY -# define CMD_ARG_PRG __progname -# define CMD_ARG_ENV environ -+# define CMD_ARG_PROC_STREAM -+# define CMD_ARG_PROC_NAME "/proc/%u/cmdline" ++/* __progname isn't sufficient here. We need the full path as well ++ * for e.g. setup and __progname only points to the binary name. ++ */ ++# define CMD_ARG_PRG_IS_DEFINED ++# define CMD_ARG_PRG *((struct ps_strings *)PS_STRINGS)->ps_argvstr ++# define CMD_ARG_ENV environ #endif #ifdef SCO diff --git a/editors/openoffice-1.0/pkg-message b/editors/openoffice-1.0/pkg-message index 15a812900a45..1bb93464e42b 100644 --- a/editors/openoffice-1.0/pkg-message +++ b/editors/openoffice-1.0/pkg-message @@ -16,14 +16,6 @@ installation. 1.2 OO.org installed as package -First check if procfs is running. OO.org setup does depend on -procfs and does crash without it. This dependency will be -removed in future, but at the moment it is needed. -Please read the procfs(5) manpage and ensure the the following -line is in /etc/fstab: - -proc /proc procfs rw 0 0 - If you have just installed OO.org as package, there is no "make install-user" option available. Instead you'll have to run as the user you like to use OO.org: |