From ed@hoeg.nl  Mon May 21 17:37:07 2007
Return-Path: <ed@hoeg.nl>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 28BB216A41F
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 21 May 2007 17:37:07 +0000 (UTC)
	(envelope-from ed@hoeg.nl)
Received: from palm.hoeg.nl (mx0.hoeg.nl [83.98.131.211])
	by mx1.freebsd.org (Postfix) with ESMTP id A18E613C455
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 21 May 2007 17:37:06 +0000 (UTC)
	(envelope-from ed@hoeg.nl)
Received: by palm.hoeg.nl (Postfix, from userid 1000)
	id 4952B1CD46; Mon, 21 May 2007 19:37:05 +0200 (CEST)
Message-Id: <20070521173705.4952B1CD46@palm.hoeg.nl>
Date: Mon, 21 May 2007 19:37:05 +0200 (CEST)
From: Ed Schouten <ed@fxq.nl>
Reply-To: Ed Schouten <ed@fxq.nl>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: x11-wm/ion-3ds: bump, make fetchable, rename, remove old cruft
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         112838
>Category:       ports
>Synopsis:       x11-wm/ion-3ds: bump, make fetchable, rename, remove old cruft
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    philip
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon May 21 17:40:14 GMT 2007
>Closed-Date:    Mon Jun 04 13:55:52 GMT 2007
>Last-Modified:  Sun Jun 10 10:10:04 GMT 2007
>Originator:     Ed Schouten
>Release:        FreeBSD 6.2-STABLE i386
>Organization:
>Environment:
System: FreeBSD palm.hoeg.nl 6.2-STABLE FreeBSD 6.2-STABLE #0: Fri Apr 20 13:44:49 CEST 2007 root@palm.hoeg.nl:/usr/obj/usr/src/sys/PALM i386
>Description:
This is a real `all-in-one' revamp of the x11-wm/ion-3ds port. The patch
fixes/adds/improves the following stuff:

- Make the port fetchable again. The author of Ion3 has trashed old
  distfiles. Yay.
- ion-3ds is now called ion-3rc. We'd better move this port to
  x11-wm/ion3, so we don't have to rename it again in the near future.
- Xinerama support has been dropped by the author as of beginning this
  year. There are users who want to use Xinerama. Add a 3rd party patch
  when WITH_XINERAMA is specified. Thanks to Florian Krupicka.
- Remove old FreeBSD 4.x error message.
- Don't install .mo files when WITHOUT_NLS is turned on. Only depend on
  gettext in that case.
- Honour NOPORTDOCS.
- Replace USE_X_PREFIX with USE_XLIB, as it will be of no meaning in the
  future.
>How-To-Repeat:
>Fix:
Apply the patch below like this:

$ cp -R x11-wm/ion-3ds x11-wm/ion3
$ patch -p0 < ion3.diff

--- x11-wm/ion-3ds/Makefile	Sat May 19 22:32:43 2007
+++ x11-wm/ion3/Makefile	Mon May 21 19:31:15 2007
@@ -1,42 +1,73 @@
-# New ports collection makefile for:	ion3-ds
+# New ports collection makefile for:	ion3
 # Date created:				18 June 2005
 # Whom:					Ed Schouten <ed@fxq.nl>
 #
 # $FreeBSD: ports/x11-wm/ion-3ds/Makefile,v 1.21 2007/05/19 20:32:43 flz Exp $
 #
 
-PORTNAME=	ion-3ds
-PORTVERSION=	20070318
-PORTREVISION=	1
+PORTNAME=	ion3
+PORTVERSION=	20070506
 CATEGORIES=	x11-wm
-MASTER_SITES=	http://modeemi.fi/~tuomov/dl/
+MASTER_SITES=	http://modeemi.fi/~tuomov/dl/:ion3 \
+		http://wannabehacker.com/src/:xinerama
+DISTNAME=	ion-3rc-${PORTVERSION}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:ion3
 
 MAINTAINER=	ed@fxq.nl
 COMMENT=	The development version of the Ion window manager
 
 RUN_DEPENDS=	run-mailcap:${PORTSDIR}/misc/mime-support
 
-USE_X_PREFIX=	yes
-USE_GETTEXT=	yes
+CONFLICTS=	ion-3ds-200*
+
+USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_LUA=	5.1
 MAKE_ENV=	DEFINES="${IONDEFINES}"
 
 .if defined(WITHOUT_NLS)
 IONDEFINES+=	-DCF_NO_LOCALE
+PLIST_SUB+=	NLS="@comment "
+.else
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.endif
+.if !defined(WITH_XINERAMA)
+PLIST_SUB+=	XINERAMA="@comment "
+.else
+PLIST_SUB+=	XINERAMA=""
+DISTFILES+=	mod_xinerama-20070430${EXTRACT_SUFX}:xinerama
 .endif
 
 MAN1=		ion3.1 pwm3.1
-MANLANG=	"" fi cs de
-DOCSDIR=	share/doc/ion3
+MANLANG=	"" fi cs
 
-# NO, I don't want to use configure but ion's author system.mk
+# Use our own system.mk, instead of the one generated by configure
 do-configure:
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500000
-IGNORE=		needs wide character string functions in libc
+post-extract:
+.if defined(WITH_XINERAMA)
+	@${MV} ${WRKDIR}/mod_xinerama-3 ${WRKSRC}/mod_xinerama
+.endif
+
+post-patch:
+.if defined(NOPORTDOCS)
+	@${REINPLACE_CMD} -e 's|^_install:|dont&|' ${WRKSRC}/Makefile
+.endif
+.if defined(WITHOUT_NLS)
+	@${REINPLACE_CMD} -e 's| po | |' ${WRKSRC}/Makefile
+.endif
+.if defined(WITH_XINERAMA)
+	@${REINPLACE_CMD} -e 's|^MODULE_LIST =|& mod_xinerama|' \
+		${WRKSRC}/modulelist.mk
+.endif
+
+post-install:
+.if defined(WITH_XINERAMA) && !defined(NOPORTDOCS)
+	${INSTALL_DATA} ${WRKSRC}/mod_xinerama/README \
+		${DOCSDIR}/README.mod_xinerama
 .endif
 
 .include <bsd.port.post.mk>
--- x11-wm/ion-3ds/distinfo	Sun Apr  1 17:38:59 2007
+++ x11-wm/ion3/distinfo	Mon May 21 19:06:35 2007
@@ -1,3 +1,6 @@
-MD5 (ion-3ds-20070318.tar.gz) = f02264ab7ecc990c2cd322f57a5e8a4d
-SHA256 (ion-3ds-20070318.tar.gz) = 712da027fb12774f67d933d95a95452d98a5658617fc5515011ca79b6035258a
-SIZE (ion-3ds-20070318.tar.gz) = 657282
+MD5 (ion-3rc-20070506.tar.gz) = c005ebeb89894eefbb414897d874cee6
+SHA256 (ion-3rc-20070506.tar.gz) = 850dce3bd1be5d200fda5ba3e6085f397b35c720f7758dc5481bf503fe5d2f56
+SIZE (ion-3rc-20070506.tar.gz) = 640482
+MD5 (mod_xinerama-20070430.tar.gz) = fce8dc68f8d233f9ac8e3ab796a4841c
+SHA256 (mod_xinerama-20070430.tar.gz) = 08411c1a61aa5992bd8e6672ede592767b043553cd1c482a316d798ddbf17786
+SIZE (mod_xinerama-20070430.tar.gz) = 11570
--- x11-wm/ion-3ds/pkg-plist	Sun Apr  1 17:38:59 2007
+++ x11-wm/ion3/pkg-plist	Mon May 21 19:12:50 2007
@@ -18,18 +18,13 @@
 etc/ion3/look_cleanios.lua
 etc/ion3/look_cleanviolet.lua
 etc/ion3/look_dusky.lua
+etc/ion3/look_greenlight.lua
 etc/ion3/look_greyviolet.lua
 etc/ion3/look_ios.lua
 etc/ion3/look_newviolet.lua
 etc/ion3/look_simpleblue.lua
 etc/ion3/lookcommon_clean.lua
-etc/ion3/lookcommon_clean_frame.lua
-etc/ion3/lookcommon_clean_stdisp.lua
-etc/ion3/lookcommon_clean_tab.lua
 etc/ion3/lookcommon_emboss.lua
-etc/ion3/lookcommon_emboss_frame.lua
-etc/ion3/lookcommon_emboss_stdisp.lua
-etc/ion3/lookcommon_emboss_tab.lua
 lib/ion3/bin/ion-completefile
 lib/ion3/bin/ion-statusd
 lib/ion3/lc/de.lc
@@ -39,11 +34,11 @@
 lib/ion3/lc/ioncore_luaext.lc
 lib/ion3/lc/ioncore_menudb.lc
 lib/ion3/lc/ioncore_misc.lc
+lib/ion3/lc/ioncore_tabnum.lc
 lib/ion3/lc/ioncore_wd.lc
 lib/ion3/lc/ioncore_winprops.lc
 lib/ion3/lc/mod_dock.lc
 lib/ion3/lc/mod_menu.lc
-lib/ion3/lc/mod_mgmtmode.lc
 lib/ion3/lc/mod_query.lc
 lib/ion3/lc/mod_query_chdir.lc
 lib/ion3/lc/mod_sm.lc
@@ -56,36 +51,33 @@
 lib/ion3/mod/de.so
 lib/ion3/mod/mod_dock.so
 lib/ion3/mod/mod_menu.so
-lib/ion3/mod/mod_mgmtmode.so
 lib/ion3/mod/mod_query.so
 lib/ion3/mod/mod_sm.so
 lib/ion3/mod/mod_sp.so
 lib/ion3/mod/mod_statusbar.so
 lib/ion3/mod/mod_tiling.so
-%%DOCSDIR%%/ChangeLog
-%%DOCSDIR%%/LICENSE
-%%DOCSDIR%%/README
-%%DOCSDIR%%/RELNOTES
-share/ion3/ion-completeman
-share/ion3/ion-runinxterm
-share/ion3/welcome.cs.txt
-share/ion3/welcome.de.txt
-share/ion3/welcome.fi.txt
-share/ion3/welcome.txt
-share/locale/cs/LC_MESSAGES/ion3.mo
-share/locale/de/LC_MESSAGES/ion3.mo
-share/locale/fi/LC_MESSAGES/ion3.mo
-share/locale/ru/LC_MESSAGES/ion3.mo
+%%XINERAMA%%lib/ion3/lc/mod_xinerama.lc
+%%XINERAMA%%lib/ion3/mod/mod_xinerama.so
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/RELNOTES
+%%XINERAMA%%%%PORTDOCS%%%%DOCSDIR%%/README.mod_xinerama
+%%DATADIR%%/ion-completeman
+%%DATADIR%%/ion-runinxterm
+%%DATADIR%%/welcome.cs.txt
+%%DATADIR%%/welcome.fi.txt
+%%DATADIR%%/welcome.txt
+%%NLS%%share/locale/cs/LC_MESSAGES/ion3.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/ion3.mo
 @dirrm lib/ion3/bin
 @dirrm lib/ion3/lc
 @dirrm lib/ion3/mod
 @dirrm lib/ion3
 @dirrm share/ion3
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry etc/ion3
 @dirrmtry man/cs/man1
 @dirrmtry man/cs
-@dirrmtry man/de/man1
-@dirrmtry man/de
 @dirrmtry man/fi/man1
 @dirrmtry man/fi
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Mon May 21 17:44:13 UTC 2007 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=112838 

From: Ed Schouten <ed@fxq.nl>
To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org
Cc:  
Subject: Re: ports/112838: x11-wm/ion-3ds: bump, make fetchable, rename,
	remove old cruft
Date: Mon, 4 Jun 2007 15:38:14 +0200

 --nHwqXXcoX0o6fKCv
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 Content-Transfer-Encoding: quoted-printable
 
 Hello,
 
 As I've read online the license of Ion3 has turned sour. The author has
 ammended the license to the source with new clauses which enforces rules
 which the FreeBSD package model can't guarantee, including a rule that
 forces all packages to be beyond a version of a certain age.
 
 Please remove the x11-wm/ion-3ds port from the tree. Under such harsh
 conditions I'm not willing to maintain a port for this window manager.
 
 --=20
  Ed Schouten <ed@fxq.nl>
  WWW: http://g-rave.nl/
 
 --nHwqXXcoX0o6fKCv
 Content-Type: application/pgp-signature
 Content-Disposition: inline
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (FreeBSD)
 
 iD8DBQFGZBXG52SDGA2eCwURAopgAJ9CLcLge8SqCWdIQb3ut5+LJ519VACdGvGC
 mwsX+xZhSb3YoWyvkB9Lly8=
 =mrQP
 -----END PGP SIGNATURE-----
 
 --nHwqXXcoX0o6fKCv--
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Mon Jun 4 13:55:50 UTC 2007 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=112838 

From: Ed Schouten <ed@fxq.nl>
To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org
Cc:  
Subject: Re: ports/112838: x11-wm/ion-3ds: bump, make fetchable, rename,
	remove old cruft
Date: Tue, 5 Jun 2007 12:05:34 +0200

 --8c07nsHwQobhlezh
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 Content-Transfer-Encoding: quoted-printable
 
 Hello Philip,
 
 * Philip Paeps <philip@FreeBSD.org> wrote:
 > On 2007-06-04 15:38:14 (+0200), Ed Schouten <ed@fxq.nl> wrote:
 > > As I've read online the license of Ion3 has turned sour. The author has
 > > ammended the license to the source with new clauses which enforces rules
 > > which the FreeBSD package model can't guarantee, including a rule that
 > > forces all packages to be beyond a version of a certain age.
 > >=20
 > > Please remove the x11-wm/ion-3ds port from the tree. Under such harsh
 > > conditions I'm not willing to maintain a port for this window manager.
 >=20
 > I've grabbed maintainership.  I like ion, despite the licence. ;-)
 >=20
 > The licence change was made mainly to prevent "ordinary users" from getti=
 ng an
 > ancient version when they ask their package manager for "ion".  It is mai=
 nly
 > aimed at certain Linux distributions who peg their package managers to th=
 eir
 > releases and never update packages on releases.
 >=20
 > Since the ports tree is not tagged, this is not really a problem for us. =
  When
 > people ask for "ion" from the ports (ion-3, actually), they'll get the la=
 test
 > version -- provided the maintainer is somewhat alive, which I'll do my be=
 st to
 > be -- which is precisely what the licence wants.
 
 I guess that problem still persists if someone on a FreeBSD 5.x box runs
 `pkg_add -r ion-3ds', because then the user gets the outdated package.
 But IANAL ;-)
 
 > But never mind all that.  I'll happily maintain the port for you.  I'll t=
 ry to
 > be as good a parent as you've been. :-)
 
 Thanks! Be sure to look at the patch I in the PR. I guess you can commit
 it without the Xinerama bits in it; maybe you could introduce a flag
 called WITH_FEATURES_THAT_REMOVE_SUPPORT that enables all options that
 void support in some way... Good luck! :)
 
 --=20
  Ed Schouten <ed@fxq.nl>
  WWW: http://g-rave.nl/
 
 --8c07nsHwQobhlezh
 Content-Type: application/pgp-signature
 Content-Disposition: inline
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (FreeBSD)
 
 iD8DBQFGZTVu52SDGA2eCwURAoYPAJ9XXiWZ3xNqpQAPCxZcDF3MHRYMFwCfTkPx
 LmUhp+7+1VCKRUb6vBbzrjo=
 =rJGX
 -----END PGP SIGNATURE-----
 
 --8c07nsHwQobhlezh--

