From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Mar 4 06:50:19 2005 Return-Path: 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 7AD9C16A4CE for ; Fri, 4 Mar 2005 06:50:19 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0A97B43D1D for ; Fri, 4 Mar 2005 06:50:19 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.1/8.13.1) with ESMTP id j246oIiV071913 for ; Fri, 4 Mar 2005 06:50:18 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.1/8.13.1/Submit) id j246oIlC071909; Fri, 4 Mar 2005 06:50:18 GMT (envelope-from gnats) Resent-Date: Fri, 4 Mar 2005 06:50:18 GMT Resent-Message-Id: <200503040650.j246oIlC071909@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, Joerg Pulz Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B346D16A4CF; Fri, 4 Mar 2005 06:43:20 +0000 (GMT) Received: from mailhost.frm2.tum.de (mailhost.frm2.tum.de [129.187.179.12]) by mx1.FreeBSD.org (Postfix) with ESMTP id EB8C243D41; Fri, 4 Mar 2005 06:43:14 +0000 (GMT) (envelope-from Joerg.Pulz@frm2.tum.de) Received: from localhost (mailhost.frm2.tum.de [129.187.179.12]) by mailhost.frm2.tum.de (8.13.1/8.13.1) with ESMTP id j246hDqE005912; Fri, 4 Mar 2005 07:43:13 +0100 (CET) (envelope-from jpulz@frm2.tum.de) Received: from hades.admin.frm2 (hades.admin.frm2 [172.25.1.10]) by mailhost.frm2.tum.de (8.13.1/8.13.1) with ESMTP id j246hD95005908 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Fri, 4 Mar 2005 07:43:13 +0100 (CET) (envelope-from jpulz@frm2.tum.de) Received: from hades.admin.frm2 (localhost [127.0.0.1]) by hades.admin.frm2 (8.13.1/8.13.1) with ESMTP id j246hD1k085132; Fri, 4 Mar 2005 07:43:13 +0100 (CET) (envelope-from jpulz@frm2.tum.de) Received: (from jpulz@localhost) by hades.admin.frm2 (8.13.1/8.13.1/Submit) id j246hCZb085131; Fri, 4 Mar 2005 07:43:12 +0100 (CET) (envelope-from jpulz) Message-Id: <200503040643.j246hCZb085131@hades.admin.frm2> Date: Fri, 4 Mar 2005 07:43:12 +0100 (CET) From: Joerg Pulz To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: Maintainer Subject: ports/78395: [UPDATE] unbreak magicpoint and update to 1.11b X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Joerg Pulz List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Mar 2005 06:50:19 -0000 >Number: 78395 >Category: ports >Synopsis: [UPDATE] unbreak magicpoint and update to 1.11b >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Mar 04 06:50:18 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Joerg Pulz >Release: FreeBSD 5.3-RELEASE-p5 i386 >Organization: ZWE FRM-II / TU-Munich >Environment: System: FreeBSD hades.admin.frm2 5.3-RELEASE-p5 FreeBSD 5.3-RELEASE-p5 #2: Mon Jan 17 08:13:26 CET 2005 root@hades.admin.frm2:/usr/obj/usr/src/sys/HADES i386 >Description: - update to magicpoint-1.11b (this fixes the button flickering) - update pkg-plist to unbreak this port - point MASTER_SITES to the new official magicpoint site - introduce OPTIONS that one can enable or disable some features (see the attached diff for details) - OPTIONS defaults are set to match previous versions of this port - move intelligence from the japanese subport into the master port (only for simplification) - this obsoletes PR ports/78300 (thanks to the originator for pointing out the new 1.11b version) >How-To-Repeat: apply the attached patches to misc/magicpoint and japanese/magicpoint >Fix: --- misc_magicpoint.diff begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/misc/magicpoint/Makefile,v retrieving revision 1.37 diff -u -r1.37 Makefile --- Makefile 28 Feb 2005 01:05:28 -0000 1.37 +++ Makefile 4 Mar 2005 06:21:15 -0000 @@ -7,9 +7,9 @@ # "?=" and "+=" are for localized (i.e. Japanese) version PORTNAME= magicpoint -PORTVERSION= 1.11a +PORTVERSION= 1.11b CATEGORIES+= misc -MASTER_SITES= ftp://ftp.mew.org/pub/mgp/ +MASTER_SITES= ftp://sh.wide.ad.jp/WIDE/free-ware/mgp/ MAINTAINER?= mita@FreeBSD.org COMMENT?= An X11-based presentation tool @@ -18,13 +18,14 @@ mng:${PORTSDIR}/graphics/libmng RUN_DEPENDS+= pnmscale:${PORTSDIR}/graphics/netpbm -BROKEN= Incomplete pkg-plist - USE_IMAKE= yes USE_REINPLACE= yes -USE_FREETYPE= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS?=--disable-vflib + +OPTIONS+= FREETYPE "With FreeType support" on \ + XFT "With Xft2 support" on \ + GIF "With gif image support" off \ + IMLIB "With Imlib exclusive image processing" off MAN1= mgp.1 mgp2ps.1 mgpembed.1 mgpnet.1 xwintoppm.1 xmindpath.1 @@ -42,6 +43,43 @@ SAMPLE_SCRIPTS= eqn2eps.sh tex2eps.sh mgp2html.pl mgp2latex.pl .include + +.if defined(WITH_FREETYPE) +USE_FREETYPE= yes +CONFIGURE_ARGS+= --enable-freetype +.else +CONFIGURE_ARGS+= --disable-freetype +.endif + +.if defined(WITH_XFT) +LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft +CONFIGURE_ARGS+= --enable-xft2 +.else +CONFIGURE_ARGS+= --disable-xft2 +.endif + +.if defined(WITH_GIF) +LIB_DEPENDS+= ungif.5:${PORTSDIR}/graphics/libungif +CONFIGURE_ARGS+= --enable-gif +.else +CONFIGURE_ARGS+= --disable-gif +.endif + +.if defined(WITH_IMLIB) +LIB_DEPENDS+= Imlib.5:${PORTSDIR}/graphics/imlib +CONFIGURE_ARGS+= --enable-imlib +.else +CONFIGURE_ARGS+= --disable-imlib +.endif + +.if defined(WITH_JAPANESE) +LIB_DEPENDS+= VFlib2.24:${PORTSDIR}/japanese/vflib +CONFIGURE_ARGS+= --enable-vflib \ + --with-vfontcap=`${LS} -1 ${LOCALBASE}/share/VFlib/*/vfontcap | tail -1` \ + --enable-freetype-charset16 +.else +CONFIGURE_ARGS+= --disable-vflib +.endif post-patch: @${REINPLACE_CMD} -e 's|varargs.h|stdarg.h|' \ Index: distinfo =================================================================== RCS file: /home/ncvs/ports/misc/magicpoint/distinfo,v retrieving revision 1.9 diff -u -r1.9 distinfo --- distinfo 7 Nov 2004 01:29:07 -0000 1.9 +++ distinfo 4 Mar 2005 06:21:15 -0000 @@ -1,2 +1,2 @@ -MD5 (magicpoint-1.11a.tar.gz) = 9e55166a7793de371803b0c20f965971 -SIZE (magicpoint-1.11a.tar.gz) = 871606 +MD5 (magicpoint-1.11b.tar.gz) = 2b627f17443842eb5009304864577a4c +SIZE (magicpoint-1.11b.tar.gz) = 871618 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/misc/magicpoint/pkg-plist,v retrieving revision 1.6 diff -u -r1.6 pkg-plist --- pkg-plist 7 Oct 2001 07:25:51 -0000 1.6 +++ pkg-plist 4 Mar 2005 06:21:15 -0000 @@ -4,6 +4,7 @@ bin/mgpnet bin/xwintoppm bin/xmindpath +lib/X11/doc/html/xmindpath.1.html lib/X11/mgp/default.mgp lib/X11/mgp/mgp1.jpg lib/X11/mgp/mgp2.jpg --- misc_magicpoint.diff ends here --- --- japanese_magicpoint.diff begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/japanese/magicpoint/Makefile,v retrieving revision 1.25 diff -u -r1.25 Makefile --- Makefile 27 Dec 2004 00:20:05 -0000 1.25 +++ Makefile 4 Mar 2005 06:20:58 -0000 @@ -8,14 +8,10 @@ MASTERDIR= ${.CURDIR}/../../misc/magicpoint COMMENT= An X11-based presentation tool, configured with vflib support -LIB_DEPENDS= VFlib2.24:${PORTSDIR}/japanese/vflib - CATEGORIES= japanese MAINTAINER= mita@jp.FreeBSD.org -# dirty, but this is required for version independent-ness -CONFIGURE_ARGS= --with-vfontcap=`${LS} -1 ${LOCALBASE}/share/VFlib/*/vfontcap | tail -1` -CONFIGURE_ARGS+= --enable-freetype-charset16 +WITH_JAPANESE=yes .include "${MASTERDIR}/Makefile" --- japanese_magicpoint.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: