ports/67471: [PATCH] Update: x11-wm/ion-2

Tue Jun 1 23:20:26 UTC 2004

>Number:         67471
>Category:       ports
>Synopsis:       [PATCH] Update: x11-wm/ion-2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jun 01 16:20:26 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Wesley Shields
>Release:        FreeBSD 5.2.1-RELEASE-p8 i386
>Organization:
>Environment:
System: FreeBSD ack.ghi-east.org 5.2.1-RELEASE-p8 FreeBSD 5.2.1-RELEASE-p8 #0: Wed May 26 17:54:49 EST 2004 root at ack.ghi-east.org:/usr/obj/usr/src/sys/ACK i386

>Description:
	Attached is a patch to update the ion-2 port to 20040601.  I believe there might still be a bug when installing.  When tested on my box it did not complain about an older version of ion-2 being installed.  I'm not sure what is causing this nor do I know how to fix it.  It might just be limited to my machine.  I have also CC'ed the maintainer on this.

A copy of the patch is available at
http://www.atarininja.com/~wxs/patches/ion-2.diff

>How-To-Repeat:
	N/A

>Fix:


diff -ruN x11-wm/ion-2.orig/Makefile x11-wm/ion-2/Makefile

--- x11-wm/ion-2.orig/Makefile	Sat May  1 11:48:39 2004
+++ x11-wm/ion-2/Makefile	Tue Jun  1 18:02:12 2004
@@ -3,11 +3,11 @@
 # Whom:                anthony.ginepro at laposte.net
 # Original ion port:   ricci at cs.utah.edu
 #
-# $FreeBSD$
+# $FreeBSD: ports/x11-wm/ion-2/Makefile,v 1.13 2004/05/30 07:06:29 pav Exp $
 #
 
 PORTNAME=	ion-2
-PORTVERSION=	20040407
+PORTVERSION=	20040601
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://modeemi.fi/~tuomov/ion/dl/
 
@@ -26,21 +26,7 @@
 MAN1=		ion.1 pwm.1
 DOCSDIR=	share/doc/ion
 
-PLIST_FILES=	bin/ion bin/pwm
-ION_DIRS=	etc/ion \
-		lib/ion/lc \
-		lib/ion \
-		share/ion \
-		${DOCSDIR}
-
 # NO, I don't want to use configure but ion's author system.mk
 do-configure:
 
-.include <bsd.port.pre.mk>
-# dynamically built pkg-plist
-post-install:
-.for dir in ${ION_DIRS}
-	cd ${PREFIX} ; ${FIND} ${dir} -type f -o -type l -maxdepth 1 >> ${TMPPLIST}
-	${ECHO} "@dirrm ${dir}" >> ${TMPPLIST}
-.endfor
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ruN x11-wm/ion-2.orig/distinfo x11-wm/ion-2/distinfo
--- x11-wm/ion-2.orig/distinfo	Sat May  1 11:48:39 2004
+++ x11-wm/ion-2/distinfo	Tue Jun  1 18:02:23 2004
@@ -1,2 +1,2 @@
-MD5 (ion-2-20040407.tar.gz) = f27efbd06ab1c8ac26918bef6ed029e7
-SIZE (ion-2-20040407.tar.gz) = 389518
+MD5 (ion-2-20040601.tar.gz) = 5b2489a48bba865818a3990d49381ce8
+SIZE (ion-2-20040601.tar.gz) = 398860
diff -ruN x11-wm/ion-2.orig/files/patch-system.mk x11-wm/ion-2/files/patch-system.mk
--- x11-wm/ion-2.orig/files/patch-system.mk	Sat May  1 11:48:39 2004
+++ x11-wm/ion-2/files/patch-system.mk	Tue Jun  1 18:17:04 2004
@@ -1,5 +1,5 @@
---- system.mk	Wed Apr  7 09:15:54 2004
-+++ system.mk.bsd	Sun Apr 11 14:41:42 2004
+--- system.mk.orig	Wed Apr  7 09:15:54 2004
++++ system.mk	Tue May 25 16:54:31 2004
 @@ -7,7 +7,7 @@
  ## Installation paths
  ##
@@ -51,7 +51,7 @@
  # SunOS/Solaris
  #X11_PREFIX=/usr/openwin
  
-@@ -119,7 +119,7 @@
+@@ -119,29 +119,29 @@
  # asprintf and vasprintf in the c library. (gnu libc has.)
  # If HAS_SYSTEM_ASPRINTF is not defined, an implementation
  # in sprintf_2.2/ is used.
