diff options
| author | krion <krion@FreeBSD.org> | 2004-03-14 03:34:11 +0800 |
|---|---|---|
| committer | krion <krion@FreeBSD.org> | 2004-03-14 03:34:11 +0800 |
| commit | 68e88f91427129799bd4227840082553edbdb5f9 (patch) | |
| tree | 0377e5ddf68258c532e73e9713063970238192f1 | |
| parent | 79258d1d3b4274ab1dcfe99acc7bd51894042a74 (diff) | |
| download | freebsd-ports-gnome-68e88f91427129799bd4227840082553edbdb5f9.tar.gz freebsd-ports-gnome-68e88f91427129799bd4227840082553edbdb5f9.tar.zst freebsd-ports-gnome-68e88f91427129799bd4227840082553edbdb5f9.zip | |
- Fix build on non-i386 arch
- Utilize USE_GETOPT_LONG
PR: ports/64220
Submitted by: Ports Fury
| -rw-r--r-- | x11-fm/fsv/Makefile | 16 | ||||
| -rw-r--r-- | x11-fm/fsv/files/patch-aa | 2 | ||||
| -rw-r--r-- | x11-fm/fsv/files/patch-lib::Makefile.in | 24 |
3 files changed, 33 insertions, 9 deletions
diff --git a/x11-fm/fsv/Makefile b/x11-fm/fsv/Makefile index 8d3d4c48fed4..60826c83245a 100644 --- a/x11-fm/fsv/Makefile +++ b/x11-fm/fsv/Makefile @@ -10,7 +10,7 @@ PORTVERSION= 0.9 PORTREVISION= 1 CATEGORIES= x11-fm MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= fsv +MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= 3D filesystem visualizer @@ -20,15 +20,15 @@ LIB_DEPENDS= gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea USE_X_PREFIX= yes USE_GL= yes USE_GNOME= gtk12 +USE_GETOPT_LONG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-GL-prefix=${X11BASE}/lib -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ - LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -.include <bsd.port.pre.mk> +CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -.if ${ARCH} == "ia64" || ${ARCH} == "amd64" -BROKEN= "Does not compile on amd64 or ia64" -.endif +post-extract: + -@${RM} ${WRKSRC}/lib/getopt* -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-fm/fsv/files/patch-aa b/x11-fm/fsv/files/patch-aa index 77c45d722c16..4286cc109117 100644 --- a/x11-fm/fsv/files/patch-aa +++ b/x11-fm/fsv/files/patch-aa @@ -26,7 +26,7 @@ gtk_main( ); +#ifdef __FreeBSD__ -+#ifndef __alpha__ ++#ifdef __i386__ + fpresetsticky(FP_X_DZ|FP_X_INV); +#endif + fpsetmask(FP_X_DZ|FP_X_INV); diff --git a/x11-fm/fsv/files/patch-lib::Makefile.in b/x11-fm/fsv/files/patch-lib::Makefile.in new file mode 100644 index 000000000000..d3587ce0f513 --- /dev/null +++ b/x11-fm/fsv/files/patch-lib::Makefile.in @@ -0,0 +1,24 @@ +--- lib/Makefile.in.orig Sun Jan 16 09:44:24 2000 ++++ lib/Makefile.in Sat Mar 13 21:08:23 2004 +@@ -99,10 +99,10 @@ + + INCLUDES = @GTK_CFLAGS@ + +-noinst_HEADERS = gnome-i18nP.h gnome-color-picker.h gnome-dateedit.h getopt.h nvstore.h ++noinst_HEADERS = gnome-i18nP.h gnome-color-picker.h gnome-dateedit.h nvstore.h + + libgnomeui_a_SOURCES = gnome-color-picker.c gnome-dateedit.c +-libmisc_a_SOURCES = getopt.c getopt1.c nvstore.c ++libmisc_a_SOURCES = nvstore.c + libmisc_a_LIBADD = @LIBOBJS@ + + EXTRA_DIST = README.gnome +@@ -119,7 +119,7 @@ + libgnomeui_a_LIBADD = + libgnomeui_a_OBJECTS = gnome-color-picker.o gnome-dateedit.o + libmisc_a_DEPENDENCIES = @LIBOBJS@ +-libmisc_a_OBJECTS = getopt.o getopt1.o nvstore.o ++libmisc_a_OBJECTS = nvstore.o + AR = ar + CFLAGS = @CFLAGS@ + COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) |