Date: Thu, 13 Jun 2002 11:18:21 +1000 (EST) From: Gregory Bond <gnb@itga.com.au> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/39211: port x11/xscreensaver can't build package Message-ID: <200206130118.g5D1ILJ4087298@hellcat.itga.com.au>
next in thread | raw e-mail | index | archive | help
>Number: 39211
>Category: ports
>Synopsis: port x11/xscreensaver can't build package
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Wed Jun 12 18:20:01 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: Gregory Bond
>Release: FreeBSD 4.6-RC i386
>Organization:
ITG Australia Limited
>Environment:
System: FreeBSD hellcat.itga.com.au 4.6-RC FreeBSD 4.6-RC #2: Fri May 31 19:45:22 EST 2002 toor@grollo.itga.com.au:/usr/obj/usr/src/sys/HELLCAT i386
>Description:
The x11/xscreensaver port can build (with the caveat about the conflict
with pkgconfigure), but you cannot build a package from it.
This is because the pkg-plist file contains entries for the files
installed by the dependant x11/xcreenscaver-gnome port, which are
not present in the master port.
>How-To-Repeat:
cd /usr/ports/x11/xscreensaver && make package
>Fix:
The following patch fixes the xscreensaver port so that the package
will build. It also adds an extra item to the plist that was omitted, so
the deinstall works cleanly.
Index: pkg-plist
===================================================================
RCS file: /usr/ncvs/ports/x11/xscreensaver/pkg-plist,v
retrieving revision 1.34
diff -u -r1.34 pkg-plist
--- pkg-plist 11 Jun 2002 21:05:04 -0000 1.34
+++ pkg-plist 13 Jun 2002 01:08:42 -0000
@@ -1,4 +1,3 @@
-%%GNOME:%%bin/screensaver-properties-capplet
bin/xscreensaver
bin/xscreensaver-command
bin/xscreensaver-demo
@@ -140,6 +139,7 @@
bin/xscreensaver-hacks/vines
bin/xscreensaver-hacks/wander
bin/xscreensaver-hacks/webcollage
+bin/xscreensaver-hacks/webcollage-helper
bin/xscreensaver-hacks/whirlwindwarp
bin/xscreensaver-hacks/whirlygig
bin/xscreensaver-hacks/worm
@@ -153,16 +153,6 @@
bin/xscreensaver-hacks/xteevee
bin/xscreensaver-hacks/zoom
lib/X11/app-defaults/XScreenSaver
-%%GNOME:%%share/gnome/apps/Settings/Desktop/screensaver-properties.desktop
-%%GNOME:%%share/gnome/control-center/Desktop/screensaver-properties.desktop
-%%GNOME:%%share/gnome/control-center/capplets/screensaver.desktop
-%%GNOME:%%share/gnome/pixmaps/screensaver-cmndln.xpm
-%%GNOME:%%share/gnome/pixmaps/screensaver-colorselector.xpm
-%%GNOME:%%share/gnome/pixmaps/screensaver-diagnostic.xpm
-%%GNOME:%%share/gnome/pixmaps/screensaver-locking.xpm
-%%GNOME:%%share/gnome/pixmaps/screensaver-power.xpm
-%%GNOME:%%share/gnome/pixmaps/screensaver-snap.xpm
-%%GNOME:%%share/gnome/pixmaps/xscreensaver.xpm
share/xscreensaver/xscreensaver.xpm
share/xscreensaver/screensaver-cmndln.xpm
share/xscreensaver/screensaver-colorselector.xpm
But this has the side-effect of breaking the xscreensaver-gnome
package. That dependant package will need to somehow incorporate
these files into the PLIST. This is out of my area of experience as far
as ports hacking goes, but something like the following might work (but
I don't have gnome installed so can't test it properly):
Index: Makefile
===================================================================
RCS file: /usr/ncvs/ports/x11/xscreensaver-gnome/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- Makefile 14 Feb 2002 00:02:18 -0000 1.1
+++ Makefile 13 Jun 2002 01:05:04 -0000
@@ -13,4 +13,9 @@
WITH_GNOME= yes
+PLIST= ${WRKDIR}/PLIST
+
+post-build:
+ @${CAT} ${MASTERDIR}/pkg-plist ${.CURDIR}/plist-extra > ${PLIST}
+
.include "${MASTERDIR}/Makefile"
--- /dev/null Thu Jun 13 11:13:47 2002
+++ /usr/ports/x11/xscreensaver-gnome/plist-extra Thu Jun 13 11:03:36 2002
@@ -0,0 +1,11 @@
+%%GNOME:%%bin/screensaver-properties-capplet
+%%GNOME:%%share/gnome/apps/Settings/Desktop/screensaver-properties.desktop
+%%GNOME:%%share/gnome/control-center/Desktop/screensaver-properties.desktop
+%%GNOME:%%share/gnome/control-center/capplets/screensaver.desktop
+%%GNOME:%%share/gnome/pixmaps/screensaver-cmndln.xpm
+%%GNOME:%%share/gnome/pixmaps/screensaver-colorselector.xpm
+%%GNOME:%%share/gnome/pixmaps/screensaver-diagnostic.xpm
+%%GNOME:%%share/gnome/pixmaps/screensaver-locking.xpm
+%%GNOME:%%share/gnome/pixmaps/screensaver-power.xpm
+%%GNOME:%%share/gnome/pixmaps/screensaver-snap.xpm
+%%GNOME:%%share/gnome/pixmaps/xscreensaver.xpm
>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?200206130118.g5D1ILJ4087298>