From: Philip Paeps <philip@FreeBSD.org>
To: Ed Schouten <ed@fxq.nl>
Cc: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org
Subject: Re: ports/112838: x11-wm/ion-3ds: bump, make fetchable, rename,
	remove old cruft
Date: Tue, 5 Jun 2007 11:54:57 +0200

 On 2007-06-04 15:38:14 (+0200), Ed Schouten <ed@fxq.nl> wrote:
 > As I've read online the license of Ion3 has turned sour. The author has
 > ammended the license to the source with new clauses which enforces rules
 > which the FreeBSD package model can't guarantee, including a rule that
 > forces all packages to be beyond a version of a certain age.
 > 
 > Please remove the x11-wm/ion-3ds port from the tree. Under such harsh
 > conditions I'm not willing to maintain a port for this window manager.
 
 I've grabbed maintainership.  I like ion, despite the licence. ;-)
 
 The licence change was made mainly to prevent "ordinary users" from getting an
 ancient version when they ask their package manager for "ion".  It is mainly
 aimed at certain Linux distributions who peg their package managers to their
 releases and never update packages on releases.
 
 Since the ports tree is not tagged, this is not really a problem for us.  When
 people ask for "ion" from the ports (ion-3, actually), they'll get the latest
 version -- provided the maintainer is somewhat alive, which I'll do my best to
 be -- which is precisely what the licence wants.
 
 But never mind all that.  I'll happily maintain the port for you.  I'll try to
 be as good a parent as you've been. :-)
 
  - Philip
 
 -- 
 Philip Paeps                                    Please don't Cc me, I am
 philip@freebsd.org                               subscribed to the list.
 
   BOFH Excuse #166:
     /pub/lunch
