diff --git a/x11-wm/ctwm/Makefile b/x11-wm/ctwm/Makefile index 8944a6ef4a31..d10d6e286f47 100644 --- a/x11-wm/ctwm/Makefile +++ b/x11-wm/ctwm/Makefile @@ -6,12 +6,10 @@ # $Id: Makefile,v 1.4 1995/01/13 12:48:46 jkh Exp $ # -DISTNAME= ctwm-3.2p1 +DISTNAME= ctwm-3.3 MASTER_SITES= ftp://ftp.x.org/contrib/window_managers/ USE_IMAKE= YES EXTRACT_SUFX= .tar.Z -.if !exists(/usr/X11R6/lib/libXpm.a) LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm -.endif .include diff --git a/x11-wm/ctwm/distinfo b/x11-wm/ctwm/distinfo new file mode 100644 index 000000000000..beb7ddfa975e --- /dev/null +++ b/x11-wm/ctwm/distinfo @@ -0,0 +1 @@ +MD5 (ctwm-3.3.tar.Z) = 2ff78374ce4a24b5527c5c83e1917b07 diff --git a/x11-wm/ctwm/files/patch-aa b/x11-wm/ctwm/files/patch-aa index 01e5954cfd78..4ef5df182c8d 100644 --- a/x11-wm/ctwm/files/patch-aa +++ b/x11-wm/ctwm/files/patch-aa @@ -1,7 +1,7 @@ -*** Imakefile.orig Sun Nov 13 23:04:28 1994 ---- Imakefile Sun Nov 13 23:04:41 1994 +*** Imakefile.orig Wed Jan 4 18:10:33 1995 +--- Imakefile Sat Feb 11 11:48:41 1995 *************** -*** 10,16 **** +*** 10,24 **** #undef IMCONV #undef USE_SOUND #define XPM @@ -9,11 +9,27 @@ YFLAGS = -d DEPLIBS = $(DEPXMULIB) $(DEPEXTENSIONLIB) $(DEPXLIB) ---- 10,16 ---- + LINTLIBS = $(LINTXMU) $(LINTEXTENSIONLIB) $(LINTXLIB) + + #ifdef XPM +! XPMLIBDIR = +! XPMINCDIR = + + XPMDEFINES = -DXPM + XPMLIB = $(XPMLIBDIR) -lXpm +--- 10,24 ---- #undef IMCONV #undef USE_SOUND #define XPM -! #undef USEM4 +! #undef USEM4 YFLAGS = -d DEPLIBS = $(DEPXMULIB) $(DEPEXTENSIONLIB) $(DEPXLIB) + LINTLIBS = $(LINTXMU) $(LINTEXTENSIONLIB) $(LINTXLIB) + + #ifdef XPM +! XPMLIBDIR = -L /usr/X11R6/lib +! XPMINCDIR = -I/usr/X11R6/include + + XPMDEFINES = -DXPM + XPMLIB = $(XPMLIBDIR) -lXpm diff --git a/x11-wm/ctwm/pkg-plist b/x11-wm/ctwm/pkg-plist index 8853cd809ed7..704dc70ff498 100644 --- a/x11-wm/ctwm/pkg-plist +++ b/x11-wm/ctwm/pkg-plist @@ -2,84 +2,84 @@ bin/ctwm lib/X11/twm/system.ctwmrc man/man1/ctwm.1.gz -lib/X11/twm/images/xpm/3D_Expand15.xpm -lib/X11/twm/images/xpm/3D_Iconify15.xpm -lib/X11/twm/images/xpm/3D_Lightning15.xpm -lib/X11/twm/images/xpm/3D_Menu15.xpm -lib/X11/twm/images/xpm/3D_Resize15.xpm -lib/X11/twm/images/xpm/3D_Zoom15.xpm -lib/X11/twm/images/xpm/IslandD.xpm -lib/X11/twm/images/xpm/IslandW.xpm -lib/X11/twm/images/xpm/LRom.xpm -lib/X11/twm/images/xpm/LRom1.xpm -lib/X11/twm/images/xpm/arthur.xpm -lib/X11/twm/images/xpm/audio_editor.xpm -lib/X11/twm/images/xpm/background8.xpm -lib/X11/twm/images/xpm/ball1.xpm -lib/X11/twm/images/xpm/ball10.xpm -lib/X11/twm/images/xpm/ball11.xpm -lib/X11/twm/images/xpm/ball12.xpm -lib/X11/twm/images/xpm/ball2.xpm -lib/X11/twm/images/xpm/ball3.xpm -lib/X11/twm/images/xpm/ball4.xpm -lib/X11/twm/images/xpm/ball5.xpm -lib/X11/twm/images/xpm/ball6.xpm -lib/X11/twm/images/xpm/ball7.xpm -lib/X11/twm/images/xpm/ball8.xpm -lib/X11/twm/images/xpm/ball9.xpm -lib/X11/twm/images/xpm/cdrom1.xpm -lib/X11/twm/images/xpm/claude.xpm -lib/X11/twm/images/xpm/clipboard.xpm -lib/X11/twm/images/xpm/datebook.xpm -lib/X11/twm/images/xpm/emacs.xpm -lib/X11/twm/images/xpm/ghostview.xpm -lib/X11/twm/images/xpm/gnu-emacs1.xpm -lib/X11/twm/images/xpm/gnu-emacs2.xpm -lib/X11/twm/images/xpm/gnu-emacs3.xpm -lib/X11/twm/images/xpm/gnu-emacs4.xpm -lib/X11/twm/images/xpm/gnu-emacs5.xpm -lib/X11/twm/images/xpm/gnu-emacs6.xpm -lib/X11/twm/images/xpm/gnu-emacs7.xpm -lib/X11/twm/images/xpm/hpterm.xpm -lib/X11/twm/images/xpm/mail0.xpm -lib/X11/twm/images/xpm/mail1.xpm -lib/X11/twm/images/xpm/nothing.xpm -lib/X11/twm/images/xpm/nt1.xpm -lib/X11/twm/images/xpm/nt2.xpm -lib/X11/twm/images/xpm/pixmap.xpm -lib/X11/twm/images/xpm/postit.xpm -lib/X11/twm/images/xpm/skull.xpm -lib/X11/twm/images/xpm/spider.xpm -lib/X11/twm/images/xpm/supman1.xbm -lib/X11/twm/images/xpm/supman2.xbm -lib/X11/twm/images/xpm/supman3.xbm -lib/X11/twm/images/xpm/supman4.xbm -lib/X11/twm/images/xpm/supman5.xbm -lib/X11/twm/images/xpm/supman6.xbm -lib/X11/twm/images/xpm/supman7.xbm -lib/X11/twm/images/xpm/supman8.xbm -lib/X11/twm/images/xpm/supman9.xbm -lib/X11/twm/images/xpm/term.xpm -lib/X11/twm/images/xpm/unknown.xpm -lib/X11/twm/images/xpm/unknown1.xpm -lib/X11/twm/images/xpm/unread.xpm -lib/X11/twm/images/xpm/welcome.xpm -lib/X11/twm/images/xpm/welcome.xwd -lib/X11/twm/images/xpm/xarchie.xpm -lib/X11/twm/images/xpm/xcalc.xpm -lib/X11/twm/images/xpm/xcalc2.xpm -lib/X11/twm/images/xpm/xedit.xpm -lib/X11/twm/images/xpm/xftp.xpm -lib/X11/twm/images/xpm/xgopher.xpm -lib/X11/twm/images/xpm/xgrab.xpm -lib/X11/twm/images/xpm/xhpcalc.xpm -lib/X11/twm/images/xpm/xirc.xpm -lib/X11/twm/images/xpm/xmail.xpm -lib/X11/twm/images/xpm/xman.xpm -lib/X11/twm/images/xpm/xmosaic.xpm -lib/X11/twm/images/xpm/xnomail.xpm -lib/X11/twm/images/xpm/xrn-compose.xpm -lib/X11/twm/images/xpm/xrn.goodnews.xpm -lib/X11/twm/images/xpm/xrn.nonews.xpm -lib/X11/twm/images/xpm/xrn.xpm -lib/X11/twm/images/xpm/xterm.xpm +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/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/background8.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/gnu-emacs1.xpm +lib/X11/twm/images/gnu-emacs2.xpm +lib/X11/twm/images/gnu-emacs3.xpm +lib/X11/twm/images/gnu-emacs4.xpm +lib/X11/twm/images/gnu-emacs5.xpm +lib/X11/twm/images/gnu-emacs6.xpm +lib/X11/twm/images/gnu-emacs7.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