ports/67459: [MAINTAINER] x11-wm/ion-2: update to 20040601

[Anthony Ginepro]

>Number:         67459
>Category:       ports
>Synopsis:       [MAINTAINER] x11-wm/ion-2: update to 20040601
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jun 01 11:30:34 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Anthony Ginepro
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD renaissance.homeip.net 5.2-CURRENT FreeBSD 5.2-CURRENT #0: Wed May 26 19:43:01 CEST 2004 rapiere at renaissance.homeip.net:/usr/obj/usr/src/sys/RENAISSANCE i386

>Description:
	Update to 20040601.

	While there, fix two bugs :
	- incorrect pkg-plist for 20040601,
	- register conflict with pwm.

	Improve a bit the compilation :
	- checking C99 compatible source,
	- VA_COPY optimization
>How-To-Repeat:
>Fix:
diff -ur ion-2/Makefile ion-2-20040601/Makefile
--- ion-2/Makefile	Tue Jun  1 20:10:13 2004
+++ ion-2-20040601/Makefile	Tue Jun  1 19:41:23 2004
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	ion-2
-PORTVERSION=	20040407
+PORTVERSION=	20040601
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://modeemi.fi/~tuomov/ion/dl/
 
@@ -17,7 +17,7 @@
 LIB_DEPENDS=	ltdl.4:${PORTSDIR}/devel/libltdl \
 		lua.5:${PORTSDIR}/lang/lua
 
-CONFLICTS=	ion-2002* ion-devel-*
+CONFLICTS=	ion-2002* ion-devel-* pwm-*
 
 USE_LIBTOOL_VER=15
 USE_X_PREFIX=	yes
diff -ur ion-2/distinfo ion-2-20040601/distinfo
--- ion-2/distinfo	Tue Jun  1 20:10:13 2004
+++ ion-2-20040601/distinfo	Tue Jun  1 19:42:44 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 -ur ion-2/files/patch-system.mk ion-2-20040601/files/patch-system.mk
--- ion-2/files/patch-system.mk	Tue Jun  1 20:10:13 2004
+++ ion-2-20040601/files/patch-system.mk	Tue Jun  1 20:12:03 2004
@@ -1,5 +1,5 @@
---- system.mk.orig	Wed Apr  7 09:15:54 2004
-+++ system.mk	Tue May 25 16:54:31 2004
+--- system.mk.orig	Tue Jun  1 16:35:23 2004
++++ system.mk	Tue Jun  1 20:11:21 2004
 @@ -7,7 +7,7 @@
  ## Installation paths
  ##
@@ -87,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,7 +154,7 @@
+@@ -154,11 +154,11 @@
  #POSIX_SOURCE=-D_POSIX_SOURCE
  
  # Most systems
@@ -96,15 +96,8 @@
  # SunOS, (Irix)
  #XOPEN_SOURCE=-D__EXTENSIONS__
  
-@@ -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
+-#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
diff -ur ion-2/pkg-plist ion-2-20040601/pkg-plist
--- ion-2/pkg-plist	Tue Jun  1 20:10:13 2004
+++ ion-2-20040601/pkg-plist	Tue Jun  1 19:47:09 2004
@@ -41,7 +41,6 @@
 lib/ion/lc/ioncorelib-mplexfns.lc
 lib/ion/lc/menulib.lc
 lib/ion/lc/querylib.lc
-share/ion/delib.lc
 share/ion/delib.lua
 share/ion/ion-edit
 share/ion/ion-man

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