ports/60980: sysutils/gdesklets-multitail - don't install displayconstraints-sensor from the tarball.

Franz Klammer klammer at webonaut.com
Tue Jan 6 14:10:26 UTC 2004 

>Number:         60980
>Category:       ports
>Synopsis:       sysutils/gdesklets-multitail - don't install displayconstraints-sensor from the tarball.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jan 06 06:10:18 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Franz Klammer
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:


System: FreeBSD ds9.webonaut.com 5.2-CURRENT FreeBSD 5.2-CURRENT #4: Tue Jan  6 00:09:47 CET 2004     root at ds9.webonaut.com:/usr/obj/usr/src/sys/DS9 i386


>Description:


don't install the displayconstraints-sensor from the tarball.
this is a separate port now.

i've also bumped the PORTREVISION - don't know if this is
really necessary here.


>How-To-Repeat:





>Fix:


--- gdesklets-multitail.diff begins here ---
diff -Nur gdesklets-multitail.orig/Makefile gdesklets-multitail/Makefile
--- gdesklets-multitail.orig/Makefile	Wed Nov 19 06:54:40 2003
+++ gdesklets-multitail/Makefile	Tue Jan  6 14:38:23 2004
@@ -2,11 +2,12 @@
 # Date created:				18 November 2003
 # Whom:					Franz Klammer <klammer at webonaut.com>
 #
-# $FreeBSD: ports/sysutils/gdesklets-multitail/Makefile,v 1.1 2003/11/19 05:54:40 marcus Exp $
+# $FreeBSD:$
 #
 
 PORTNAME=	multitail
 PORTVERSION=	0.1.6
+PORTREVISION=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	http://gdesklets.gnomedesktop.org/files/
 PKGNAMEPREFIX=	gdesklets-
@@ -15,53 +16,46 @@
 MAINTAINER=	klammer at webonaut.com
 COMMENT=	Tail up to 5 files in one gdesklets display
 
-RUN_DEPENDS=	${X11BASE}/libdata/pkgconfig/gdesklets-core.pc:${PORTSDIR}/deskutils/gdesklets
+RUN_DEPENDS=	${X11BASE}/libdata/pkgconfig/gdesklets-core.pc:${PORTSDIR}/deskutils/gdesklets \
+		${DATADIR}/gdesklets/Sensors/DisplayConstraints/__init__.py:${PORTSDIR}/deskutils/gdesklets-sensor-displayconstraints
 
-WRKSRC=		${WRKDIR}/${NAME1}-${PORTVERSION}
+WRKSRC=		${WRKDIR}/${NAME}-${PORTVERSION}
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_PYTHON=	yes
-NAME1=		MultiTail
-NAME2=		DisplayConstraints
+DATADIR=	${PREFIX}/share/gnome
+NAME=		MultiTail
 
 do-build:
