Attachment 182860 Details for Bug 219500 – patch

[patch] patch

patch (text/plain), 7.92 KB, created by fullermd on 2017-05-24 10:53:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: fullermd

Created: 2017-05-24 10:53:13 UTC

Size: 7.92 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 441571)
>+++ Makefile	(working copy)
>@@ -2,12 +2,11 @@
> # $FreeBSD$
> 
> PORTNAME=	ctwm
>-PORTVERSION=	3.8.2
>-PORTREVISION=	1
>+PORTVERSION=	4.0.0
> PORTEPOCH=	1
> CATEGORIES=	x11-wm
>-MASTER_SITES=	http://www.ctwm.org/dist/ \
>-		http://distfiles.over-yonder.net/ctwm/
>+MASTER_SITES=	https://www.ctwm.org/dist/ \
>+		https://distfiles.over-yonder.net/ctwm/
> 
> MAINTAINER=	fullermd@over-yonder.net
> COMMENT=	Extension to twm, with support for multiple virtual screens, etc
>@@ -14,11 +13,7 @@
> 
> LICENSE=	MIT
> 
>-USES=		imake jpeg tar:xz
>-USE_XORG=	xpm xmu
>+USES=		cmake:outsource jpeg tar:xz
>+USE_XORG=	x11 xext xt ice sm xpm xmu
> 
>-pre-configure:
>-	${CP} ${WRKSRC}/Imakefile.local-template ${WRKSRC}/Imakefile.local
>-	${CAT} ${FILESDIR}/Imakefile.local-additional >> ${WRKSRC}/Imakefile.local
>-
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 441571)
>+++ distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (ctwm-3.8.2.tar.xz) = 574d67a8a69f2f1ebaa71aa40cc50667e814f74b51f5db8886e2def6a3e0900f
>-SIZE (ctwm-3.8.2.tar.xz) = 549984
>+TIMESTAMP = 1495621832
>+SHA256 (ctwm-4.0.0.tar.xz) = ee3478ee4d0c9dc988a71367934439e59c26d216d2d21b5ad389b44607a716fd
>+SIZE (ctwm-4.0.0.tar.xz) = 646244
>Index: files/Imakefile.local-additional
>===================================================================
>--- files/Imakefile.local-additional	(revision 441571)
>+++ files/Imakefile.local-additional	(nonexistent)
>@@ -1,9 +0,0 @@
>-
>-XCOMM We might actually prefer using something from X11BASE here instead,
>-XCOMM since that's where we technically install XPM stuff (though it's
>-XCOMM the same thing as USRLIBDIR)
>-USER_XPMLIBDIR = -L$(USRLIBDIR)
>-USER_XPMINCDIR = -I$(INCROOT)
>-
>-USER_JPEGLIBDIR = -L$(LOCALBASE)/lib
>-USER_JPEGINCDIR = -I$(LOCALBASE)/include
>
>Property changes on: files/Imakefile.local-additional
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 441571)
>+++ pkg-plist	(working copy)
>@@ -1,93 +1,86 @@
> bin/ctwm
>-lib/X11/twm/images/3D_Expand15.xpm
>-lib/X11/twm/images/3D_Iconify15.xpm
>-lib/X11/twm/images/3D_Lightning15.xpm
>-lib/X11/twm/images/3D_Menu15.xpm
>-lib/X11/twm/images/3D_Resize15.xpm
>-lib/X11/twm/images/3D_Zoom15.xpm
>-lib/X11/twm/images/3dcircle.xpm
>-lib/X11/twm/images/3ddimple.xpm
>-lib/X11/twm/images/3ddot.xpm
>-lib/X11/twm/images/3dfeet.xpm
>-lib/X11/twm/images/3dleopard.xpm
>-lib/X11/twm/images/3dpie.xpm
>-lib/X11/twm/images/3dpyramid.xpm
>-lib/X11/twm/images/3dslant.xpm
>-lib/X11/twm/images/IslandD.xpm
>-lib/X11/twm/images/IslandW.xpm
>-lib/X11/twm/images/LRom.xpm
>-lib/X11/twm/images/LRom1.xpm
>-lib/X11/twm/images/arthur.xpm
>-lib/X11/twm/images/audio_editor.xpm
>-lib/X11/twm/images/background1.xpm
>-lib/X11/twm/images/background2.xpm
>-lib/X11/twm/images/background3.xpm
>-lib/X11/twm/images/background4.xpm
>-lib/X11/twm/images/background5.xpm
>-lib/X11/twm/images/background6.xpm
>-lib/X11/twm/images/background7.xpm
>-lib/X11/twm/images/background8.xpm
>-lib/X11/twm/images/background9.xpm
>-lib/X11/twm/images/ball1.xpm
>-lib/X11/twm/images/ball10.xpm
>-lib/X11/twm/images/ball11.xpm
>-lib/X11/twm/images/ball12.xpm
>-lib/X11/twm/images/ball2.xpm
>-lib/X11/twm/images/ball3.xpm
>-lib/X11/twm/images/ball4.xpm
>-lib/X11/twm/images/ball5.xpm
>-lib/X11/twm/images/ball6.xpm
>-lib/X11/twm/images/ball7.xpm
>-lib/X11/twm/images/ball8.xpm
>-lib/X11/twm/images/ball9.xpm
>-lib/X11/twm/images/cdrom1.xpm
>-lib/X11/twm/images/claude.xpm
>-lib/X11/twm/images/clipboard.xpm
>-lib/X11/twm/images/datebook.xpm
>-lib/X11/twm/images/emacs.xpm
>-lib/X11/twm/images/ghostview.xpm
>-lib/X11/twm/images/hpterm.xpm
>-lib/X11/twm/images/mail0.xpm
>-lib/X11/twm/images/mail1.xpm
>-lib/X11/twm/images/nothing.xpm
>-lib/X11/twm/images/nt1.xpm
>-lib/X11/twm/images/nt2.xpm
>-lib/X11/twm/images/pixmap.xpm
>-lib/X11/twm/images/postit.xpm
>-lib/X11/twm/images/skull.xpm
>-lib/X11/twm/images/spider.xpm
>-lib/X11/twm/images/supman1.xbm
>-lib/X11/twm/images/supman2.xbm
>-lib/X11/twm/images/supman3.xbm
>-lib/X11/twm/images/supman4.xbm
>-lib/X11/twm/images/supman5.xbm
>-lib/X11/twm/images/supman6.xbm
>-lib/X11/twm/images/supman7.xbm
>-lib/X11/twm/images/supman8.xbm
>-lib/X11/twm/images/supman9.xbm
>-lib/X11/twm/images/term.xpm
>-lib/X11/twm/images/unknown.xpm
>-lib/X11/twm/images/unknown1.xpm
>-lib/X11/twm/images/unread.xpm
>-lib/X11/twm/images/welcome.xpm
>-lib/X11/twm/images/welcome.xwd
>-lib/X11/twm/images/xarchie.xpm
>-lib/X11/twm/images/xcalc.xpm
>-lib/X11/twm/images/xcalc2.xpm
>-lib/X11/twm/images/xedit.xpm
>-lib/X11/twm/images/xftp.xpm
>-lib/X11/twm/images/xgopher.xpm
>-lib/X11/twm/images/xgrab.xpm
>-lib/X11/twm/images/xhpcalc.xpm
>-lib/X11/twm/images/xirc.xpm
>-lib/X11/twm/images/xmail.xpm
>-lib/X11/twm/images/xman.xpm
>-lib/X11/twm/images/xmosaic.xpm
>-lib/X11/twm/images/xnomail.xpm
>-lib/X11/twm/images/xrn-compose.xpm
>-lib/X11/twm/images/xrn.goodnews.xpm
>-lib/X11/twm/images/xrn.nonews.xpm
>-lib/X11/twm/images/xrn.xpm
>-lib/X11/twm/images/xterm.xpm
>-lib/X11/twm/system.ctwmrc
> man/man1/ctwm.1.gz
>+%%DATADIR%%/images/3D_Expand15.xpm
>+%%DATADIR%%/images/3D_Iconify15.xpm
>+%%DATADIR%%/images/3D_Lightning15.xpm
>+%%DATADIR%%/images/3D_Menu15.xpm
>+%%DATADIR%%/images/3D_Resize15.xpm
>+%%DATADIR%%/images/3D_Zoom15.xpm
>+%%DATADIR%%/images/3dcircle.xpm
>+%%DATADIR%%/images/3ddimple.xpm
>+%%DATADIR%%/images/3ddot.xpm
>+%%DATADIR%%/images/3dfeet.xpm
>+%%DATADIR%%/images/3dleopard.xpm
>+%%DATADIR%%/images/3dpie.xpm
>+%%DATADIR%%/images/3dpyramid.xpm
>+%%DATADIR%%/images/3dslant.xpm
>+%%DATADIR%%/images/IslandD.xpm
>+%%DATADIR%%/images/IslandW.xpm
>+%%DATADIR%%/images/LRom.xpm
>+%%DATADIR%%/images/LRom1.xpm
>+%%DATADIR%%/images/arthur.xpm
>+%%DATADIR%%/images/audio_editor.xpm
>+%%DATADIR%%/images/background1.xpm
>+%%DATADIR%%/images/background2.xpm
>+%%DATADIR%%/images/background3.xpm
>+%%DATADIR%%/images/background4.xpm
>+%%DATADIR%%/images/background5.xpm
>+%%DATADIR%%/images/background6.xpm
>+%%DATADIR%%/images/background7.xpm
>+%%DATADIR%%/images/background8.xpm
>+%%DATADIR%%/images/background9.xpm
>+%%DATADIR%%/images/ball1.xpm
>+%%DATADIR%%/images/ball10.xpm
>+%%DATADIR%%/images/ball11.xpm
>+%%DATADIR%%/images/ball12.xpm
>+%%DATADIR%%/images/ball2.xpm
>+%%DATADIR%%/images/ball3.xpm
>+%%DATADIR%%/images/ball4.xpm
>+%%DATADIR%%/images/ball5.xpm
>+%%DATADIR%%/images/ball6.xpm
>+%%DATADIR%%/images/ball7.xpm
>+%%DATADIR%%/images/ball8.xpm
>+%%DATADIR%%/images/ball9.xpm
>+%%DATADIR%%/images/cdrom1.xpm
>+%%DATADIR%%/images/claude.xpm
>+%%DATADIR%%/images/clipboard.xpm
>+%%DATADIR%%/images/datebook.xpm
>+%%DATADIR%%/images/emacs.xpm
>+%%DATADIR%%/images/ghostview.xpm
>+%%DATADIR%%/images/hpterm.xpm
>+%%DATADIR%%/images/mail0.xpm
>+%%DATADIR%%/images/mail1.xpm
>+%%DATADIR%%/images/nothing.xpm
>+%%DATADIR%%/images/nt1.xpm
>+%%DATADIR%%/images/nt2.xpm
>+%%DATADIR%%/images/pixmap.xpm
>+%%DATADIR%%/images/postit.xpm
>+%%DATADIR%%/images/skull.xpm
>+%%DATADIR%%/images/spider.xpm
>+%%DATADIR%%/images/term.xpm
>+%%DATADIR%%/images/unknown.xpm
>+%%DATADIR%%/images/unknown1.xpm
>+%%DATADIR%%/images/unread.xpm
>+%%DATADIR%%/images/welcome.xpm
>+%%DATADIR%%/images/xarchie.xpm
>+%%DATADIR%%/images/xcalc.xpm
>+%%DATADIR%%/images/xcalc2.xpm
>+%%DATADIR%%/images/xedit.xpm
>+%%DATADIR%%/images/xftp.xpm
>+%%DATADIR%%/images/xgopher.xpm
>+%%DATADIR%%/images/xgrab.xpm
>+%%DATADIR%%/images/xhpcalc.xpm
>+%%DATADIR%%/images/xirc.xpm
>+%%DATADIR%%/images/xmail.xpm
>+%%DATADIR%%/images/xman.xpm
>+%%DATADIR%%/images/xmosaic.xpm
>+%%DATADIR%%/images/xnomail.xpm
>+%%DATADIR%%/images/xrn-compose.xpm
>+%%DATADIR%%/images/xrn.goodnews.xpm
>+%%DATADIR%%/images/xrn.nonews.xpm
>+%%DATADIR%%/images/xrn.xpm
>+%%DATADIR%%/images/xterm.xpm
>+%%PORTDOCS%%%%DOCSDIR%%/CHANGES.md
>+%%PORTDOCS%%%%DOCSDIR%%/README.md
>+%%PORTDOCS%%%%DOCSDIR%%/ctwm.1.html
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/system.ctwmrc

Actions: View | Diff

Attachments on bug 219500: 182860