diff options
| author | Justin M. Seger <jseger@FreeBSD.org> | 1998-12-12 22:27:21 +0000 |
|---|---|---|
| committer | Justin M. Seger <jseger@FreeBSD.org> | 1998-12-12 22:27:21 +0000 |
| commit | 025541a16d98a164b47642be994c652bf0121248 (patch) | |
| tree | d37107acdc16e266d75e63b7054b2a3b9098f0ff /math | |
| parent | Activate math/spin (diff) | |
Make this build under ELF.
PR: ports/9025
Submitted by: root@cache-t.hrz.uni-bielefeld.de
Notes
Notes:
svn path=/head/; revision=15313
Diffstat (limited to 'math')
| -rw-r--r-- | math/xmgr/Makefile | 10 | ||||
| -rw-r--r-- | math/xmgr/files/patch-aa | 52 |
2 files changed, 54 insertions, 8 deletions
diff --git a/math/xmgr/Makefile b/math/xmgr/Makefile index 726934ad2a4c..a3a47e1ae62f 100644 --- a/math/xmgr/Makefile +++ b/math/xmgr/Makefile @@ -3,7 +3,7 @@ # Date created: So 2 Mär 1997 12:11:43 MET # Whom: Andreas Klemm <andreas@klemm.gtn.com> # -# $Id: Makefile,v 1.11 1998/09/27 20:18:19 steve Exp $ +# $Id: Makefile,v 1.12 1998/10/28 17:04:20 fenner Exp $ # DISTNAME= xmgr-4.1.1 @@ -15,8 +15,6 @@ MASTER_SITES= ftp://ftp.uni-bielefeld.de/pub/systems/FreeBSD/lkoeller/ \ MAINTAINER= Lars.Koeller@Uni-Bielefeld.DE -BROKEN_ELF= build - BUILD_DEPENDS= ${X11BASE}/lib/libhlpclient.a:${PORTSDIR}/x11/libhelp \ ${LOCALBASE}/lib/libmfhdf.a:${PORTSDIR}/graphics/hdf LIB_DEPENDS= Xbae.6:${PORTSDIR}/x11-toolkits/xbae @@ -32,4 +30,10 @@ CONFIGURE_ARGS= -prefix=${X11BASE} \ ALL_TARGET= INSTALL_TARGET= install links +post-patch: + mv ${WRKSRC}/configure ${WRKSRC}/configure.input + sed "s%__MOTIFLIB__%${MOTIFLIB}%" ${WRKSRC}/configure.input > ${WRKSRC}/configure + rm -f ${WRKSRC}/configure.input + chmod 755 ${WRKSRC}/configure + .include <bsd.port.mk> diff --git a/math/xmgr/files/patch-aa b/math/xmgr/files/patch-aa index 8a53f7dbacce..a9ca407c623a 100644 --- a/math/xmgr/files/patch-aa +++ b/math/xmgr/files/patch-aa @@ -1,9 +1,9 @@ -*** ../xmgr-4.1.1/configure Mon Dec 1 02:09:24 1997 ---- ./configure Sun Jan 18 17:31:25 1998 +*** configure.orig Mon Dec 1 02:09:24 1997 +--- configure Mon Dec 7 19:55:33 1998 *************** *** 626,631 **** --- 626,632 ---- - + case "${host}" in i?86-*-linux-*) CONF_FILE="ix86-linux";; + i?86-*-freebsd*) CONF_FILE="freebsd";; @@ -11,6 +11,40 @@ i?86-*-sco-*) CONF_FILE="ix86-sco";; alpha-dec-osf4.*) CONF_FILE="alpha-osf4";; *************** +*** 4489,4495 **** + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" +! LIBS="-lXm $X_PRE_LIBS $X_EXTRA_LIBS $X_LIBS -lXt -lXext -lX11 $LIBS" + cat > conftest.$ac_ext <<EOF + #line 4495 "configure" + #include "confdefs.h" +--- 4490,4496 ---- + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" +! LIBS="__MOTIFLIB__ $X_PRE_LIBS $X_EXTRA_LIBS $X_LIBS -lXt -lXext -lX11 $LIBS" + cat > conftest.$ac_ext <<EOF + #line 4495 "configure" + #include "confdefs.h" +*************** +*** 4524,4530 **** + EOF + + ACEGR=xmgr +! GUI_LIBS="-lXm $X_PRE_LIBS $X_EXTRA_LIBS $X_LIBS -lXt -lXext -lX11" + LIBS="$GUI_LIBS $LIBS" + CFLAGS="$CFLAGS $X_CFLAGS" + echo $ac_n "checking for main in -lXpm""... $ac_c" 1>&6 +--- 4525,4531 ---- + EOF + + ACEGR=xmgr +! GUI_LIBS="__MOTIFLIB__ $X_PRE_LIBS $X_EXTRA_LIBS $X_LIBS -lXt -lXext -lX11" + LIBS="$GUI_LIBS $LIBS" + CFLAGS="$CFLAGS $X_CFLAGS" + echo $ac_n "checking for main in -lXpm""... $ac_c" 1>&6 +*************** *** 4857,4863 **** echo $ac_n "(cached) $ac_c" 1>&6 else @@ -19,7 +53,7 @@ cat > conftest.$ac_ext <<EOF #line 4863 "configure" #include "confdefs.h" ---- 4857,4863 ---- +--- 4858,4864 ---- echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" @@ -35,7 +69,7 @@ ! NETCDF_LIBS="$NETCDF_LIBS -ldf"; cat >> confdefs.h <<\EOF #define HAVE_MFHDF 1 EOF - + --- 4882,4888 ---- fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then @@ -43,3 +77,11 @@ ! NETCDF_LIBS="$NETCDF_LIBS -lmfhdf -ldf -lz"; cat >> confdefs.h <<\EOF #define HAVE_MFHDF 1 EOF + +*************** +*** 5405,5408 **** + chmod +x $CONFIG_STATUS + rm -fr confdefs* $ac_clean_files + test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 +- +--- 5406,5408 ---- |