Date: Mon, 21 May 2007 19:37:05 +0200 (CEST) From: Ed Schouten <ed@fxq.nl> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/112838: x11-wm/ion-3ds: bump, make fetchable, rename, remove old cruft Message-ID: <20070521173705.4952B1CD46@palm.hoeg.nl> Resent-Message-ID: <200705211740.l4LHeETB082271@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 112838 >Category: ports >Synopsis: x11-wm/ion-3ds: bump, make fetchable, rename, remove old cruft >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon May 21 17:40:14 GMT 2007 >Closed-Date: >Last-Modified: >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: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070521173705.4952B1CD46>