Date: Fri, 28 Jan 2000 09:53:48 -0800 (PST) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/16427: Update port: x11-fm/mfm to 1.3 Message-ID: <20000128175348.D99E614DC0@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 16427 >Category: ports >Synopsis: Update port: x11-fm/mfm to 1.3 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Jan 28 10:00:01 PST 2000 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 3.4-RELEASE i386 >Organization: >Environment: >Description: - Update to version 1.3 New file: patches/patch-ab Remove file: patches/patch-aa >How-To-Repeat: >Fix: diff -urN /usr/ports/x11-fm/mfm/Makefile x11-fm/mfm/Makefile --- /usr/ports/x11-fm/mfm/Makefile Sat Jan 22 11:31:48 2000 +++ x11-fm/mfm/Makefile Sat Jan 29 02:01:24 2000 @@ -1,12 +1,12 @@ # New ports collection makefile for: mfm -# Version required: 1.2 +# Version required: 1.3 # Date created: 12 Jan 2000 # Whom: Michael Vasilenko <acid@stu.cn.ua> # # $FreeBSD: ports/x11-fm/mfm/Makefile,v 1.1 2000/01/22 02:31:48 cpiazza Exp $ # -DISTNAME= mfm-1.2 +DISTNAME= mfm-1.3 CATEGORIES= x11-fm MASTER_SITES= http://www.core-coutainville.org/mfm/archive/SOURCES/ @@ -16,10 +16,14 @@ RUN_DEPENDS= mtools:${PORTSDIR}/emulators/mtools GTK_CONFIG?= ${X11BASE}/bin/gtk12-config + USE_X_PREFIX= yes -USE_GMAKE= yes +GNU_CONFIGURE= yes +CONFIGURE_ENV= GTK_CONFIG=${GTK_CONFIG} +CONFIGURE_ARGS= --disable-gtktest -do-install: - @ ${INSTALL_PROGRAM} ${WRKSRC}/mfm ${PREFIX}/bin +post-patch: + @${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/*.h + @${PERL} -pi -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/*.h .include <bsd.port.mk> diff -urN /usr/ports/x11-fm/mfm/files/md5 x11-fm/mfm/files/md5 --- /usr/ports/x11-fm/mfm/files/md5 Sat Jan 22 11:31:49 2000 +++ x11-fm/mfm/files/md5 Sat Jan 29 01:31:46 2000 @@ -1 +1 @@ -MD5 (mfm-1.2.tar.gz) = 01188f178cd101cb2e8b5c56d7066da5 +MD5 (mfm-1.3.tar.gz) = f736965ab1217d0bc4ac26ea178e4895 diff -urN /usr/ports/x11-fm/mfm/patches/patch-aa x11-fm/mfm/patches/patch-aa --- /usr/ports/x11-fm/mfm/patches/patch-aa Sat Jan 22 11:31:49 2000 +++ x11-fm/mfm/patches/patch-aa Thu Jan 1 09:00:00 1970 @@ -1,38 +0,0 @@ ---- Makefile.orig Fri Nov 12 10:35:38 1999 -+++ Makefile Fri Jan 21 18:25:41 2000 -@@ -6,29 +6,29 @@ - # suggestion for SGI MIPS with MIPSPro Compiler (Thanks to Claudio Fanin): - # CFLAGS = "-O2 -xansi-mips3 -DSYSV -woff 1185 -rpath /usr/local/lib" - --CFLAGS = -Wall -g -+CFLAGS += -Wall - - # Flags for your linker - --LDFLAGS = `gtk-config --cflags` `gtk-config --libs` -+LDFLAGS = `gtk12-config --cflags` `gtk12-config --libs` - - # The directory where make install should put the binaries. - --BINDIR = /usr/local/bin -+BINDIR = /usr/X11R6/bin - - # The location of the system-wide configuration file. This should be fine - # on most systems. - --CONFFILE = /etc/mfm.conf -+CONFFILE = /usr/X11R6/etc/mfm.conf - - # Default path for mtools. This can also be changed in the system-wide - # configuration file you gave above. - --MTOOLSDIR = /usr/bin -+MTOOLSDIR = /usr/local/bin - - # Compiler name - --CC = gcc -+#CC = gcc - - # This sets the mfm version. Do not change ;-) - diff -urN /usr/ports/x11-fm/mfm/patches/patch-ab x11-fm/mfm/patches/patch-ab --- /usr/ports/x11-fm/mfm/patches/patch-ab Thu Jan 1 09:00:00 1970 +++ x11-fm/mfm/patches/patch-ab Sat Jan 29 01:49:56 2000 @@ -0,0 +1,17 @@ +--- mfm.h.orig Wed Jan 5 06:06:00 2000 ++++ mfm.h Sat Jan 29 01:42:50 2000 +@@ -18,12 +18,12 @@ + /* The location of the system-wide configuration file. This should be fine */ + /* on most systems. */ + +-#define CONFFILE "/etc/mfm.conf" ++#define CONFFILE "%%PREFIX%%/etc/mfm.conf" + + /* Default path for mtools. This can also be changed in the system-wide */ + /* configuration file you gave above. */ + +-#define MTOOLSDIR "/usr/bin" ++#define MTOOLSDIR "%%LOCALBASE%%/bin" + + /* Uncomment the following line if you do not want mfm to use pixmaps. */ + /* This might be necessary on some systems with strange libraries */ >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20000128175348.D99E614DC0>