Attachment #40940 for bug #64220

View | Details | Raw Unified | Return to bug 64220
Collapse All | Expand All




PORTREVISION=	1
CATEGORIES=	x11-fm
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}

MAINTAINER=	ports@FreeBSD.org
COMMENT=	3D filesystem visualizer

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="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"

CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}

post-extract:
	-@${RM} ${WRKSRC}/lib/getopt*
.endif

.include <bsd.port.mk>

Lines 26-32 Link Here

(-)x11-fm/fsv/files/patch-aa (-1 / +1 lines)
26	gtk_main( );	26	gtk_main( );
27		27
28	+#ifdef __FreeBSD__	28	+#ifdef __FreeBSD__
29	+#ifndef __alpha__	29	+#ifdef __i386__
30	+ fpresetsticky(FP_X_DZ\|FP_X_INV);	30	+ fpresetsticky(FP_X_DZ\|FP_X_INV);
31	+#endif	31	+#endif
32	+ fpsetmask(FP_X_DZ\|FP_X_INV);	32	+ fpsetmask(FP_X_DZ\|FP_X_INV);




--- 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)

Return to bug 64220

Lines 10-16 Link Here

(-)x11-fm/fsv/Makefile (-8 / +8 lines)
10	PORTREVISION= 1	10	PORTREVISION= 1
11	CATEGORIES= x11-fm	11	CATEGORIES= x11-fm
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= fsv	13	MASTER_SITE_SUBDIR= ${PORTNAME}
14		14
15	MAINTAINER= ports@FreeBSD.org	15	MAINTAINER= ports@FreeBSD.org
16	COMMENT= 3D filesystem visualizer	16	COMMENT= 3D filesystem visualizer
Lines 20-34 Link Here
20	USE_X_PREFIX= yes	20	USE_X_PREFIX= yes
21	USE_GL= yes	21	USE_GL= yes
22	USE_GNOME= gtk12	22	USE_GNOME= gtk12
		23	USE_GETOPT_LONG= yes
23	GNU_CONFIGURE= yes	24	GNU_CONFIGURE= yes
24	CONFIGURE_ARGS= --with-GL-prefix=${X11BASE}/lib	25	CONFIGURE_ARGS= --with-GL-prefix=${X11BASE}/lib
25	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \	26	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
26	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
27		27
28	.include <bsd.port.pre.mk>	28	CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
		29	LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
29		30
30	.if ${ARCH} == "ia64" \|\| ${ARCH} == "amd64"	31	post-extract:
31	BROKEN= "Does not compile on amd64 or ia64"	32	-@${RM} ${WRKSRC}/lib/getopt*
32	.endif
33		33
34	.include <bsd.port.post.mk>	34	.include <bsd.port.mk>

Line 0 Link Here

(-)x11-fm/fsv/files/patch-lib::Makefile.in (+24 lines)
	1	--- lib/Makefile.in.orig Sun Jan 16 09:44:24 2000
	2	+++ lib/Makefile.in Sat Mar 13 21:08:23 2004
	3	@@ -99,10 +99,10 @@
	4
	5	INCLUDES = @GTK_CFLAGS@
	6
	7	-noinst_HEADERS = gnome-i18nP.h gnome-color-picker.h gnome-dateedit.h getopt.h nvstore.h
	8	+noinst_HEADERS = gnome-i18nP.h gnome-color-picker.h gnome-dateedit.h nvstore.h
	9
	10	libgnomeui_a_SOURCES = gnome-color-picker.c gnome-dateedit.c
	11	-libmisc_a_SOURCES = getopt.c getopt1.c nvstore.c
	12	+libmisc_a_SOURCES = nvstore.c
	13	libmisc_a_LIBADD = @LIBOBJS@
	14
	15	EXTRA_DIST = README.gnome
	16	@@ -119,7 +119,7 @@
	17	libgnomeui_a_LIBADD =
	18	libgnomeui_a_OBJECTS = gnome-color-picker.o gnome-dateedit.o
	19	libmisc_a_DEPENDENCIES = @LIBOBJS@
	20	-libmisc_a_OBJECTS = getopt.o getopt1.o nvstore.o
	21	+libmisc_a_OBJECTS = nvstore.o
	22	AR = ar
	23	CFLAGS = @CFLAGS@
	24	COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)