diff options
| -rw-r--r-- | x11-toolkits/xview-clients/Makefile | 6 | ||||
| -rw-r--r-- | x11-toolkits/xview/files/patch-Imakefile | 30 | ||||
| -rw-r--r-- | x11-toolkits/xview/files/patch-clients+olwm+gettext.c | 15 |
3 files changed, 37 insertions, 14 deletions
diff --git a/x11-toolkits/xview-clients/Makefile b/x11-toolkits/xview-clients/Makefile index e308f5d61449..d85755c5826c 100644 --- a/x11-toolkits/xview-clients/Makefile +++ b/x11-toolkits/xview-clients/Makefile @@ -19,15 +19,17 @@ EXTRACT_ONLY= # empty MAINTAINER= ports@FreeBSD.org COMMENT= OpenLook applications and man pages -PATCH_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/x11-toolkits/xview:build +PATCH_DEPENDS= ${NONEXISTENT}:${.CURDIR}/../xview:build LIB_DEPENDS= xview.3:${PORTSDIR}/x11-toolkits/xview USE_X_PREFIX= yes WRKSRC= ${WRKDIRPREFIX}${.CURDIR}/../xview/work/${DISTNAME} ALL_TARGET= Clients -INSTALL_TARGET= 'SUBDIRS=clients' install install.man MAN1= clock.1 cmdtool.1 olwm.1 olwmslave.1 shelltool.1 MANCOMPRESSED= yes +do-install: + @cd ${WRKSRC}/clients; ${MAKE} install install.man + .include <bsd.port.mk> diff --git a/x11-toolkits/xview/files/patch-Imakefile b/x11-toolkits/xview/files/patch-Imakefile index ff53199f4a60..49ba5f52e7da 100644 --- a/x11-toolkits/xview/files/patch-Imakefile +++ b/x11-toolkits/xview/files/patch-Imakefile @@ -1,5 +1,5 @@ --- Imakefile.orig Sun Jun 26 03:47:22 1994 -+++ Imakefile Sat Aug 6 23:14:35 2005 ++++ Imakefile Thu Aug 11 14:26:34 2005 @@ -4,8 +4,8 @@ /**/# Top level Imakefile for ProductNameAndRelease /**/# @(#)Imakefile 1.7 1/7/92 SMI @@ -11,7 +11,7 @@ #define IHaveSubdirs #define PassCDebugFlags -@@ -13,7 +13,7 @@ +@@ -13,14 +13,21 @@ WORLDOPTS = /**/# If you want to make only the library, then start the build in the lib /**/# subdirectory. Be sure to do a 'make includes' in images and bitmaps first. @@ -20,17 +20,22 @@ #if InstallOpenLookFonts FONTSDIR = fonts #else -@@ -21,6 +21,9 @@ + FONTSDIR = #endif CLIENTSDIR = clients - SUBDIRS = $(COREDIRS) $(FONTSDIR) +- SUBDIRS = $(COREDIRS) $(FONTSDIR) ++.ifdef DOCLIENTS ++ SUBDIRS = $(CLIENTSDIR) ++.else ++ SUBDIRS = $(COREDIRS) $(FONTSDIR) ++.endif +.ifdef WITHDOCSUBDIR -+SUBDIRS+= doc ++SUBDIRS+=doc +.endif /**/# even if these subdirs are not included in the general rules, be sure to /**/# do a make clean in them. CLEAN_SUBDIRS = clients contrib doc fonts bitmaps images lib misc util -@@ -59,11 +62,11 @@ +@@ -59,11 +66,11 @@ @echo "" @date @echo "" @@ -47,3 +52,16 @@ @echo "" @date @echo "" +@@ -96,9 +103,9 @@ + @echo "" + @date + @echo "" +- $(MAKE) $(MFLAGS) 'SUBDIRS=$(CLIENTSDIR)' Makefiles +- $(MAKE) $(MFLAGS) 'SUBDIRS=$(CLIENTSDIR)' depend +- $(MAKE) $(MFLAGS) 'SUBDIRS=$(CLIENTSDIR)' 'CDEBUGFLAGS=$(CDEBUGFLAGS)' $(WORLDOPTS) ++ $(MAKE) $(MFLAGS) -DDOCLIENTS Makefiles ++ $(MAKE) $(MFLAGS) -DDOCLIENTS depend ++ $(MAKE) $(MFLAGS) -DDOCLIENTS 'CDEBUGFLAGS=$(CDEBUGFLAGS)' $(WORLDOPTS) + @echo "" + @date + @echo "" diff --git a/x11-toolkits/xview/files/patch-clients+olwm+gettext.c b/x11-toolkits/xview/files/patch-clients+olwm+gettext.c index 7858cf27d5f0..08c598dd4153 100644 --- a/x11-toolkits/xview/files/patch-clients+olwm+gettext.c +++ b/x11-toolkits/xview/files/patch-clients+olwm+gettext.c @@ -1,13 +1,16 @@ ---- clients/olwm/gettext.c.orig Fri Oct 17 11:24:49 2003 -+++ clients/olwm/gettext.c Fri Oct 17 11:30:14 2003 -@@ -20,7 +20,10 @@ +--- clients/olwm/gettext.c.orig Thu Aug 11 13:59:59 2005 ++++ clients/olwm/gettext.c Thu Aug 11 14:05:12 2005 +@@ -16,11 +16,13 @@ + #endif + + char *malloc(), *strdup(); +-char * dgettext(); ++char * dgettext(char *domain_name, char *msg_id); char *_gettext(); char *in_path(); char *fgets(), *getenv(); --caddr_t mmap(), calloc(); -+caddr_t calloc(); +#ifndef __FreeBSD__ -+caddr_t mmap(); + caddr_t mmap(), calloc(); +#endif static struct domain_binding *firstbind=0, *lastbind=0; |