Date: Sat, 26 Aug 2000 22:13:27 -0400 (EDT) From: Trevor Johnson <trevor@jpj.net> To: freebsd-gnats-submit@freebsd.org Subject: ports/20879: x11-wm/sapphire: fix copyright problem Message-ID: <Pine.BSI.4.21.0008262137520.7781-100000@blues.jpj.net>
next in thread | raw e-mail | index | archive | help
>Number: 20879 >Category: ports >Synopsis: x11-wm/sapphire: fix copyright problem >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Aug 26 19:20:08 PDT 2000 >Closed-Date: >Last-Modified: >Originator: Trevor Johnson >Release: 4.1-STABLE i386 >Organization: myself >Environment: only tested under FreeBSD ws99.invalid 4.1-STABLE FreeBSD 4.1-STABLE #0: Sat Jul 29 02:55:41 UTC 2000 root@ws99.invalid:/usr/obj/usr/src/sys/TREVOR41A i386 >Description: I'm the maintainer of the sapphire port. It installs several themes which were packaged separately from sapphire itself. Those themes have been removed from the sapphire Web site. The reason they were removed is that Frank Hale, the author of sapphire, did not give credit to the artists who made the images incorporated in the themes, and one of the artists complained. When I was adding the themes to the FreeBSD port, I asked Frank about the copyright for the images. He assured me then that there were no problems. One of the artists has written to me, asking that his work be taken off the FreeBSD FTP archives. I've updated the port so it still has all the themes (in fact, four more), but with the images removed. files removed: patches/patch-ae patches/patch-af patches/patch-ag patches/patch-ah patches/patch-ai patches/patch-aj patches/patch-ak patches/patch-al patches/patch-am patches/patch-an patches/patch-ao files changed: Makefile files/md5 patches/patch-ad pkg/DESCR pkg/PLIST >How-To-Repeat: Messages about this on the sapphire-devel list are archived here: http://www.geocrawler.com/archives/3/1070/2000/4/0/3605669/ http://www.geocrawler.com/archives/3/1070/2000/5/0/3702139/ http://www.geocrawler.com/archives/3/1070/2000/8/0/4156941/ http://www.geocrawler.com/archives/3/1070/2000/8/0/4157152/ >Fix: Besides applying this change, it would be great if someone could remove the theme files from the FTP archives. The files which should be removed are everything in the sapphire/ subdirectory except sapphire-0.14.2.tar.gz. diff -ru sapphire.orig/Makefile sapphire/Makefile --- sapphire.orig/Makefile Mon Jun 19 21:10:27 2000 +++ sapphire/Makefile Sun Aug 27 01:33:25 2000 @@ -8,14 +8,13 @@ PORTNAME= sapphire PORTVERSION= 0.14.2 CATEGORIES= x11-wm -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ - http://sapphire.sourceforge.net/themes/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${THEMES_SRC} -MAINTAINER= trevor@jpj.net +PATCH_SITES= http://jpj.net/~trevor/freebsd/ports/ +PATCHFILES= sapphire-extra-themes-1.0.diff.gz -RUN_DEPENDS= xsetbg:${PORTSDIR}/graphics/xli +MAINTAINER= trevor@jpj.net DIST_SUBDIR= sapphire @@ -23,15 +22,8 @@ USE_X_PREFIX= yes GNU_CONFIGURE= yes -THEMES_SRC= atomic.tar.gz bevel.tar.gz blues.tar.gz dtheater.tar.gz \ - klamath.tar.gz metal.tar.gz nocturne.tar.gz river.tar.gz \ - sapphire.tar.gz slate.tar.gz synopsis.tar.gz - post-extract: @${CP} ${WRKSRC}/data.inst ${WRKSRC}/sapphire.inst - @${CP} ${WRKDIR}/*/*.theme ${WRKSRC}/data/themes - @${CP} ${WRKDIR}/*/*.jpg ${WRKSRC}/data/themes - post-patch: @${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/sapphire.inst @@ -41,8 +33,6 @@ ${INSTALL_DATA} ${WRKSRC}/data/menu/default ${PREFIX}/share/sapphire/menu @${MKDIR} ${PREFIX}/share/sapphire/themes ${INSTALL_DATA} ${WRKSRC}/data/themes/*.theme ${PREFIX}/share/sapphire/themes - @${MKDIR} ${PREFIX}/share/sapphire/themes/backgrounds - ${INSTALL_DATA} ${WRKSRC}/data/themes/*.jpg ${PREFIX}/share/sapphire/themes/backgrounds @${MKDIR} ${PREFIX}/share/sapphire/wmconfig ${INSTALL_DATA} ${WRKSRC}/data/wmconfig/wmconf ${PREFIX}/share/sapphire/wmconfig .if !defined(NOPORTDOCS) diff -ru sapphire.orig/files/md5 sapphire/files/md5 --- sapphire.orig/files/md5 Sun Apr 30 21:21:55 2000 +++ sapphire/files/md5 Sun Aug 27 01:18:58 2000 @@ -1,12 +1,2 @@ MD5 (sapphire/sapphire-0.14.2.tar.gz) = 486c33f1cc95369338a69bd7c5d2aafe -MD5 (sapphire/atomic.tar.gz) = 91946c1930e9edccbf81110a9d9d3c45 -MD5 (sapphire/bevel.tar.gz) = 3911f81528ec43cdd9e1c9035cdc5fc0 -MD5 (sapphire/blues.tar.gz) = 48a3e242acb42886e260563bc3029fff -MD5 (sapphire/dtheater.tar.gz) = 3adad23140cbb728f4e2a6bd5169d9b0 -MD5 (sapphire/klamath.tar.gz) = be0c66ffd2a1b8fcbe04cc4136cb0064 -MD5 (sapphire/metal.tar.gz) = 5698e04e8b46a61c557f57bb6af69492 -MD5 (sapphire/nocturne.tar.gz) = 5f11db03eee42b71fb6b361230c45db2 -MD5 (sapphire/river.tar.gz) = 4d177069374474ea9382437df025bd42 -MD5 (sapphire/sapphire.tar.gz) = 1073a89bca0949f5f17bfd5ccd375a47 -MD5 (sapphire/slate.tar.gz) = 7200b8e0637265d8336c112854ee7140 -MD5 (sapphire/synopsis.tar.gz) = ac892fc69f5da628add1d0876afc6be0 +MD5 (sapphire/sapphire-extra-themes-1.0.diff.gz) = 1c6c7a7c2f3c646ecefa75bac6f06abd diff -ru sapphire.orig/patches/patch-ad sapphire/patches/patch-ad --- sapphire.orig/patches/patch-ad Sun Apr 30 21:21:56 2000 +++ sapphire/patches/patch-ad Sun Aug 27 01:09:54 2000 @@ -1,6 +1,12 @@ --- data/menu/default.orig Mon Feb 21 23:06:19 2000 -+++ data/menu/default Mon Apr 10 22:06:34 2000 -@@ -38,11 +38,20 @@ ++++ data/menu/default Sun Aug 27 01:06:09 2000 +@@ -1,4 +1,4 @@ +-menu(Sapphire 0.14.0) ++menu(Sapphire 0.14.2) + { + submenu (terminals) + { +@@ -38,11 +38,25 @@ submenu (themes) { @@ -9,15 +15,20 @@ - theme (slate) {~/.sapphire/themes/slate.theme} - theme (rose) {~/.sapphire/themes/rose.theme} - theme (green) {~/.sapphire/themes/green.theme} -+ theme (default) {~/.sapphire/themes/default.theme} + theme (atomic) {~/.sapphire/themes/atomic.theme} + theme (bevel) {~/.sapphire/themes/bevel.theme} + theme (blues) {~/.sapphire/themes/blues.theme} + theme (darkblue) {~/.sapphire/themes/darkblue.theme} ++ theme (darkslate){~/.sapphire/themes/darkslate.theme} ++ theme (default) {~/.sapphire/themes/default.theme} + theme (dtheater) {~/.sapphire/themes/dtheater.theme} ++ theme (gray) {~/.sapphire/themes/gray.theme} + theme (klamath) {~/.sapphire/themes/klamath.theme} ++ theme (linux) {~/.sapphire/themes/linux.theme} ++ theme (linuxturf){~/.sapphire/themes/linuxturf.theme} + theme (metal) {~/.sapphire/themes/metal.theme} + theme (nocturne) {~/.sapphire/themes/nocturne.theme} ++ theme (orange) {~/.sapphire/themes/orange.theme} + theme (river) {~/.sapphire/themes/river.theme} + theme (rose) {~/.sapphire/themes/rose.theme} + theme (sapphire) {~/.sapphire/themes/sapphire.theme} Only in sapphire.orig/patches: patch-ae Only in sapphire.orig/patches: patch-af Only in sapphire.orig/patches: patch-ag Only in sapphire.orig/patches: patch-ah Only in sapphire.orig/patches: patch-ai Only in sapphire.orig/patches: patch-aj Only in sapphire.orig/patches: patch-ak Only in sapphire.orig/patches: patch-al Only in sapphire.orig/patches: patch-am Only in sapphire.orig/patches: patch-an Only in sapphire.orig/patches: patch-ao diff -ru sapphire.orig/pkg/DESCR sapphire/pkg/DESCR --- sapphire.orig/pkg/DESCR Sun Apr 30 21:21:59 2000 +++ sapphire/pkg/DESCR Sat Aug 26 23:59:21 2000 @@ -1,8 +1,6 @@ Sapphire is a small window manager based on aewm and blackbox. Windows can be rolled up or hidden. Programs can be run from a -menu. A clock and calendar are built in. This port installs -both sapphire itelf and all the themes from its Web site, except -"linux" and "linuxturf". +menu. A clock and calendar are built in. WWW: http://sapphire.sourceforge.net/ diff -ru sapphire.orig/pkg/PLIST sapphire/pkg/PLIST --- sapphire.orig/pkg/PLIST Sun Apr 30 21:22:00 2000 +++ sapphire/pkg/PLIST Sun Aug 27 01:11:05 2000 @@ -3,26 +3,19 @@ share/doc/sapphire/README share/sapphire/menu/default share/sapphire/themes/atomic.theme -share/sapphire/themes/backgrounds/atomic.jpg -share/sapphire/themes/backgrounds/bevel.jpg -share/sapphire/themes/backgrounds/blues.jpg -share/sapphire/themes/backgrounds/dtheater.jpg -share/sapphire/themes/backgrounds/klamath.jpg -share/sapphire/themes/backgrounds/metal.jpg -share/sapphire/themes/backgrounds/nocturne.jpg -share/sapphire/themes/backgrounds/river.jpg -share/sapphire/themes/backgrounds/sapphire.jpg -share/sapphire/themes/backgrounds/slate.jpg -share/sapphire/themes/backgrounds/synopsis.jpg share/sapphire/themes/bevel.theme share/sapphire/themes/blues.theme share/sapphire/themes/darkblue.theme +share/sapphire/themes/darkslate.theme share/sapphire/themes/default.theme share/sapphire/themes/dtheater.theme share/sapphire/themes/gray.theme share/sapphire/themes/klamath.theme +share/sapphire/themes/linux.theme +share/sapphire/themes/linuxturf.theme share/sapphire/themes/metal.theme share/sapphire/themes/nocturne.theme +share/sapphire/themes/orange.theme share/sapphire/themes/river.theme share/sapphire/themes/rose.theme share/sapphire/themes/sapphire.theme @@ -31,7 +24,6 @@ share/sapphire/wmconfig/wmconf @dirrm share/doc/sapphire @dirrm share/sapphire/menu -@dirrm share/sapphire/themes/backgrounds @dirrm share/sapphire/themes @dirrm share/sapphire/wmconfig @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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.BSI.4.21.0008262137520.7781-100000>