-	@${WRKSRC}/Install_${NAME1}_Sensor.bin --nomsg ${WRKSRC}
-	@${WRKSRC}/Install_${NAME2}_Sensor.bin --nomsg ${WRKSRC}
+	@${WRKSRC}/Install_${NAME}_Sensor.bin --nomsg ${WRKSRC}
 	@${FIND} ${WRKSRC} -name '*.orig' -delete
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/gnome/gdesklets/Sensors/${NAME1}
-	@${MKDIR} ${PREFIX}/share/gnome/gdesklets/Sensors/${NAME2}
-	@${MKDIR} ${PREFIX}/share/gnome/gdesklets/Displays/${NAME1}/dark-theme/gfx
-	@${MKDIR} ${PREFIX}/share/gnome/gdesklets/Displays/${NAME1}/light-theme/gfx
-	@${MKDIR} ${PREFIX}/share/gnome/gdesklets/Displays/${NAME1}/trans-theme/gfx
-	${INSTALL_DATA} ${WRKSRC}/${NAME1}/README \
-		${PREFIX}/share/gnome/gdesklets/Displays/${NAME1}/
-	${INSTALL_DATA} ${WRKSRC}/${NAME1}/dark-theme/*.display \
-		${PREFIX}/share/gnome/gdesklets/Displays/${NAME1}/dark-theme/
-	${INSTALL_DATA} ${WRKSRC}/${NAME1}/dark-theme/gfx/*.png \
-		${PREFIX}/share/gnome/gdesklets/Displays/${NAME1}/dark-theme/gfx/
-	${INSTALL_DATA} ${WRKSRC}/${NAME1}/light-theme/*.display \
-		${PREFIX}/share/gnome/gdesklets/Displays/${NAME1}/light-theme/
-	${INSTALL_DATA} ${WRKSRC}/${NAME1}/light-theme/gfx/*.png \
-		${PREFIX}/share/gnome/gdesklets/Displays/${NAME1}/light-theme/gfx/
-	${INSTALL_DATA} ${WRKSRC}/${NAME1}/trans-theme/*.display \
-		${PREFIX}/share/gnome/gdesklets/Displays/${NAME1}/trans-theme/
-	${INSTALL_DATA} ${WRKSRC}/${NAME1}/trans-theme/gfx/*.png \
-		${PREFIX}/share/gnome/gdesklets/Displays/${NAME1}/trans-theme/gfx/
-	${INSTALL_DATA} ${WRKSRC}/${NAME1}/*.py \
-		${PREFIX}/share/gnome/gdesklets/Sensors/${NAME1}/
-	${INSTALL_DATA} ${WRKSRC}/${NAME2}/*.py \
-		${PREFIX}/share/gnome/gdesklets/Sensors/${NAME2}/
+	@${MKDIR} ${DATADIR}/gdesklets/Sensors/${NAME}
+	@${MKDIR} ${DATADIR}/gdesklets/Displays/${NAME}/dark-theme/gfx
+	@${MKDIR} ${DATADIR}/gdesklets/Displays/${NAME}/light-theme/gfx
+	@${MKDIR} ${DATADIR}/gdesklets/Displays/${NAME}/trans-theme/gfx
+	${INSTALL_DATA} ${WRKSRC}/${NAME}/README \
+		${DATADIR}/gdesklets/Displays/${NAME}/
+	${INSTALL_DATA} ${WRKSRC}/${NAME}/dark-theme/*.display \
+		${DATADIR}/gdesklets/Displays/${NAME}/dark-theme/
+	${INSTALL_DATA} ${WRKSRC}/${NAME}/dark-theme/gfx/*.png \
+		${DATADIR}/gdesklets/Displays/${NAME}/dark-theme/gfx/
+	${INSTALL_DATA} ${WRKSRC}/${NAME}/light-theme/*.display \
+		${DATADIR}/gdesklets/Displays/${NAME}/light-theme/
+	${INSTALL_DATA} ${WRKSRC}/${NAME}/light-theme/gfx/*.png \
+		${DATADIR}/gdesklets/Displays/${NAME}/light-theme/gfx/
+	${INSTALL_DATA} ${WRKSRC}/${NAME}/trans-theme/*.display \
+		${DATADIR}/gdesklets/Displays/${NAME}/trans-theme/
+	${INSTALL_DATA} ${WRKSRC}/${NAME}/trans-theme/gfx/*.png \
+		${DATADIR}/gdesklets/Displays/${NAME}/trans-theme/gfx/
+	${INSTALL_DATA} ${WRKSRC}/${NAME}/*.py \
+		${DATADIR}/gdesklets/Sensors/${NAME}/
 	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
-		${PREFIX}/share/gnome/gdesklets/Sensors/${NAME1}/
+		${DATADIR}/gdesklets/Sensors/${NAME}/
 	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
-		${PREFIX}/share/gnome/gdesklets/Sensors/${NAME1}/
-	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
-		${PREFIX}/share/gnome/gdesklets/Sensors/${NAME2}/
-	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
-		${PREFIX}/share/gnome/gdesklets/Sensors/${NAME2}/
+		${DATADIR}/gdesklets/Sensors/${NAME}/
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff -Nur gdesklets-multitail.orig/check gdesklets-multitail/check
--- gdesklets-multitail.orig/check	Thu Jan  1 01:00:00 1970
+++ gdesklets-multitail/check	Tue Jan  6 14:36:19 2004
@@ -0,0 +1,89 @@
+Script started on Tue Jan  6 14:34:21 2004
+===>  Extracting for gdesklets-multitail-0.1.6
+>> Checksum OK for multitail-0.1.6.tar.bz2.
+===>  Patching for gdesklets-multitail-0.1.6
+===>   gdesklets-multitail-0.1.6 depends on file: /usr/local/bin/python - found
+===>   gdesklets-multitail-0.1.6 depends on shared library: X11.6 - found
+===>  Configuring for gdesklets-multitail-0.1.6
+===>  Building for gdesklets-multitail-0.1.6
+
+** (Install_MultiTail_Sensor.bin:62587): WARNING **: `GtkTextSearchFlags' is not an enum type
+
+The sensor has been installed successfully.
+gDesklets is now able to use it.
+===>  Installing for gdesklets-multitail-0.1.6
+===>   gdesklets-multitail-0.1.6 depends on file: /usr/X11R6/libdata/pkgconfig/gdesklets-core.pc - found
+===>   gdesklets-multitail-0.1.6 depends on file: /usr/X11R6/share/gnome/gdesklets/Sensors/DisplayConstraints/__init__.py - not found
+===>    Verifying install for /usr/X11R6/share/gnome/gdesklets/Sensors/DisplayConstraints/__init__.py in /usr/ports/deskutils/gdesklets-sensor-displayconstraints
+===>  Extracting for gdesklets-sensor-displayconstraints-0.1.0
+>> Checksum OK for displayconstraints-0.1.0.tar.bz2.
+===>  Patching for gdesklets-sensor-displayconstraints-0.1.0
+===>  Applying FreeBSD patches for gdesklets-sensor-displayconstraints-0.1.0
+===>   gdesklets-sensor-displayconstraints-0.1.0 depends on file: /usr/local/bin/python2.3 - found
+===>   gdesklets-sensor-displayconstraints-0.1.0 depends on shared library: X11.6 - found
+===>  Configuring for gdesklets-sensor-displayconstraints-0.1.0
+===>  Building for gdesklets-sensor-displayconstraints-0.1.0
+
+** (Install_DisplayConstraints_Sensor.bin:62726): WARNING **: `GtkTextSearchFlags' is not an enum type
+The sensor has been installed successfully.
+gDesklets is now able to use it.
+===>  Installing for gdesklets-sensor-displayconstraints-0.1.0
+===>   gdesklets-sensor-displayconstraints-0.1.0 depends on file: /usr/X11R6/libdata/pkgconfig/gdesklets-core.pc - found
+===>   gdesklets-sensor-displayconstraints-0.1.0 depends on file: /usr/local/bin/python2.3 - found
+===>   Generating temporary packing list
+===>  Checking if deskutils/gdesklets-sensor-displayconstraints already installed
+install  -o root -g wheel -m 444 /usr/ports/deskutils/gdesklets-sensor-displayconstraints/work/DisplayConstraints-0.1.0/DisplayConstraints/*.py  /usr/X11R6/share/gnome/gdesklets/Sensors/DisplayConstraints/
+install  -o root -g wheel -m 444 /usr/ports/deskutils/gdesklets-sensor-displayconstraints/work/DisplayConstraints-0.1.0/DisplayConstraints/README  /usr/X11R6/share/gnome/gdesklets/Sensors/DisplayConstraints/
+Listing /usr/X11R6/share/gnome/gdesklets/Sensors/DisplayConstraints/ ...
+Compiling /usr/X11R6/share/gnome/gdesklets/Sensors/DisplayConstraints/__init__.py ...
+Listing /usr/X11R6/share/gnome/gdesklets/Sensors/DisplayConstraints/ ...
+Compiling /usr/X11R6/share/gnome/gdesklets/Sensors/DisplayConstraints/__init__.py ...
+##
+To view the README:
+
+	cat ${PREFIX}/share/gnome/gdesklets/Sensors/DisplayConstraints/README
+
+NOTE: Be sure to login as your user when you use the gdesklets command,
+      as the configuration will be stored in the ~/.gdesklets/ directory.
+##
+===>   Registering installation for gdesklets-sensor-displayconstraints-0.1.0
+===>   Returning to build of gdesklets-multitail-0.1.6
+===>   gdesklets-multitail-0.1.6 depends on file: /usr/local/bin/python - found
+===>   Generating temporary packing list
+===>  Checking if sysutils/gdesklets-multitail already installed
+install  -o root -g wheel -m 444 /usr/ports/deskutils/gdesklets-multitail/work/MultiTail-0.1.6/MultiTail/README  /usr/X11R6/share/gnome/gdesklets/Displays/MultiTail/
+install  -o root -g wheel -m 444 /usr/ports/deskutils/gdesklets-multitail/work/MultiTail-0.1.6/MultiTail/dark-theme/*.display  /usr/X11R6/share/gnome/gdesklets/Displays/MultiTail/dark-theme/
+install  -o root -g wheel -m 444 /usr/ports/deskutils/gdesklets-multitail/work/MultiTail-0.1.6/MultiTail/dark-theme/gfx/*.png  /usr/X11R6/share/gnome/gdesklets/Displays/MultiTail/dark-theme/gfx/
+install  -o root -g wheel -m 444 /usr/ports/deskutils/gdesklets-multitail/work/MultiTail-0.1.6/MultiTail/light-theme/*.display  /usr/X11R6/share/gnome/gdesklets/Displays/MultiTail/light-theme/
+install  -o root -g wheel -m 444 /usr/ports/deskutils/gdesklets-multitail/work/MultiTail-0.1.6/MultiTail/light-theme/gfx/*.png  /usr/X11R6/share/gnome/gdesklets/Displays/MultiTail/light-theme/gfx/
+install  -o root -g wheel -m 444 /usr/ports/deskutils/gdesklets-multitail/work/MultiTail-0.1.6/MultiTail/trans-theme/*.display  /usr/X11R6/share/gnome/gdesklets/Displays/MultiTail/trans-theme/
+install  -o root -g wheel -m 444 /usr/ports/deskutils/gdesklets-multitail/work/MultiTail-0.1.6/MultiTail/trans-theme/gfx/*.png  /usr/X11R6/share/gnome/gdesklets/Displays/MultiTail/trans-theme/gfx/
+install  -o root -g wheel -m 444 /usr/ports/deskutils/gdesklets-multitail/work/MultiTail-0.1.6/MultiTail/*.py  /usr/X11R6/share/gnome/gdesklets/Sensors/MultiTail/
+Listing /usr/X11R6/share/gnome/gdesklets/Sensors/MultiTail/ ...
+Compiling /usr/X11R6/share/gnome/gdesklets/Sensors/MultiTail/__init__.py ...
+Compiling /usr/X11R6/share/gnome/gdesklets/Sensors/MultiTail/tailer.py ...
+Listing /usr/X11R6/share/gnome/gdesklets/Sensors/MultiTail/ ...
+Compiling /usr/X11R6/share/gnome/gdesklets/Sensors/MultiTail/__init__.py ...
+Compiling /usr/X11R6/share/gnome/gdesklets/Sensors/MultiTail/tailer.py ...
+##
+To view the README:
+
+	cat ${PREFIX}/share/gnome/gdesklets/Displays/${name}/README
+
+To view all installed applets:
+
+	ls ${PREFIX}/share/gnome/gdesklets/Displays
+
+To use those applets:
+
+	gdesklets ${PREFIX}/share/gnome/gdesklets/Displays/${name}/${theme}/${name}.display
+
+Replace ${name} with the correct name of the applets you want to use.
+Replace ${theme} with the correct name of the applets theme.
+
+NOTE: Be sure to login as your user when you use the gdesklets command,
+      as the configuration will be stored in the ~/.gdesklets/ directory.
+##
+===>   Registering installation for gdesklets-multitail-0.1.6
+
+Script done on Tue Jan  6 14:36:19 2004
diff -Nur gdesklets-multitail.orig/pkg-plist gdesklets-multitail/pkg-plist
--- gdesklets-multitail.orig/pkg-plist	Wed Nov 19 06:54:40 2003
+++ gdesklets-multitail/pkg-plist	Tue Jan  6 14:28:09 2004
@@ -7,9 +7,6 @@
 share/gnome/gdesklets/Displays/MultiTail/trans-theme/gfx/border-left.png
 share/gnome/gdesklets/Displays/MultiTail/trans-theme/multitail.display
 share/gnome/gdesklets/Displays/MultiTail/README
-share/gnome/gdesklets/Sensors/DisplayConstraints/__init__.py
-share/gnome/gdesklets/Sensors/DisplayConstraints/__init__.pyc
-share/gnome/gdesklets/Sensors/DisplayConstraints/__init__.pyo
 share/gnome/gdesklets/Sensors/MultiTail/__init__.py
 share/gnome/gdesklets/Sensors/MultiTail/__init__.pyc
 share/gnome/gdesklets/Sensors/MultiTail/__init__.pyo
@@ -23,5 +20,4 @@
 @dirrm share/gnome/gdesklets/Displays/MultiTail/trans-theme/gfx
 @dirrm share/gnome/gdesklets/Displays/MultiTail/trans-theme
 @dirrm share/gnome/gdesklets/Displays/MultiTail/
- at dirrm share/gnome/gdesklets/Sensors/DisplayConstraints/
 @dirrm share/gnome/gdesklets/Sensors/MultiTail/
--- gdesklets-multitail.diff ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list