From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Aug 23 15:50:51 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B346916A4DA for ; Wed, 23 Aug 2006 15:50:51 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id EAD8D43D88 for ; Wed, 23 Aug 2006 15:50:20 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k7NFoK5k033509 for ; Wed, 23 Aug 2006 15:50:20 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k7NFoKAK033505; Wed, 23 Aug 2006 15:50:20 GMT (envelope-from gnats) Resent-Date: Wed, 23 Aug 2006 15:50:20 GMT Resent-Message-Id: <200608231550.k7NFoKAK033505@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Andris Raugulis Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EB9BB16A4DD for ; Wed, 23 Aug 2006 15:42:23 +0000 (UTC) (envelope-from root@null.lv) Received: from itrisinajumi.lv (ns1.itrisinajumi.lv [80.233.128.126]) by mx1.FreeBSD.org (Postfix) with SMTP id 2F84643D70 for ; Wed, 23 Aug 2006 15:42:22 +0000 (GMT) (envelope-from root@null.lv) Received: (qmail 24217 invoked by uid 2013); 23 Aug 2006 15:42:18 -0000 Received: from 192.168.0.90 by resnais.itrisinajumi.lv (envelope-from , uid 2004) with qmail-scanner-1.25 (clamdscan: 0.87.1/1213. Clear:RC:1(192.168.0.90):. Processed in 0.0449 secs); 23 Aug 2006 15:42:18 -0000 Received: from wraith.lan.itrisinajumi.lv (HELO ?HOSTNAME?) (192.168.0.90) by itrisinajumi.lv with SMTP; 23 Aug 2006 15:42:17 -0000 Received: by _HOSTNAME_ (sSMTP sendmail emulation); Wed, 23 Aug 2006 18:42:16 +0300 Message-Id: <20060823154222.2F84643D70@mx1.FreeBSD.org> Date: Wed, 23 Aug 2006 18:42:16 +0300 From: "Charlie &" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Andris Raugulis Subject: ports/102438: [patch] update ports editors/scite & x11-toolkits/scintilla from 1.70 to 1.71 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Andris Raugulis List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Aug 2006 15:50:51 -0000 >Number: 102438 >Category: ports >Synopsis: [patch] update ports editors/scite & x11-toolkits/scintilla from 1.70 to 1.71 >Confidential: yes >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Aug 23 15:50:19 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Andris Raugulis >Release: FreeBSD 6.1-STABLE i386 >Organization: >Environment: System: FreeBSD wraith.itrisinajumi.lv 6.1-STABLE FreeBSD 6.1-STABLE #0: Tue Aug 22 15:29:01 EEST 2006 >Description: Update SciTE & Scintilla from 1.70 to 1.71 >How-To-Repeat: >Fix: --- patch-scite-1.70-to-1.71 begins here --- diff -ruN editors/scite.orig/Makefile editors/scite/Makefile --- editors/scite.orig/Makefile Tue Jun 27 10:57:57 2006 +++ editors/scite/Makefile Wed Aug 23 15:27:41 2006 @@ -6,7 +6,7 @@ # PORTNAME= scite -PORTVERSION= 1.70 +PORTVERSION= 1.71 CATEGORIES= editors gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://www.scintilla.org/ @@ -29,15 +29,12 @@ EXTRA_PATCH_FILES= lua/include/lauxlib.h \ lua/include/lua.h \ lua/src/lobject.h \ - lua/src/lzio.h \ - lua/src/ltm.h \ lua/src/lopcodes.c \ lua/src/lopcodes.h \ lua/src/lstate.c \ lua/src/lstate.h \ lua/src/ldo.h \ lua/src/lmem.h \ - lua/src/lgc.h \ lua/src/lgc.c \ lua/src/lvm.h \ lua/src/lstring.h \ @@ -54,7 +51,7 @@ .if defined(WITH_GTK2) USE_GNOME+= gtk20 -PKGNAMESUFFIX= -gtk2 +PKGNAMESUFFIX+= -gtk2 .else USE_GNOME+= gtk12 MAKE_ARGS= GTK1=yes @@ -63,22 +60,19 @@ MAN1= scite.1 post-patch: - @cd ${WRKSRC} && ${MV} SciTE.desktop SciTE.desktop.pre_tr \ - && ${TR} -d "\r" < SciTE.desktop.pre_tr > SciTE.desktop - @${ECHO_CMD} 'Categories=Application;Development;' >> ${WRKSRC}/SciTE.desktop # deal with dos end-of-line symbols break build with gcc 2.95. .for file in ${EXTRA_PATCH_FILES} @${CP} ${WRKSRC}/../${file} \ ${WRKSRC}/../${file}.orig - @/usr/bin/col < ${WRKSRC}/../${file}.orig \ + col < ${WRKSRC}/../${file}.orig \ > ${WRKSRC}/../${file} .endfor do-install: ${INSTALL_PROGRAM} ${WRKSRC}/../bin/SciTE ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/../doc/scite.1 ${MANPREFIX}/man/man1 - ${INSTALL_DATA} ${WRKSRC}/SciTE.desktop ${PREFIX}/share/gnome/applications - ${INSTALL_DATA} ${WRKSRC}/Sci48M.png ${PREFIX}/share/gnome/pixmaps + ${INSTALL_DATA} ${WRKSRC}/SciTE.desktop ${PREFIX}/share/gnome/applications/ + ${INSTALL_DATA} ${WRKSRC}/Sci48M.png ${PREFIX}/share/gnome/pixmaps/ @${MKDIR} ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/../doc/*.html ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/../doc/*.jpg ${DATADIR} diff -ruN editors/scite.orig/distinfo editors/scite/distinfo --- editors/scite.orig/distinfo Tue Jun 27 10:57:57 2006 +++ editors/scite/distinfo Wed Aug 23 15:05:11 2006 @@ -1,3 +1,3 @@ -MD5 (scite170.tgz) = bf7509820b23438e272d7526e1058bff -SHA256 (scite170.tgz) = 7c786ddc00799e6f4f30a2b475a776fc49563087853f585f986f098e07797bf5 -SIZE (scite170.tgz) = 1298313 +MD5 (scite171.tgz) = b62946c770686909a4d4d0e42de3754c +SHA256 (scite171.tgz) = c84ba2fc252345e3d36d36f14b3ab43c6f20e0e7ee5c30d8560f938d505116e3 +SIZE (scite171.tgz) = 1300416 diff -ruN x11-toolkits/scintilla.orig/Makefile x11-toolkits/scintilla/Makefile --- x11-toolkits/scintilla.orig/Makefile Tue Jun 27 10:57:36 2006 +++ x11-toolkits/scintilla/Makefile Wed Aug 23 15:11:31 2006 @@ -6,7 +6,7 @@ # PORTNAME= scintilla -PORTVERSION= 1.70 +PORTVERSION= 1.71 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://www.scintilla.org/ @@ -23,11 +23,11 @@ USE_GMAKE= yes USE_ICONV= yes MAKEFILE= makefile -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .if defined(WITH_GTK2) USE_GNOME= gtk20 -PKGNAMESUFFIX= -gtk2 +PKGNAMESUFFIX+= -gtk2 .else USE_GNOME= gtk12 MAKE_ARGS+= GTK1=yes diff -ruN x11-toolkits/scintilla.orig/distinfo x11-toolkits/scintilla/distinfo --- x11-toolkits/scintilla.orig/distinfo Tue Jun 27 10:57:36 2006 +++ x11-toolkits/scintilla/distinfo Wed Aug 23 15:10:26 2006 @@ -1,3 +1,3 @@ -MD5 (scite170.tgz) = bf7509820b23438e272d7526e1058bff -SHA256 (scite170.tgz) = 7c786ddc00799e6f4f30a2b475a776fc49563087853f585f986f098e07797bf5 -SIZE (scite170.tgz) = 1298313 +MD5 (scite171.tgz) = b62946c770686909a4d4d0e42de3754c +SHA256 (scite171.tgz) = c84ba2fc252345e3d36d36f14b3ab43c6f20e0e7ee5c30d8560f938d505116e3 +SIZE (scite171.tgz) = 1300416 --- patch-scite-1.70-to-1.71 ends here --- >Release-Note: >Audit-Trail: >Unformatted: