Date: Wed, 15 Dec 2004 23:00:13 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/75110: Update port: editors/cooledit to 3.17.14 Message-ID: <20041215230013.1a52dc4f.tkato432@yahoo.com> Resent-Message-ID: <200412151410.iBFEAM1Z021647@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 75110
>Category: ports
>Synopsis: Update port: editors/cooledit to 3.17.14
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Dec 15 14:10:21 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.10-RELEASE-p5 i386
>Organization:
>Environment:
>Description:
- Update to version 3.17.14
New file:
files/patch-widget::widechar.c
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/editors/cooledit/Makefile editors/cooledit/Makefile
--- /usr/ports/editors/cooledit/Makefile Sun Aug 1 13:03:01 2004
+++ editors/cooledit/Makefile Wed Dec 15 01:57:30 2004
@@ -6,7 +6,7 @@
#
PORTNAME= cooledit
-PORTVERSION= 3.17.8
+PORTVERSION= 3.17.14
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= apps/editors/X/cooledit
@@ -22,25 +22,21 @@
USE_LIBTOOL_VER= 15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOHEADER="${TRUE}" \
- AUTOMAKE="${TRUE}"
INSTALLS_SHLIB= yes
MAN1= cooledit.1 coolman.1 smalledit.1
-CPPFLAGS= -I${LOCALBASE}/include -DHAVE_GETTEXT ${PTHREAD_CFLAGS}
+CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500000
+CFLAGS+= -DHAVE_MBRTOWC
+.endif
+
.if defined(WITH_NEXT_LOOK)
CONFIGURE_ARGS+= --enable-NeXT-look
.endif
-post-patch:
- @${REINPLACE_CMD} -e 's|^PACKAGE_FORCE|#PACKAGE_FORGE|g ; \
- s|USE_INCLUDED_LIBINTL=yes|USE_INCLUDED_LIBINTL=no|g ; \
- s|\\$${top_builddir}/intl/libintl.a|-lintl|g' ${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's|#undef HAVE_WCHAR_H||g ; \
- s|#undef HAVE_DCGETTEXT||g' ${WRKSRC}/config.h.in
- @${REINPLACE_CMD} -e 's|m4 intl rxvt|m4 rxvt|g' ${WRKSRC}/Makefile.in
-
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -urN /usr/ports/editors/cooledit/distinfo editors/cooledit/distinfo
--- /usr/ports/editors/cooledit/distinfo Sun Aug 1 13:03:01 2004
+++ editors/cooledit/distinfo Wed Dec 15 00:51:56 2004
@@ -1,2 +1,2 @@
-MD5 (cooledit-3.17.8.tar.gz) = 7b55c892f5b90b9f4eedda6b68f2e15b
-SIZE (cooledit-3.17.8.tar.gz) = 1655037
+MD5 (cooledit-3.17.14.tar.gz) = c5bfa0efbd6160b5ba868b722418cc02
+SIZE (cooledit-3.17.14.tar.gz) = 1671619
diff -urN /usr/ports/editors/cooledit/files/patch-widget::widechar.c editors/cooledit/files/patch-widget::widechar.c
--- /usr/ports/editors/cooledit/files/patch-widget::widechar.c Thu Jan 1 09:00:00 1970
+++ editors/cooledit/files/patch-widget::widechar.c Wed Dec 15 01:18:43 2004
@@ -0,0 +1,18 @@
+--- widget/widechar.c.orig Sat Nov 27 17:46:03 2004
++++ widget/widechar.c Wed Dec 15 01:17:59 2004
+@@ -227,6 +227,7 @@
+ static inline struct mb_rule apply_mb_rules_going_right (WEdit * edit, long byte_index, struct mb_rule mb_rule)
+ {
+ #ifdef HAVE_WCHAR_H
++#ifdef HAVE_MBRTOWC
+ wchar_t wc;
+ unsigned char p[16];
+ int n;
+@@ -252,6 +253,7 @@
+ }
+ mb_rule.end = 0;
+ mb_rule.ch = -1;
++#endif
+ #endif
+ return mb_rule;
+ }
diff -urN /usr/ports/editors/cooledit/pkg-plist editors/cooledit/pkg-plist
--- /usr/ports/editors/cooledit/pkg-plist Fri Nov 26 19:51:58 2004
+++ editors/cooledit/pkg-plist Wed Dec 15 01:53:16 2004
@@ -21,6 +21,7 @@
%%DATADIR%%/syntax/java.syntax
%%DATADIR%%/syntax/latex.syntax
%%DATADIR%%/syntax/lsm.syntax
+%%DATADIR%%/syntax/lsm4.syntax
%%DATADIR%%/syntax/lua.syntax
%%DATADIR%%/syntax/mail.syntax
%%DATADIR%%/syntax/makefile.syntax
@@ -33,6 +34,7 @@
%%DATADIR%%/syntax/php.syntax
%%DATADIR%%/syntax/prolog.syntax
%%DATADIR%%/syntax/python.syntax
+%%DATADIR%%/syntax/scm.syntax
%%DATADIR%%/syntax/sh.syntax
%%DATADIR%%/syntax/smalltalk.syntax
%%DATADIR%%/syntax/sql.syntax
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20041215230013.1a52dc4f.tkato432>