[Midnightbsd-cvs] mports: mports/editors: Remove joe version 2.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Wed Oct 1 15:20:58 EDT 2008
Log Message:
-----------
Remove joe version 2. joe 3.5 and jupp remain. Fix conflicts on both ports as well as the vim ports we updated moments ago. In the vim case, make sure that vim-lite and vim do not conflict with themselves.
Modified Files:
--------------
mports/editors:
Makefile (r1.29 -> r1.30)
mports/editors/joe:
Makefile (r1.7 -> r1.8)
mports/editors/vim:
Makefile (r1.11 -> r1.12)
mports/editors/vim-lite:
Makefile (r1.2 -> r1.3)
Removed Files:
-------------
mports/editors/joe2:
Makefile
distinfo
pkg-descr
pkg-plist
mports/editors/joe2/files:
patch-configure
patch-tty.c
-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/editors/joe/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -L editors/joe/Makefile -L editors/joe/Makefile -u -r1.7 -r1.8
--- editors/joe/Makefile
+++ editors/joe/Makefile
@@ -7,7 +7,7 @@
PORTNAME= joe
PORTVERSION= 3.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}-editor
@@ -17,12 +17,10 @@
COMMENT= Joe's Own Editor
LICENSE= gpl
-# '
-
BUILD_DEPENDS= aspell:${PORTSDIR}/textproc/aspell
RUN_DEPENDS= aspell:${PORTSDIR}/textproc/aspell
-CONFLICTS= joe-2.* jupp
+CONFLICTS= jupp-[0-9]*
USE_GMAKE= yes
USE_ICONV= yes
--- editors/joe2/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-JOE is the professional freeware ASCII text screen editor for UNIX.
-It makes full use of the power and versatility of UNIX, but lacks the steep
-learning curve and basic nonsense you have to deal with in every other UNIX
-editor. JOE has the feel of most IBM PC text editors: The key-sequences are
-reminiscent of WordStar and Turbo-C. JOE is much more powerful than those
-editors, however. JOE has all of the features a UNIX user should expect:
-full use of termcap/terminfo, excellent screen update optimizations (JOE is
-fully useable at 2400 baud), simple installation, and all of the
-UNIX-integration features of VI.
-
-WWW: http://sourceforge.net/projects/joe-editor/
--- editors/joe2/pkg-plist
+++ /dev/null
@@ -1,19 +0,0 @@
-bin/joe
-bin/jmacs
-bin/jstar
-bin/rjoe
-bin/jpico
-bin/termidx
-etc/joe/joerc
-etc/joe/jmacsrc
-etc/joe/jstarrc
-etc/joe/rjoerc
-etc/joe/jpicorc
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/CommandList
-%%PORTDOCS%%%%DOCSDIR%%/INFO
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.cvs
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
- at dirrmtry etc/joe
--- editors/joe2/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# New ports collection makefile for: joe
-# Date created: 01 Jul 1995
-# Whom: torstenb at FreeBSD.org
-#
-# $MidnightBSD: mports/editors/joe2/Makefile,v 1.2 2008/05/20 17:58:02 laffer1 Exp $
-# $FreeBSD: ports/editors/joe2/Makefile,v 1.23 2005/10/23 10:09:52 pav Exp $
-#
-
-PORTNAME= joe
-PORTVERSION= 2.9.8
-CATEGORIES+= editors
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}-editor
-
-MAINTAINER= ports at MidnightBSD.org
-COMMENT= Joe's Own Editor
-
-RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell
-
-LATEST_LINK?= joe2
-CONFLICTS= joe-3* jupp
-
-GNU_CONFIGURE= yes
-USE_GMAKE= yes
-USE_ICONV= yes
-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd6.0
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib -liconv"
-
-ALL_TARGET= ${PORTNAME}
-MAN1= ${PORTNAME}.1
-
-post-install:
-.if !defined(NOPORTDOCS)
- ${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/README.cvs ${WRKSRC}/ChangeLog\
- ${WRKSRC}/INFO ${WRKSRC}/NEWS ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/LIST ${DOCSDIR}/CommandList
-.endif
-
-.include <bsd.port.mk>
--- editors/joe2/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (joe-2.9.8.tar.gz) = c7c66cc641f53ba820f47a73c5b2377f
-SHA256 (joe-2.9.8.tar.gz) = af1093a21f54d3c63278af7ac4b2479cc78afbf75dec6862eda6c19eb8b198a1
-SIZE (joe-2.9.8.tar.gz) = 283596
--- editors/joe2/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig Fri May 6 18:53:19 2005
-+++ configure Fri May 6 18:53:19 2005
-@@ -340,7 +340,7 @@
- sbindir='${exec_prefix}/sbin'
- libexecdir='${exec_prefix}/libexec'
- datadir='${prefix}/share'
--sysconfdir='${prefix}/etc'
-+sysconfdir='${prefix}/etc/joe'
- sharedstatedir='${prefix}/com'
- localstatedir='${prefix}/var'
- libdir='${exec_prefix}/lib'
--- editors/joe2/files/patch-tty.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- tty.c.orig Fri May 6 17:26:17 2005
-+++ tty.c Fri May 6 17:28:19 2005
-@@ -934,9 +934,11 @@
- #endif
-
- #ifndef SETPGRP_VOID
-- setpgrp(0, 0);
--#else
-- setpgrp();
-+ setpgrp(0, getpid());
-+/*
-+ * #else
-+ * setpgrp();
-+ */
- #endif
-
- for (x = 0; x != 32; ++x)
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/editors/vim/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -L editors/vim/Makefile -L editors/vim/Makefile -u -r1.11 -r1.12
--- editors/vim/Makefile
+++ editors/vim/Makefile
@@ -48,7 +48,7 @@
XTERM_SAVE "" off
.endif
-CONFLICTS= vim6*-* vim*-lite-*
+CONFLICTS?= vim-lite-[0-9]*
USE_BZIP2= yes
DIST_SUBDIR= vim
WRKSRC= ${WRKDIR}/vim${PORTVERSION:C/\.[0-9]*$//:S/.//g}/src
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/editors/Makefile,v
retrieving revision 1.29
retrieving revision 1.30
diff -L editors/Makefile -L editors/Makefile -u -r1.29 -r1.30
--- editors/Makefile
+++ editors/Makefile
@@ -14,7 +14,6 @@
SUBDIR += jedit
SUBDIR += jedit-devel
SUBDIR += joe
- SUBDIR += joe2
SUBDIR += jupp
SUBDIR += kile
SUBDIR += koffice-kde3
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/editors/vim-lite/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L editors/vim-lite/Makefile -L editors/vim-lite/Makefile -u -r1.2 -r1.3
--- editors/vim-lite/Makefile
+++ editors/vim-lite/Makefile
@@ -15,4 +15,6 @@
COMMENT?= Vi "workalike", with many additional features (Lite package)
LICENSE= other
+CONFLICTS= vim-[0-9]*
+
.include "${MASTERDIR}/Makefile"
More information about the Midnightbsd-cvs
mailing list