Attachment 7923 Details for Bug 16878 – file.diff

[patch] file.diff

file.diff (text/plain), 4.58 KB, created by tkato on 2000-02-21 14:20:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2000-02-21 14:20:03 UTC

Size: 4.58 KB

patch

obsolete

>diff -urN /usr/ports/x11-wm/sapphire/Makefile x11-wm/sapphire/Makefile
>--- /usr/ports/x11-wm/sapphire/Makefile	Thu Jan 27 20:07:40 2000
>+++ x11-wm/sapphire/Makefile	Mon Feb 21 00:41:03 2000
>@@ -1,12 +1,13 @@
> # New ports collection makefile for:	sapphire
>-# Version required:	0.13.6
>+# Version required:	0.14.0.2
> # Date created:		26 Jan 2000
> # Whom:			trevor@jpj.net
> #
> # $FreeBSD: ports/x11-wm/sapphire/Makefile,v 1.1.1.1 2000/01/27 11:07:40 nakai Exp $
> #
> 
>-DISTNAME=	sapphire-0.13.6
>+DISTNAME=	sapphire-0.14.0-2
>+PKGNAME=	sapphire-0.14.0.2
> CATEGORIES=	x11-wm
> MASTER_SITES=	http://download.sourceforge.net/sapphire/
> 
>@@ -15,5 +16,22 @@
> USE_GMAKE=	yes
> USE_X_PREFIX=	yes
> GNU_CONFIGURE=	yes
>+
>+post-extract:
>+	@${CP} ${WRKSRC}/data.inst ${WRKSRC}/sapphire.inst
>+
>+post-patch:
>+	@${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/sapphire.inst
>+
>+post-install:
>+	${INSTALL_SCRIPT} ${WRKSRC}/sapphire.inst ${PREFIX}/bin
>+	@${MKDIR} ${PREFIX}/share/sapphire
>+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/sapphire
>+	@${MKDIR} ${PREFIX}/share/sapphire/menu
>+	${INSTALL_DATA} ${WRKSRC}/data/menu/* ${PREFIX}/share/sapphire/menu
>+	@${MKDIR} ${PREFIX}/share/sapphire/themes
>+	${INSTALL_DATA} ${WRKSRC}/data/themes/* ${PREFIX}/share/sapphire/themes
>+	@${MKDIR} ${PREFIX}/share/sapphire/wmconfig
>+	${INSTALL_DATA} ${WRKSRC}/data/wmconfig/* ${PREFIX}/share/sapphire/wmconfig
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/x11-wm/sapphire/files/md5 x11-wm/sapphire/files/md5
>--- /usr/ports/x11-wm/sapphire/files/md5	Thu Jan 27 20:07:40 2000
>+++ x11-wm/sapphire/files/md5	Mon Feb 21 00:41:32 2000
>@@ -1 +1 @@
>-MD5 (sapphire-0.13.6.tar.gz) = b37848dd3aa9d4115af4e69b5d998799
>+MD5 (sapphire-0.14.0-2.tar.gz) = 61f70e6d4f32380147f2015fa73b326d
>diff -urN /usr/ports/x11-wm/sapphire/patches/patch-aa x11-wm/sapphire/patches/patch-aa
>--- /usr/ports/x11-wm/sapphire/patches/patch-aa	Thu Jan  1 09:00:00 1970
>+++ x11-wm/sapphire/patches/patch-aa	Fri Feb 18 03:36:59 2000
>@@ -0,0 +1,54 @@
>+--- sapphire.inst.orig	Sun Feb 13 14:27:43 2000
>++++ sapphire.inst	Thu Feb 17 22:35:52 2000
>+@@ -1,4 +1,4 @@
>+-#!/bin/bash
>++#!/bin/sh
>+ #
>+ # Sapphire 0.14.0
>+ #
>+@@ -9,6 +9,7 @@
>+ # 13 Feb 2000 at 12:27am
>+ # frankhale@yahoo.com
>+ #
>++DATADIR = %%PREFIX%%/share/sapphire
>+ if [ -d ~/.sapphire ]
>+ then
>+ 	echo "~/.sapphire directory exists, deleting it now.";
>+@@ -33,15 +34,15 @@
>+ 	
>+ 	echo "created directory ~/.sapphire/menu";		
>+ 	
>+-	cp data/themes/* ~/.sapphire/themes
>++	cp $DATADIR/themes/* ~/.sapphire/themes
>+ 
>+ 	echo "copied themes";
>+ 	
>+-	cp data/wmconfig/* ~/.sapphire/wmconfig
>++	cp $DATADIR/wmconfig/* ~/.sapphire/wmconfig
>+ 
>+ 	echo "copied wmconfig";
>+ 	
>+-	cp data/menu/* ~/.sapphire/menu
>++	cp $DATADIR/menu/* ~/.sapphire/menu
>+ 	
>+ 	echo "copied menu";
>+ 
>+@@ -65,15 +66,15 @@
>+ 	
>+ 	echo "created directory ~/.sapphire/menu";		
>+ 	
>+-	cp data/themes/* ~/.sapphire/themes
>++	cp $DATADIR/themes/* ~/.sapphire/themes
>+ 
>+ 	echo "copied themes";
>+ 	
>+-	cp data/wmconfig/* ~/.sapphire/wmconfig
>++	cp $DATADIR/wmconfig/* ~/.sapphire/wmconfig
>+ 
>+ 	echo "copied wmconfig";
>+ 	
>+-	cp data/menu/* ~/.sapphire/menu
>++	cp $DATADIR/menu/* ~/.sapphire/menu
>+ 	
>+ 	echo "copied menu";
>+ 
>diff -urN /usr/ports/x11-wm/sapphire/patches/patch-ab x11-wm/sapphire/patches/patch-ab
>--- /usr/ports/x11-wm/sapphire/patches/patch-ab	Thu Jan  1 09:00:00 1970
>+++ x11-wm/sapphire/patches/patch-ab	Fri Feb 18 03:26:44 2000
>@@ -0,0 +1,11 @@
>+--- src/Makefile.in.orig	Mon Feb  7 07:57:13 2000
>++++ src/Makefile.in	Fri Feb 18 03:26:13 2000
>+@@ -66,7 +66,7 @@
>+ X_CFLAGS = @X_CFLAGS@
>+ X_LIBS = @X_LIBS@
>+ 
>+-CXX = g++
>++CXX = @CXX@
>+ LDADD = $(X_LIBS) 
>+ CPPFLAGS = $(X_CFLAGS) 
>+ bin_PROGRAMS = sapphire
>diff -urN /usr/ports/x11-wm/sapphire/patches/patch-ac x11-wm/sapphire/patches/patch-ac
>--- /usr/ports/x11-wm/sapphire/patches/patch-ac	Thu Jan  1 09:00:00 1970
>+++ x11-wm/sapphire/patches/patch-ac	Fri Feb 18 03:27:03 2000
>@@ -0,0 +1,12 @@
>+--- src/image.cc.orig	Thu Feb 10 10:36:20 2000
>++++ src/image.cc	Fri Feb 18 03:26:13 2000
>+@@ -29,7 +29,9 @@
>+ 
>+ #include "sapphire.hh"
>+ 
>++#ifndef __STDC__
>+ #include <malloc.h>
>++#endif
>+ 
>+ #ifdef GradientHack
>+ #  include <math.h>
>diff -urN /usr/ports/x11-wm/sapphire/pkg/PLIST x11-wm/sapphire/pkg/PLIST
>--- /usr/ports/x11-wm/sapphire/pkg/PLIST	Thu Jan 27 20:07:41 2000
>+++ x11-wm/sapphire/pkg/PLIST	Thu Feb 17 22:27:30 2000
>@@ -1 +1,12 @@
> bin/sapphire
>+bin/sapphire.inst
>+share/sapphire/README
>+share/sapphire/menu/default
>+share/sapphire/themes/darkblue
>+share/sapphire/themes/default
>+share/sapphire/themes/slate
>+share/sapphire/wmconfig/wmconf
>+@dirrm share/sapphire/wmconfig
>+@dirrm share/sapphire/themes
>+@dirrm share/sapphire/menu
>+@dirrm share/sapphire

Actions: View | Diff

Attachments on bug 16878: 7923