diff options
| author | garbled <garbled@pkgsrc.org> | 1998-09-16 18:05:05 +0000 |
|---|---|---|
| committer | garbled <garbled@pkgsrc.org> | 1998-09-16 18:05:05 +0000 |
| commit | 4ee80ffb990ba433f73b67947f09c53174552a49 (patch) | |
| tree | 556bb8dd90ee3ac32dfc7098a49dd256fae75c7d | |
| parent | 6f7cb037c5bbe18c3a1eb6ed5ae4e226735fb5e8 (diff) | |
| download | pkgsrc-4ee80ffb990ba433f73b67947f09c53174552a49.tar.gz | |
Make this pkg run on alpha, slay author.
| -rw-r--r-- | x11/fvwm1/Makefile | 8 | ||||
| -rw-r--r-- | x11/fvwm1/patches/patch-ac | 14 | ||||
| -rw-r--r-- | x11/fvwm1/patches/patch-ad | 12 |
3 files changed, 32 insertions, 2 deletions
diff --git a/x11/fvwm1/Makefile b/x11/fvwm1/Makefile index 1177ff4411d..0844bbcabfe 100644 --- a/x11/fvwm1/Makefile +++ b/x11/fvwm1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 1998/08/20 15:17:33 tsarna Exp $ +# $NetBSD: Makefile,v 1.12 1998/09/16 18:05:05 garbled Exp $ # FreeBSD Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp # @@ -20,9 +20,13 @@ post-extract: cd ${WRKSRC}/modules; \ for FILE in Fvwm*/Imakefile; do \ ${MV} $${FILE} $${FILE}.orig; \ - ${SED} s/ComplexProgramTarget/ComplexProgramTargetNoMan/ \ + ${SED} -e 's/ComplexProgramTarget/ComplexProgramTargetNoMan/' \ + -e 's@#ifdef AlphaArchitecture@#if defined(AlphaArchitecture) \&\& !defined(NetBSDArchitecture)@' \ <$${FILE}.orig >$${FILE}; \ done + ${MV} ${WRKSRC}/modules/GoodStuff/Imakefile ${WRKSRC}/modules/GoodStuff/Imakefile.orig + ${SED} -e 's@#ifdef AlphaArchitecture@#if defined(AlphaArchitecture) \&\& !defined(NetBSDArchitecture)@' \ + <${WRKSRC}/modules/GoodStuff/Imakefile.orig >${WRKSRC}/modules/GoodStuff/Imakefile post-install: @${MKDIR} ${PREFIX}/lib/X11/fvwm/pixmaps diff --git a/x11/fvwm1/patches/patch-ac b/x11/fvwm1/patches/patch-ac new file mode 100644 index 00000000000..b455ba395c6 --- /dev/null +++ b/x11/fvwm1/patches/patch-ac @@ -0,0 +1,14 @@ +$NetBSD: patch-ac,v 1.1 1998/09/16 18:05:06 garbled Exp $ +--- fvwm/alpha_header.h.orig Wed Sep 16 08:30:50 1998 ++++ fvwm/alpha_header.h Wed Sep 16 08:31:22 1998 +@@ -11,8 +11,9 @@ + #ifdef __GNUC__ + extern size_t strlen(char *); + #endif +- ++/* + extern int bzero(char *, int); + extern int gethostname (char *, int); ++*/ + /**************************************************************************/ + diff --git a/x11/fvwm1/patches/patch-ad b/x11/fvwm1/patches/patch-ad new file mode 100644 index 00000000000..22b14d0cbf6 --- /dev/null +++ b/x11/fvwm1/patches/patch-ad @@ -0,0 +1,12 @@ +$NetBSD: patch-ad,v 1.1 1998/09/16 18:05:06 garbled Exp $ +--- fvwm/Imakefile.orig Wed Sep 16 08:37:29 1998 ++++ fvwm/Imakefile Wed Sep 16 08:38:08 1998 +@@ -16,7 +16,7 @@ + + DEPLIBS = $(DEPXLIB) ../libs/libfvwmlib.a + +-#ifdef AlphaArchitecture ++#if defined(AlphaArchitecture) && !defined(NetBSDArchitecture) + LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -ldnet_stub -L../libs -lfvwmlib + #else + #ifdef HPArchitecture |