From owner-freebsd-ports Mon Feb 21 6:20:14 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id CBA0337BCC0 for ; Mon, 21 Feb 2000 06:20:04 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id GAA20634; Mon, 21 Feb 2000 06:20:04 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 448ED37BC1D for ; Mon, 21 Feb 2000 06:13:08 -0800 (PST) (envelope-from nobody@FreeBSD.org) Received: (from nobody@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id GAA20134; Mon, 21 Feb 2000 06:13:07 -0800 (PST) (envelope-from nobody@FreeBSD.org) Message-Id: <200002211413.GAA20134@freefall.freebsd.org> Date: Mon, 21 Feb 2000 06:13:07 -0800 (PST) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-1.0 Subject: ports/16878: Update port: x11-wm/sapphire to 0.14.0.2 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 16878 >Category: ports >Synopsis: Update port: x11-wm/sapphire to 0.14.0.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Feb 21 06:20:03 PST 2000 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 3.4-RELEASE i386 >Organization: >Environment: >Description: - Update to version 0.14.0.2 New file: patches/patch-aa patches/patch-ab patches/patch-ac Contacted maintainer with no response. >How-To-Repeat: >Fix: 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 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 ++#endif + + #ifdef GradientHack + # include 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 >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message