From 7c2836f05f8a0be3ae53462820ea1f3370e428f7 Mon Sep 17 00:00:00 2001 From: Roman Bogorodskiy Date: Wed, 31 Aug 2005 19:35:05 +0000 Subject: Fix build on -CURRENT. PR: 85530 Submitted by: Ports Fury Reported by: pointyhat via kris --- deskutils/genius/Makefile | 1 + deskutils/genius/files/patch-src::Makefile.in | 24 +++--------------------- 2 files changed, 4 insertions(+), 21 deletions(-) (limited to 'deskutils') diff --git a/deskutils/genius/Makefile b/deskutils/genius/Makefile index dd6815e725f0..b13cb93ce579 100644 --- a/deskutils/genius/Makefile +++ b/deskutils/genius/Makefile @@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} MAINTAINER= ports@FreeBSD.org COMMENT= Arbitrary precision calculator for Gnome Desktop Environment +BUILD_DPENDS= ${LOCALBASE}/include/mpfr.h:${PORTSDIR}/math/mpfr LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4 USE_X_PREFIX= yes diff --git a/deskutils/genius/files/patch-src::Makefile.in b/deskutils/genius/files/patch-src::Makefile.in index cf943a3e0dfb..fe65786928b1 100644 --- a/deskutils/genius/files/patch-src::Makefile.in +++ b/deskutils/genius/files/patch-src::Makefile.in @@ -1,24 +1,6 @@ ---- src/Makefile.in.orig Fri Dec 24 04:47:06 2004 -+++ src/Makefile.in Sat Dec 25 00:18:14 2004 -@@ -168,7 +168,7 @@ - YFLAGS = -d -t - @INTERNAL_MPFR_TRUE@MPFR_INCLUDEDIR = -I$(top_srcdir)/mpfr -I$(top_builddir)/mpfr - @INTERNAL_MPFR_FALSE@MPFR_INCLUDEDIR = --@INTERNAL_MPFR_TRUE@MPFR_LIBDIR = -L$(top_srcdir)/mpfr -L$(top_builddir)/mpfr -+@INTERNAL_MPFR_TRUE@MPFR_LIBDIR = $(top_builddir)/mpfr/libmpfr.a - @INTERNAL_MPFR_FALSE@MPFR_LIBDIR = - - INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" -DG_LOG_DOMAIN=\"Genius\" -DDATADIR=\""$(datadir)"\" -DLIBEXECDIR=\""$(libexecdir)"\" -DICONDIR=\""$(datadir)/pixmaps/genius"\" -DLIBRARY_DIR=\""$(datadir)/genius/"\" -I$(srcdir) -I$(includedir) -I$(top_srcdir) -I$(top_srcdir)/vicious-extensions -I$(top_srcdir)/gtkextra -I$(top_builddir) -I$(top_builddir)/vicious-extensions -I$(top_builddir)/gtkextra $(MPFR_INCLUDEDIR) $(GMP_INCLUDEDIR) $(GENIUS_CFLAGS) $(EXTRA_WARNING_CFLAGS) -@@ -183,7 +183,7 @@ - gnome_genius_SOURCES = genius-i18n.h calc.c calc.h eval.c eval.h gnome-genius.c gnome-genius.h util.c util.h dict.c dict.h funclib.c funclib.h mpwrap.c mpwrap.h mpzextra.c mpzextra.h matrix.c matrix.h matrixw.c matrixw.h matop.c matop.h compil.c compil.h structs.h lexer.l lexer.h parseutil.h parseutil.c inter.c inter.h plugin.c plugin.h plugread.c plugread.h plug_api.h parse.h parse.y genius_lists.c utype.c utype.h extra.h geloutput.c geloutput.h graphing.h graphing.c - - --gnome_genius_LDADD = -L$(top_builddir)/vicious-extensions -lviciousui -L$(top_builddir)/gtkextra -lgtkextra-genius -lm @GMP_LIB@ $(MPFR_LIBDIR) -lmpfr @LEXLIB@ $(GENIUS_LIBS) @READLINE_LIB@ @TERMCAP_LIB@ -+gnome_genius_LDADD = -L$(top_builddir)/vicious-extensions -lviciousui -L$(top_builddir)/gtkextra -lgtkextra-genius -lm @GMP_LIB@ $(MPFR_LIBDIR) @LEXLIB@ $(GENIUS_LIBS) @READLINE_LIB@ @TERMCAP_LIB@ - - - genius_readline_helper_fifo_SOURCES = genius_lists.c genius-readline-helper.c -@@ -230,7 +230,7 @@ +--- src/Makefile.in.orig Sat Jul 23 02:12:33 2005 ++++ src/Makefile.in Wed Aug 31 19:57:16 2005 +@@ -232,7 +232,7 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I.. LIBS = @LIBS@ -- cgit v1.2.3