@@ -60,7 +60,13 @@
  
  
  # If you're on an archaic system (such as relatively recent *BSD releases)
-@@ -132,16 +132,16 @@
+ # without even dummy multibyte/widechar support, you may have to uncomment
+ # the following line:
+-#DEFINES += -DCF_NO_MB_SUPPORT
++DEFINES += -DCF_NO_MB_SUPPORT
+ 
+ 
+ ##
  ## C compiler
  ##
  
@@ -81,7 +87,7 @@
  
  # The following options are mainly for development use and can be used
  # to check that the code seems to conform to some standards. Depending
-@@ -154,11 +154,11 @@
+@@ -154,7 +154,7 @@
  #POSIX_SOURCE=-D_POSIX_SOURCE
  
  # Most systems
@@ -89,21 +95,3 @@
 +XOPEN_SOURCE=-D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED
  # SunOS, (Irix)
  #XOPEN_SOURCE=-D__EXTENSIONS__
- 
--#C99_SOURCE=-std=c99 -DCF_HAS_VA_COPY
-+C99_SOURCE=-std=c99 -DCF_HAS_VA_COPY
- 
- # The -DCF_HAS_VA_COPY option should allow for some optimisations, and 
- # in some cases simply defining
-@@ -190,9 +190,9 @@
- ##
- 
- # Should work almost everywhere
--INSTALL=install
-+#INSTALL=install
- # On a system with pure BSD install, -c might be preferred
--#INSTALL=install -c
-+INSTALL=install -c
- 
- INSTALLDIR=mkdir -p
- 
diff -ruN x11-wm/ion-2.orig/pkg-plist x11-wm/ion-2/pkg-plist
--- x11-wm/ion-2.orig/pkg-plist	Wed Dec 31 19:00:00 1969
+++ x11-wm/ion-2/pkg-plist	Tue Jun  1 18:41:14 2004
@@ -0,0 +1,63 @@
+bin/ion
+bin/pwm
+etc/ion/dock-draw.lua
+etc/ion/dock.lua
+etc/ion/draw.lua
+etc/ion/floatws.lua
+etc/ion/ion-bindings.lua
+etc/ion/ion-menus.lua
+etc/ion/ion.lua
+etc/ion/ionws.lua
+etc/ion/kludges.lua
+etc/ion/look-brownsteel.lua
+etc/ion/look-clean.lua
+etc/ion/look-cleanios.lua
+etc/ion/look-cleanviolet.lua
+etc/ion/look-dusky.lua
+etc/ion/look-greyviolet.lua
+etc/ion/look-ios.lua
+etc/ion/look-simpleblue.lua
+etc/ion/look-wheat2.lua
+etc/ion/menu.lua
+etc/ion/pwm-bindings.lua
+etc/ion/pwm-menus.lua
+etc/ion/pwm.lua
+etc/ion/query.lua
+lib/ion/de.la
+lib/ion/de.so
+lib/ion/dock.la
+lib/ion/dock.so
+lib/ion/floatws.la
+lib/ion/floatws.so
+lib/ion/ion-completefile
+lib/ion/ionws.la
+lib/ion/ionws.so
+lib/ion/menu.la
+lib/ion/menu.so
+lib/ion/query.la
+lib/ion/query.so
+lib/ion/lc/ioncore-efbb.lc
+lib/ion/lc/ioncorelib.lc
+lib/ion/lc/ioncorelib-mplexfns.lc
+lib/ion/lc/menulib.lc
+lib/ion/lc/querylib.lc
+share/ion/delib.lua
+share/ion/ion-edit
+share/ion/ion-man
+share/ion/ion-runinxterm
+share/ion/ion-ssh
+share/ion/ion-view
+share/ion/ioncore-efbb.lua
+share/ion/ioncorelib-mplexfns.lua
+share/ion/ioncorelib.lua
+share/ion/menulib.lua
+share/ion/querylib.lua
+share/ion/welcome_message.txt
+share/doc/ion/README
+share/doc/ion/LICENSE
+share/doc/ion/ChangeLog
+ at dirrm lib/ion/lc
+ at dirrm lib/ion
+ at dirrm share/ion
+ at dirrm share/doc/ion
+ at unexec rmdir %D/etc/ion 2>/dev/null || true

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