Responsible-Changed-From-To: miwi->philip 
Responsible-Changed-By: philip 
Responsible-Changed-When: Tue Jun 5 11:10:21 UTC 2007 
Responsible-Changed-Why:  
I'll deal with this. :-) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=112838 

From: Philip Paeps <philip@FreeBSD.org>
To: Ed Schouten <ed@fxq.nl>
Cc: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org
Subject: Re: ports/112838: x11-wm/ion-3ds: bump, make fetchable, rename,
	remove old cruft
Date: Tue, 5 Jun 2007 13:32:23 +0200

 On 2007-06-05 12:05:34 (+0200), Ed Schouten <ed@fxq.nl> wrote:
 > * Philip Paeps <philip@FreeBSD.org> wrote:
 > > On 2007-06-04 15:38:14 (+0200), Ed Schouten <ed@fxq.nl> wrote:
 > > > As I've read online the license of Ion3 has turned sour. The author has
 > > > ammended the license to the source with new clauses which enforces rules
 > > > which the FreeBSD package model can't guarantee, including a rule that
 > > > forces all packages to be beyond a version of a certain age.
 > > 
 > > [...]
 > > Since the ports tree is not tagged, this is not really a problem for us.
 > > When people ask for "ion" from the ports (ion-3, actually), they'll get
 > > the latest version -- provided the maintainer is somewhat alive, which
 > > I'll do my best to be -- which is precisely what the licence wants.
 > 
 > I guess that problem still persists if someone on a FreeBSD 5.x box runs
 > `pkg_add -r ion-3ds', because then the user gets the outdated package.  But
 > IANAL ;-)
 
 True.  I had forgotten about the binary packages case.  I guess we'll need to
 set NO_PACKAGE for this.  But I'll check this with Tuomo first on IRC.
 
 Cheers,
 
  - Philip
 
 -- 
 Philip Paeps                                             My opinions are
 philip@freebsd.org
 
   Never attribute to malice that which is adequately
   explained by stupidity.

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/112838: commit references a PR
Date: Sun, 10 Jun 2007 10:05:27 +0000 (UTC)

 philip      2007-06-10 10:05:16 UTC
 
   FreeBSD ports repository
 
   Modified files:
     .                    MOVED 
     x11-wm               Makefile 
     x11-wm/ion-3         Makefile distinfo pkg-plist 
     x11-wm/ion-3/files   patch-system.mk 
   Removed files:
     x11-wm/ion-3ds       Makefile distinfo pkg-descr pkg-plist 
     x11-wm/ion-3ds/files patch-system.mk 
   Log:
   Repocopied x11-wm/ion-3ds to x11-wm/ion-3 since there are now release
   candidates available which will soon become the final ion-3 release.
   
   Update x11-wm/ion-3 to ion-3rc-20070608, the latest release candidate.
   
   PR:             ports/112838
   Submitted by:   Ed Schouten <ed -at- fxq.nl>
   Repocopied by:  marcus
   
   Revision  Changes    Path
   1.1388    +2 -1      ports/MOVED
   1.196     +1 -1      ports/x11-wm/Makefile
   1.24      +42 -11    ports/x11-wm/ion-3/Makefile
   1.17      +3 -3      ports/x11-wm/ion-3/distinfo
   1.8       +18 -12    ports/x11-wm/ion-3/files/patch-system.mk
   1.12      +18 -26    ports/x11-wm/ion-3/pkg-plist
   1.24      +0 -42     ports/x11-wm/ion-3ds/Makefile (dead)
   1.17      +0 -3      ports/x11-wm/ion-3ds/distinfo (dead)
   1.8       +0 -113    ports/x11-wm/ion-3ds/files/patch-system.mk (dead)
   1.3       +0 -20     ports/x11-wm/ion-3ds/pkg-descr (dead)
   1.12      +0 -91     ports/x11-wm/ion-3ds/pkg-plist (dead)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
