diff --git editors/cooledit/Makefile editors/cooledit/Makefile index a9dd6688256f..65812f35931f 100644 --- editors/cooledit/Makefile +++ editors/cooledit/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= cooledit -DISTVERSION= 3.17.28 -PORTREVISION= 3 +DISTVERSION= 4.0.0 CATEGORIES= editors MASTER_SITES= SUNSITE/apps/editors/X/cooledit @@ -13,22 +12,17 @@ COMMENT= Suite of utilities, including a GUI editor LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -USES= gettext gmake libtool python xorg # gettext is linked to despite .mo files having been deleted +LIB_DEPENDS= libfreetype.so:print/freetype2 + +USES= gettext-runtime gmake libtool pkgconfig python xorg GNU_CONFIGURE= yes USE_XORG= x11 xt USE_LDCONFIG= yes USE_GCC= any INSTALL_TARGET= install-strip -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -lpthread -L${LOCALBASE}/lib +CPPFLAGS+= -I${PREFIX}/include +LDFLAGS+= -lpthread -L${PREFIX}/lib CFLAGS+= -DHAVE_MBRTOWC -OPTIONS_DEFINE= NEXT_LOOK -NEXT_LOOK_DESC= Enable NeXT look -NEXT_LOOK_CONFIGURE_ENABLE= NeXT-look - -post-patch: - @${REINPLACE_CMD} -e 's|po pixmap man|po man|g' ${WRKSRC}/Makefile.in - .include diff --git editors/cooledit/distinfo editors/cooledit/distinfo index da007b5b5049..cb255704f826 100644 --- editors/cooledit/distinfo +++ editors/cooledit/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1527085795 -SHA256 (cooledit-3.17.28.tar.gz) = 4d8b664592737bb1d4b93e509fe185d712318f40fc3c5a36bbc522d87f6b686d -SIZE (cooledit-3.17.28.tar.gz) = 1265017 +TIMESTAMP = 1595154397 +SHA256 (cooledit-4.0.0.tar.gz) = 88822d8436d4d81b5dabb909881a7e28ef3dd16b1302c0b430938cba8bb96c96 +SIZE (cooledit-4.0.0.tar.gz) = 67719237 diff --git editors/cooledit/files/patch-widget_focus.c editors/cooledit/files/patch-widget_focus.c new file mode 100644 index 000000000000..36a3667fc50b --- /dev/null +++ editors/cooledit/files/patch-widget_focus.c @@ -0,0 +1,11 @@ +--- widget/focus.c.orig 2019-12-16 18:08:34 UTC ++++ widget/focus.c +@@ -441,6 +441,8 @@ void CFocusDebug (CWidget *w, int line, char *file) + CWidget *CNextFocus (CWidget * w) + { + int i, j; ++ if (!w) ++ return 0; + i = j = find_next_child_of (w->parentid, w->winid); + for (;;) { + if (!i) { diff --git editors/cooledit/files/patch-widget__widechar.c editors/cooledit/files/patch-widget_widechar.c similarity index 57% rename from editors/cooledit/files/patch-widget__widechar.c rename to editors/cooledit/files/patch-widget_widechar.c index 2d4aa642e314..3fdf68030e69 100644 --- editors/cooledit/files/patch-widget__widechar.c +++ editors/cooledit/files/patch-widget_widechar.c @@ -1,18 +1,18 @@ ---- widget/widechar.c.orig 2017-08-04 19:12:31 UTC +--- widget/widechar.c.orig 2018-06-12 20:48:30 UTC +++ widget/widechar.c -@@ -227,6 +227,7 @@ static inline struct mb_rule apply_mb_ru +@@ -185,6 +185,7 @@ static inline struct mb_rule apply_mb_rules_going_righ 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; + C_wchar_t wc; unsigned char p[16]; int n; -@@ -253,6 +254,7 @@ static inline struct mb_rule apply_mb_ru +@@ -216,6 +217,7 @@ static inline struct mb_rule apply_mb_rules_going_righ + } mb_rule.end = 0; mb_rule.ch = -1; - #endif +#endif + #endif return mb_rule; } - diff --git editors/cooledit/pkg-plist editors/cooledit/pkg-plist index 1b53eea7f4d4..86cee8ae4383 100644 --- editors/cooledit/pkg-plist +++ editors/cooledit/pkg-plist @@ -11,6 +11,114 @@ man/man1/cooledit.1.gz man/man1/coolman.1.gz man/man1/smalledit.1.gz %%DATADIR%%/c_utils.py +%%DATADIR%%/fonts/8x13B-ISO8859-1.pcf.gz +%%DATADIR%%/fonts/8x13B.pcf.gz +%%DATADIR%%/fonts/Makefile.am +%%DATADIR%%/fonts/NotoColorEmoji.ttf +%%DATADIR%%/fonts/NotoEmoji-Regular.ttf +%%DATADIR%%/fonts/NotoKufiArabic-Regular.ttf +%%DATADIR%%/fonts/NotoMono-Regular.ttf +%%DATADIR%%/fonts/NotoNaskhArabicUI-Regular.ttf +%%DATADIR%%/fonts/NotoNastaliqUrdu-Regular.ttf +%%DATADIR%%/fonts/NotoSans-Regular.ttf +%%DATADIR%%/fonts/NotoSansAdlam-Regular.ttf +%%DATADIR%%/fonts/NotoSansAdlamUnjoined-Regular.ttf +%%DATADIR%%/fonts/NotoSansAnatolianHieroglyphs-Regular.ttf +%%DATADIR%%/fonts/NotoSansArmenian-Regular.ttf +%%DATADIR%%/fonts/NotoSansAvestan-Regular.ttf +%%DATADIR%%/fonts/NotoSansBalinese-Regular.ttf +%%DATADIR%%/fonts/NotoSansBamum-Regular.ttf +%%DATADIR%%/fonts/NotoSansBatak-Regular.ttf +%%DATADIR%%/fonts/NotoSansBengaliUI-Regular.ttf +%%DATADIR%%/fonts/NotoSansBrahmi-Regular.ttf +%%DATADIR%%/fonts/NotoSansBuginese-Regular.ttf +%%DATADIR%%/fonts/NotoSansBuhid-Regular.ttf +%%DATADIR%%/fonts/NotoSansCanadianAboriginal-Regular.ttf +%%DATADIR%%/fonts/NotoSansCarian-Regular.ttf +%%DATADIR%%/fonts/NotoSansChakma-Regular.ttf +%%DATADIR%%/fonts/NotoSansCham-Regular.ttf +%%DATADIR%%/fonts/NotoSansCherokee-Regular.ttf +%%DATADIR%%/fonts/NotoSansCoptic-Regular.ttf +%%DATADIR%%/fonts/NotoSansCuneiform-Regular.ttf +%%DATADIR%%/fonts/NotoSansCypriot-Regular.ttf +%%DATADIR%%/fonts/NotoSansDeseret-Regular.ttf +%%DATADIR%%/fonts/NotoSansDevanagariUI-Regular.ttf +%%DATADIR%%/fonts/NotoSansEgyptianHieroglyphs-Regular.ttf +%%DATADIR%%/fonts/NotoSansEthiopic-Regular.ttf +%%DATADIR%%/fonts/NotoSansGeorgian-Regular.ttf +%%DATADIR%%/fonts/NotoSansGlagolitic-Regular.ttf +%%DATADIR%%/fonts/NotoSansGothic-Regular.ttf +%%DATADIR%%/fonts/NotoSansGujaratiUI-Regular.ttf +%%DATADIR%%/fonts/NotoSansGurmukhiUI-Regular.ttf +%%DATADIR%%/fonts/NotoSansHanunoo-Regular.ttf +%%DATADIR%%/fonts/NotoSansHebrew-Regular.ttf +%%DATADIR%%/fonts/NotoSansImperialAramaic-Regular.ttf +%%DATADIR%%/fonts/NotoSansInscriptionalPahlavi-Regular.ttf +%%DATADIR%%/fonts/NotoSansInscriptionalParthian-Regular.ttf +%%DATADIR%%/fonts/NotoSansJavanese-Regular.ttf +%%DATADIR%%/fonts/NotoSansKaithi-Regular.ttf +%%DATADIR%%/fonts/NotoSansKannadaUI-Regular.ttf +%%DATADIR%%/fonts/NotoSansKayahLi-Regular.ttf +%%DATADIR%%/fonts/NotoSansKharoshthi-Regular.ttf +%%DATADIR%%/fonts/NotoSansKhmerUI-Regular.ttf +%%DATADIR%%/fonts/NotoSansLaoUI-Regular.ttf +%%DATADIR%%/fonts/NotoSansLepcha-Regular.ttf +%%DATADIR%%/fonts/NotoSansLimbu-Regular.ttf +%%DATADIR%%/fonts/NotoSansLinearB-Regular.ttf +%%DATADIR%%/fonts/NotoSansLisu-Regular.ttf +%%DATADIR%%/fonts/NotoSansLycian-Regular.ttf +%%DATADIR%%/fonts/NotoSansLydian-Regular.ttf +%%DATADIR%%/fonts/NotoSansMalayalamUI-Regular.ttf +%%DATADIR%%/fonts/NotoSansMandaic-Regular.ttf +%%DATADIR%%/fonts/NotoSansMeeteiMayek-Regular.ttf +%%DATADIR%%/fonts/NotoSansMongolian-Regular.ttf +%%DATADIR%%/fonts/NotoSansMono-Bold.ttf +%%DATADIR%%/fonts/NotoSansMonoCJKjp-Regular.otf +%%DATADIR%%/fonts/NotoSansMonoCJKkr-Regular.otf +%%DATADIR%%/fonts/NotoSansMonoCJKsc-Regular.otf +%%DATADIR%%/fonts/NotoSansMonoCJKtc-Regular.otf +%%DATADIR%%/fonts/NotoSansMyanmarUI-Regular.ttf +%%DATADIR%%/fonts/NotoSansNKo-Regular.ttf +%%DATADIR%%/fonts/NotoSansNewTaiLue-Regular.ttf +%%DATADIR%%/fonts/NotoSansOgham-Regular.ttf +%%DATADIR%%/fonts/NotoSansOlChiki-Regular.ttf +%%DATADIR%%/fonts/NotoSansOldItalic-Regular.ttf +%%DATADIR%%/fonts/NotoSansOldPersian-Regular.ttf +%%DATADIR%%/fonts/NotoSansOldSouthArabian-Regular.ttf +%%DATADIR%%/fonts/NotoSansOldTurkic-Regular.ttf +%%DATADIR%%/fonts/NotoSansOriyaUI-Regular.ttf +%%DATADIR%%/fonts/NotoSansOsage-Regular.ttf +%%DATADIR%%/fonts/NotoSansOsmanya-Regular.ttf +%%DATADIR%%/fonts/NotoSansPhagsPa-Regular.ttf +%%DATADIR%%/fonts/NotoSansPhoenician-Regular.ttf +%%DATADIR%%/fonts/NotoSansRejang-Regular.ttf +%%DATADIR%%/fonts/NotoSansRunic-Regular.ttf +%%DATADIR%%/fonts/NotoSansSamaritan-Regular.ttf +%%DATADIR%%/fonts/NotoSansSaurashtra-Regular.ttf +%%DATADIR%%/fonts/NotoSansShavian-Regular.ttf +%%DATADIR%%/fonts/NotoSansSinhalaUI-Regular.ttf +%%DATADIR%%/fonts/NotoSansSundanese-Regular.ttf +%%DATADIR%%/fonts/NotoSansSylotiNagri-Regular.ttf +%%DATADIR%%/fonts/NotoSansSymbols-Regular.ttf +%%DATADIR%%/fonts/NotoSansSymbols2-Regular.ttf +%%DATADIR%%/fonts/NotoSansSyriacEastern-Regular.ttf +%%DATADIR%%/fonts/NotoSansSyriacEstrangela-Regular.ttf +%%DATADIR%%/fonts/NotoSansSyriacWestern-Regular.ttf +%%DATADIR%%/fonts/NotoSansTagalog-Regular.ttf +%%DATADIR%%/fonts/NotoSansTagbanwa-Regular.ttf +%%DATADIR%%/fonts/NotoSansTaiLe-Regular.ttf +%%DATADIR%%/fonts/NotoSansTaiTham-Regular.ttf +%%DATADIR%%/fonts/NotoSansTaiViet-Regular.ttf +%%DATADIR%%/fonts/NotoSansTamilUI-Regular.ttf +%%DATADIR%%/fonts/NotoSansTeluguUI-Regular.ttf +%%DATADIR%%/fonts/NotoSansThaana-Regular.ttf +%%DATADIR%%/fonts/NotoSansThaiUI-Regular.ttf +%%DATADIR%%/fonts/NotoSansTibetan-Regular.ttf +%%DATADIR%%/fonts/NotoSansTifinagh-Regular.ttf +%%DATADIR%%/fonts/NotoSansUgaritic-Regular.ttf +%%DATADIR%%/fonts/NotoSansVai-Regular.ttf +%%DATADIR%%/fonts/NotoSansYi-Regular.ttf +%%DATADIR%%/fonts/sort.py %%DATADIR%%/global.py %%DATADIR%%/sh_utils.py %%DATADIR%%/syntax/ada95.syntax