From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jul 22 14:00:42 2005 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 4C91116A444 for ; Fri, 22 Jul 2005 14:00:42 +0000 (GMT) (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 16B8D43D48 for ; Fri, 22 Jul 2005 14:00:38 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j6ME0bZu053531 for ; Fri, 22 Jul 2005 14:00:37 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j6ME0bSb053529; Fri, 22 Jul 2005 14:00:37 GMT (envelope-from gnats) Resent-Date: Fri, 22 Jul 2005 14:00:37 GMT Resent-Message-Id: <200507221400.j6ME0bSb053529@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, Andrej Zverev Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 98DED16A439 for ; Fri, 22 Jul 2005 13:51:29 +0000 (GMT) (envelope-from az@inec.ru) Received: from waterwall.inec.ru (waterwall.inec.ru [213.148.3.225]) by mx1.FreeBSD.org (Postfix) with ESMTP id 210B243D81 for ; Fri, 22 Jul 2005 13:51:03 +0000 (GMT) (envelope-from az@inec.ru) Received: from waterwall.inec.ru (root@localhost) by waterwall.inec.ru (8.13.1/8.12.6) with SMTP id j6MDq2n9080762 for ; Fri, 22 Jul 2005 17:52:02 +0400 (MSD) Received: from az.inec.ru (msproxyoutif.intermediate.org [10.0.0.2]) by waterwall.inec.ru (8.13.1/8.12.6) with ESMTP id j6MDq2NG080757 for ; Fri, 22 Jul 2005 17:52:02 +0400 (MSD) Received: from az by az.inec.ru with local (Exim 4.51 (FreeBSD)) id 1Dvxvl-000CLi-UF for FreeBSD-gnats-submit@freebsd.org; Fri, 22 Jul 2005 17:51:13 +0400 Message-Id: Date: Fri, 22 Jul 2005 17:51:13 +0400 From: Andrej Zverev To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/83910: [update] editors/mp to 3.3.14 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Andrej Zverev List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Jul 2005 14:00:42 -0000 >Number: 83910 >Category: ports >Synopsis: [update] editors/mp to 3.3.14 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Jul 22 14:00:37 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Andrej Zverev >Release: FreeBSD 5.4-RELEASE-p1 i386 >Organization: >Environment: System: FreeBSD az.inec.ru 5.4-RELEASE-p1 FreeBSD 5.4-RELEASE-p1 #1: Mon May 23 20:34:48 MSD 2005 az@az.inec.ru:/usr/obj/usr/src/sys/GENERIC i386 >Description: Update this great editor :) I don't sure what i did all right and markp@ will approve this. i send him email, but no responce till. >How-To-Repeat: >Fix: --- mp.diff begins here --- diff -Nru mp.orig/Makefile mp/Makefile --- mp.orig/Makefile Wed Feb 4 08:20:01 2004 +++ mp/Makefile Thu Jul 21 19:48:18 2005 @@ -6,28 +6,68 @@ # PORTNAME= mp -PORTVERSION= 3.2.9 -PORTREVISION= 1 +PORTVERSION= 3.3.14 CATEGORIES= editors -MASTER_SITES= http://triptico.dhis.org/download/ +MASTER_SITES= http://www.triptico.com/download/ MAINTAINER= markp@FreeBSD.org COMMENT= A programming text editor -USE_GMAKE= yes +HAS_CONFIGURE= yes +CONFIGURE_SCRIPT= config.sh +CONFIGURE_ARGS= --prefix=${PREFIX} --without-win32 USE_REINPLACE= yes -MAKE_ARGS+= PREFIX="${PREFIX}" -MAKEFILE= makefile -post-patch: - ${REINPLACE_CMD} "s/gcc -g -Wall/${CC} ${CFLAGS} -Wall/g; \ - s/mp gmp/mp/g" ${WRKSRC}/makefile +OPTIONS= CURSES "Build with ncurses support" on \ + NLS "Native language support" on \ + GTK1 "Build with GTK1 support" off \ + GTK2 "Build with GTK2 support" off \ + PCRE "Build with PCRE support" on -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/mp ${PREFIX}/bin -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README.html ${DOCSDIR} +MAN1= mp.1 + +.include + +.if defined(WITH_CURSES) +.if ${OSVERSION} < 400010 +LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses +.endif +.else +CONFIGURE_ARGS+= --without-curses +.endif + +.if defined(WITH_GTK1) || defined(WITH_GTK2) +.include "${PORTSDIR}/Mk/bsd.gnome.mk" +.if defined(WITH_GTK1) && !defined(WITH_GTK2) +USE_GNOME+= gtk12 +.else +CONFIGURE_ARGS+= --without-gtk1 +.endif + +.if defined(WITH_GTK2) +USE_GNOME+= gtk20 +.else +CONFIGURE_ARGS+= --without-gtk2 .endif +.else +CONFIGURE_ARGS+= --without-gtk +.endif + +.if !defined(WITHOUT_NLS) +USE_GETTEXT= yes +PLIST_SUB+= NLS="" +.else +CONFIGURE_ARGS+= --without-gettext +PLIST_SUB+= NLS="@comment " +.endif + +.if defined(WITH_PCRE) +LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre +.else +CONFIGURE_ARGS+= --without-pcre +.endif + +pre-configure: + @${REINPLACE_CMD} -e 's|share/man|man|g' ${WRKSRC}/makefile.in -.include +.include diff -Nru mp.orig/distinfo mp/distinfo --- mp.orig/distinfo Wed Mar 31 07:07:37 2004 +++ mp/distinfo Thu Jul 21 16:25:47 2005 @@ -1,2 +1,2 @@ -MD5 (mp-3.2.9.tar.gz) = 49a0a487d10f2fd37c310e1835a7c85f -SIZE (mp-3.2.9.tar.gz) = 178045 +MD5 (mp-3.3.14.tar.gz) = becf40187c279343bf3619cac247cdb2 +SIZE (mp-3.3.14.tar.gz) = 271339 diff -Nru mp.orig/files/patch-config.sh mp/files/patch-config.sh --- mp.orig/files/patch-config.sh Thu Jan 1 03:00:00 1970 +++ mp/files/patch-config.sh Thu Jul 21 18:19:41 2005 @@ -0,0 +1,21 @@ +--- config.sh.orig Wed Feb 23 21:23:18 2005 ++++ config.sh Thu Jul 21 18:18:59 2005 +@@ -320,14 +320,16 @@ + echo "#define CONFOPT_GETTEXT 1" >> config.h + else + # try now with -lintl +- TMP_LDFLAGS="-lintl" ++ TMP_LDFLAGS="-L/usr/local/lib -lintl" ++ TMP_CFLAGS="-I/usr/local/include" + +- $CC .tmp.c $TMP_LDFLAGS -o .tmp.o 2>> .config.log ++ $CC $TMP_CFLAGS .tmp.c $TMP_LDFLAGS -o .tmp.o 2>> .config.log + + if [ $? = 0 ] ; then + echo "OK (libintl needed)" + echo "#define CONFOPT_GETTEXT 1" >> config.h + echo "$TMP_LDFLAGS" >> config.ldflags ++ echo "$TMP_CFLAGS" >> config.cflags + else + echo "No" + WITHOUT_GETTEXT=1 diff -Nru mp.orig/pkg-plist mp/pkg-plist --- mp.orig/pkg-plist Sun Feb 9 14:28:50 2003 +++ mp/pkg-plist Thu Jul 21 13:39:03 2005 @@ -1,3 +1,21 @@ bin/mp -%%PORTDOCS%%share/doc/mp/README.html -%%PORTDOCS%%@dirrm share/doc/mp +%%DOCSDIR%%/AUTHORS +%%DOCSDIR%%/COPYING +%%DOCSDIR%%/Changelog +%%DOCSDIR%%/README +%%DOCSDIR%%/README.IRIX +%%DOCSDIR%%/README.mingw32 +%%DOCSDIR%%/README.solaris +%%DOCSDIR%%/README.zaurus +%%DOCSDIR%%/RELEASE_NOTES +%%DOCSDIR%%/mprc-win32.sample +%%DOCSDIR%%/mprc.sample +%%NLS%%share/locale/de/LC_MESSAGES/minimum-profit.mo +%%NLS%%share/locale/es/LC_MESSAGES/minimum-profit.mo +%%NLS%%share/locale/it/LC_MESSAGES/minimum-profit.mo +%%NLS%%share/locale/nl/LC_MESSAGES/minimum-profit.mo +%%NLS%%@unexec rmdir %D/share/locale/nl/LC_MESSAGES 2>/dev/null || true +%%NLS%%@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true +%%NLS%%@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true +%%NLS%%@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true +@dirrm %%DOCSDIR%% --- mp.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: