update to 0.99-18 for new libslang.

This commit is contained in:
sthen 2009-10-13 21:46:46 +00:00
parent 691b3ef0e0
commit c3872eb323
7 changed files with 64 additions and 67 deletions

View File

@ -1,29 +1,29 @@
# $OpenBSD: Makefile,v 1.30 2009/08/10 06:31:08 kili Exp $
# $OpenBSD: Makefile,v 1.31 2009/10/13 21:46:46 sthen Exp $
COMMENT= text editor
DISTNAME= jed-0.99-16
PKGNAME= jed-0.99.16p0
DISTNAME= jed-0.99-18
PKGNAME= ${DISTNAME:S/0.99-/0.99./}
CATEGORIES= editors
MASTER_SITES= ftp://space.mit.edu/pub/davis/jed/v0.99/ \
ftp://ftp.ntua.gr/pub/lang/slang/jed/v0.99/ \
ftp://ftp.uni-stuttgart.de/pub/unix/misc/slang/jed/v0.99/
ftp://ftp.fu-berlin.de/pub/unix/editors/jed/v0.99/
HOMEPAGE= http://space.mit.edu/~davis/jed/
HOMEPAGE= http://www.jedsoft.org/jed/
LIB_DEPENDS= slang.>=14::devel/libslang
LIB_DEPENDS= slang.>=15::devel/libslang
# GPL
# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c m termcap util
FAKE= lib
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --with-slang=${LOCALBASE}
CONFIGURE_ENV+= JED_ROOT="${PREFIX}/lib/jed"
CONFIGURE_ENV+= DEPBASE=${DEPBASE}
#CONFIGURE_ENV+= DEPBASE=${DEPBASE}
FLAVORS= no_x11
FLAVOR?=
@ -33,7 +33,7 @@ ALL_TARGET= all getmail
.else
USE_X11= Yes
ALL_TARGET= all getmail xjed
WANTLIB+= X11 Xext Xft Xrender freetype pthread-stubs xcb
WANTLIB+= X11 Xext Xft Xrender freetype
.endif
NO_REGRESS= Yes

View File

@ -1,5 +1,5 @@
MD5 (jed-0.99-16.tar.gz) = 5Q6V2NYmRFy3ePre46KkfQ==
RMD160 (jed-0.99-16.tar.gz) = ZkplhCpRKFwSdMOGoqRZmgJAEjY=
SHA1 (jed-0.99-16.tar.gz) = VUdUroasffO8SwwP0pddT6eYhmc=
SHA256 (jed-0.99-16.tar.gz) = vCO5cktVd7uvdrJ5azkxIj2RbBv7PsTqjcfMZfZ/OYI=
SIZE (jed-0.99-16.tar.gz) = 845360
MD5 (jed-0.99-18.tar.gz) = LTcQRgSMx70Whu5wwArUlQ==
RMD160 (jed-0.99-18.tar.gz) = 2FMEJL9C7kHz37g85BUe6h39dE8=
SHA1 (jed-0.99-18.tar.gz) = l0e7y8+nUmBprwo921C52TAUDFs=
SHA256 (jed-0.99-18.tar.gz) = 2qzG9coJRHFgLchlD3bRAAMJiFTxaUn+37oAOqP1PDs=
SIZE (jed-0.99-18.tar.gz) = 971456

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-configure,v 1.1 2005/04/19 09:41:42 espie Exp $
--- configure.orig Tue Apr 19 11:06:54 2005
+++ configure Tue Apr 19 11:07:22 2005
@@ -2632,6 +2632,7 @@ test "x$exec" = "xNONE" && exec="$ac_def
test "x$exec_prefix" = "xNONE" && exec_prefix="$prefix"
JD_Search_Dirs="$JD_Search_Dirs \
$includedir,$libdir \
+ $DEPBASE/include,$DEPBASE/lib \
/usr/local/include,/usr/local/lib \
/usr/include,/usr/lib \
/usr/include/slang,/usr/lib \

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-lib_jed_rc,v 1.3 2005/04/19 09:41:42 espie Exp $
--- lib/jed.rc.orig Sun Oct 20 08:55:30 2002
+++ lib/jed.rc Tue Apr 19 11:04:41 2005
@@ -152,7 +152,7 @@ CASE_SEARCH = 0; % zero turns off cas
$OpenBSD: patch-lib_jed_rc,v 1.4 2009/10/13 21:46:46 sthen Exp $
--- lib/jed.rc.orig Mon Feb 13 18:51:58 2006
+++ lib/jed.rc Sat Oct 10 18:08:25 2009
@@ -149,7 +149,7 @@ WRAP_INDENTS = 0; % Non zero indents next line after w
%---------------------------------------------------------------------------
% C-mode indentation style
%---------------------------------------------------------------------------
@ -10,7 +10,7 @@ $OpenBSD: patch-lib_jed_rc,v 1.3 2005/04/19 09:41:42 espie Exp $
#ifdef IBMPC_SYSTEM
% If non-zero, treat file names as case sensitive
@@ -240,4 +240,21 @@ define dired_hook ()
@@ -237,4 +237,21 @@ define dired_hook ()
{
%local_unsetkey ("^K");
%local_setkey ("dired_kill_line", "^K");

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_Makefile.in,v 1.5 2004/01/11 06:20:30 brad Exp $
--- src/Makefile.in.orig 2002-10-20 02:55:30.000000000 -0400
+++ src/Makefile.in 2004-01-11 00:10:34.000000000 -0500
@@ -59,7 +59,7 @@ OBJDIR = @OBJDIR@
$OpenBSD: patch-src_Makefile_in,v 1.1 2009/10/13 21:46:46 sthen Exp $
--- src/Makefile.in.orig Thu Feb 16 04:09:50 2006
+++ src/Makefile.in Sat Oct 10 18:16:26 2009
@@ -60,7 +60,7 @@ OBJDIR = @OBJDIR@
# 2. XFree86 XRENDERFONT (Anti-aliased font) support for XJED
# Also modify "XJED_HAS_XRENDERFONT" in jed-feat.h
@ -10,42 +10,30 @@ $OpenBSD: patch-src_Makefile.in,v 1.5 2004/01/11 06:20:30 brad Exp $
#---------------------------------------------------------------------------
# S-Lang library location
@@ -158,7 +158,7 @@ $(OBJDIR)/xjed : $(OBJS) $(OBJDIR)/xterm
rgrep: $(OBJDIR)/rgrep
@echo rgrep created in $(OBJDIR)
$(OBJDIR)/rgrep: $(OBJDIR)/vfile.o $(OBJDIR)/rgrep.o
- cd $(OBJDIR); $(CC) vfile.o rgrep.o -o rgrep $(LDFLAGS) $(SLANG_LIB) -lslang
+ cd $(OBJDIR); $(CC) vfile.o rgrep.o -o rgrep $(LDFLAGS) $(TERMCAP_LIB) $(OTHERLIBS) $(SLANG_LIB) -lslang
#
getmail: $(OBJDIR)/getmail
@echo getmail created in $(OBJDIR)
@@ -175,14 +175,14 @@ distclean: clean
/bin/rm -rf $(OBJDIR) Makefile sysconf.h
install_directories:
+ $(MKINSDIR) $(DESTDIR)$(prefix)/info
+ $(MKINSDIR) $(DESTDIR)$(prefix)/share/doc/jed
+ $(MKINSDIR) $(DESTDIR)$(prefix)/share/doc/jed/txt
+ $(MKINSDIR) $(DESTDIR)$(prefix)/share/doc/jed/manual
$(MKINSDIR) $(DEST_BIN_DIR)
@@ -187,11 +187,10 @@ install_directories:
$(MKINSDIR) $(DEST_MAN_DIR)
$(MKINSDIR) $(DEST_JED_ROOT)
$(MKINSDIR) $(DEST_JED_ROOT)/bin
- $(MKINSDIR) $(DEST_JED_ROOT)/info
- $(MKINSDIR) $(DEST_JED_ROOT)/doc
- $(MKINSDIR) $(DEST_JED_ROOT)/doc/txt
- $(MKINSDIR) $(DEST_JED_ROOT)/doc/hlp
- $(MKINSDIR) $(DEST_JED_ROOT)/doc/manual
+ $(MKINSDIR) $(DESTDIR)${prefix}/share/doc/jed
+ $(MKINSDIR) $(DESTDIR)${prefix}/share/doc/jed/txt
+ $(MKINSDIR) $(DESTDIR)${prefix}/share/doc/jed/hlp
+ $(MKINSDIR) $(DESTDIR)${prefix}/share/doc/jed/manual
$(MKINSDIR) $(DEST_JED_ROOT)/lib
$(MKINSDIR) $(DEST_JED_ROOT)/lib/colors
$(MKINSDIR) $(DEST_JED_ROOT)/lib/colors/Xjed
@@ -225,23 +225,23 @@ install: all install_directories
@@ -232,28 +231,28 @@ install: all install_directories
done
@for i in $(JED_DOC_FILES); \
do \
- $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/doc/; \
- echo $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/doc/; \
+ $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/share/doc/jed/; \
+ echo $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/share/doc/jed/; \
+ $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/share/doc/jed; \
+ echo $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/share/doc/jed; \
done
@for i in $(JED_DOC_TXT_FILES); \
do \
@ -53,6 +41,13 @@ $OpenBSD: patch-src_Makefile.in,v 1.5 2004/01/11 06:20:30 brad Exp $
- echo $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/doc/txt; \
+ $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/share/doc/jed/txt; \
+ echo $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/share/doc/jed/txt; \
done
@for i in $(JED_DOC_HLP_FILES); \
do \
- $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/doc/hlp; \
- echo $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/doc/hlp; \
+ $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/share/doc/jed/hlp; \
+ echo $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/share/doc/jed/hlp; \
done
@for i in $(JED_DOC_MAN_FILES); \
do \
@ -68,5 +63,5 @@ $OpenBSD: patch-src_Makefile.in,v 1.5 2004/01/11 06:20:30 brad Exp $
+ $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/info/; \
+ echo $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/info/; \
done
# The symlinks target is for my own private use. It simply creates the object
#
runtests: $(OBJDIR)/jed

View File

@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.no-no_x11,v 1.1 2000/09/06 07:14:15 brad Exp $
bin/xjed
@comment $OpenBSD: PFRAG.no-no_x11,v 1.2 2009/10/13 21:46:46 sthen Exp $
@bin bin/xjed

View File

@ -1,13 +1,12 @@
@comment $OpenBSD: PLIST,v 1.13 2004/09/15 18:01:06 espie Exp $
bin/jed
@comment $OpenBSD: PLIST,v 1.14 2009/10/13 21:46:46 sthen Exp $
@bin bin/jed
bin/jed-script
bin/rgrep
@comment info/dir.info
@comment info/info.info
@info info/jed.info
lib/jed/
lib/jed/bin/
lib/jed/bin/getmail
@bin lib/jed/bin/getmail
lib/jed/lib/
lib/jed/lib/abbrev.sl
lib/jed/lib/abbrmisc.sl
@ -30,11 +29,15 @@ lib/jed/lib/cmode.sl
lib/jed/lib/colors/
lib/jed/lib/colors/README
lib/jed/lib/colors/Xjed/
lib/jed/lib/colors/Xjed/black4.sl
lib/jed/lib/colors/Xjed/elegant.sl
lib/jed/lib/colors/Xjed/modern.sl
lib/jed/lib/colors/Xjed/night.sl
lib/jed/lib/colors/Xjed/pastel0.sl
lib/jed/lib/colors/black1.sl
lib/jed/lib/colors/black2.sl
lib/jed/lib/colors/black3.sl
lib/jed/lib/colors/black4.sl
lib/jed/lib/colors/blue1.sl
lib/jed/lib/colors/blue2.sl
lib/jed/lib/colors/blue3.sl
@ -46,7 +49,9 @@ lib/jed/lib/compile.sl
lib/jed/lib/compress.sl
lib/jed/lib/cpright.hlp
lib/jed/lib/ctags.sl
lib/jed/lib/cua.hlp
lib/jed/lib/cua.sl
lib/jed/lib/cuamisc.sl
lib/jed/lib/dabbrev.sl
lib/jed/lib/dcl.sl
lib/jed/lib/digraph.sl
@ -67,6 +72,7 @@ lib/jed/lib/filter.sl
lib/jed/lib/folding.sl
lib/jed/lib/fortran.sl
lib/jed/lib/generic.hlp
lib/jed/lib/gpg.sl
lib/jed/lib/help.sl
lib/jed/lib/history.sl
lib/jed/lib/hooks.sl
@ -96,9 +102,12 @@ lib/jed/lib/linux.sl
lib/jed/lib/lisp.sl
lib/jed/lib/ltx-comp.dat
lib/jed/lib/ltx-math.sl
lib/jed/lib/lua.sl
lib/jed/lib/macro.sl
lib/jed/lib/mail.sl
lib/jed/lib/mailalias.sl
lib/jed/lib/mailedit.sl
lib/jed/lib/mailutils.sl
lib/jed/lib/man.sl
lib/jed/lib/maple.sl
lib/jed/lib/matlab.sl
@ -118,6 +127,7 @@ lib/jed/lib/mutekeys.sl
lib/jed/lib/nroff.sl
lib/jed/lib/occur.sl
lib/jed/lib/os.sl
lib/jed/lib/paste.sl
lib/jed/lib/perl.sl
lib/jed/lib/php.sl
lib/jed/lib/pipe.sl
@ -147,6 +157,7 @@ lib/jed/lib/sort.sl
lib/jed/lib/sortmisc.sl
lib/jed/lib/spicemod.sl
lib/jed/lib/srchmisc.sl
lib/jed/lib/syncproc.sl
lib/jed/lib/syntax.sl
lib/jed/lib/tabs.sl
lib/jed/lib/tclmode.sl
@ -154,7 +165,6 @@ lib/jed/lib/tex.sl
lib/jed/lib/texcom.sl
lib/jed/lib/textmode.sl
lib/jed/lib/tiasm.sl
lib/jed/lib/tm/
lib/jed/lib/tmisc.sl
lib/jed/lib/tmmode.sl
lib/jed/lib/tpascal.sl
@ -168,11 +178,15 @@ lib/jed/lib/wmark.sl
lib/jed/lib/wmenu.sl
lib/jed/lib/wordstar.hlp
lib/jed/lib/wordstar.sl
lib/jed/lib/xformreg.sl
lib/jed/lib/yankpop.sl
@man man/man1/jed.1
@man man/man1/rgrep.1
share/doc/jed/
share/doc/jed/README
share/doc/jed/hlp/
share/doc/jed/hlp/jedfuns.hlp
share/doc/jed/hlp/libfuns.hlp
share/doc/jed/manual/
share/doc/jed/manual/jed.tex
share/doc/jed/txt/
@ -187,8 +201,6 @@ share/doc/jed/txt/fold.txt
share/doc/jed/txt/hooks.txt
share/doc/jed/txt/ide-mode.txt
share/doc/jed/txt/jed_faq.txt
share/doc/jed/txt/jedfuns.txt
share/doc/jed/txt/libfuns.txt
share/doc/jed/txt/linux-keys.txt
share/doc/jed/txt/menus.txt
share/doc/jed/txt/mouse.txt
@ -199,6 +211,7 @@ share/doc/jed/txt/rmail.txt
share/doc/jed/txt/script.txt
share/doc/jed/txt/syntax.txt
share/doc/jed/txt/undo.txt
share/doc/jed/txt/utf8.txt
share/doc/jed/txt/wjed.txt
share/doc/jed/txt/wordstar.txt
share/doc/jed/txt/xjed.txt