diff options
| author | Ying-Chieh Liao <ijliao@FreeBSD.org> | 2002-09-20 06:19:33 +0000 |
|---|---|---|
| committer | Ying-Chieh Liao <ijliao@FreeBSD.org> | 2002-09-20 06:19:33 +0000 |
| commit | e801d0068e1e6e1f83dd346d799fe54db94af059 (patch) | |
| tree | a610e8b4d6ab7261107c3655143c592936061925 | |
| parent | db97870cec4b24b829d43b5caa602210e9ca3d3b (diff) | |
| download | ports-e801d0068e1e6e1f83dd346d799fe54db94af059.tar.gz ports-e801d0068e1e6e1f83dd346d799fe54db94af059.zip | |
- Support CFLAGS/CXXFLAGS properly
- Do not install useless .la files
PR: 42886
Submitted by: Ports Fury
Notes
Notes:
svn path=/head/; revision=66794
| -rw-r--r-- | science/vis5d+/Makefile | 14 | ||||
| -rw-r--r-- | science/vis5d+/files/patch-configure | 10 | ||||
| -rw-r--r-- | science/vis5d+/pkg-plist | 4 |
3 files changed, 16 insertions, 12 deletions
diff --git a/science/vis5d+/Makefile b/science/vis5d+/Makefile index aafbc871911e..0b1bcf115ff5 100644 --- a/science/vis5d+/Makefile +++ b/science/vis5d+/Makefile @@ -8,7 +8,7 @@ PORTNAME= vis5d+ PORTVERSION= 1.2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= science MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= vis5d @@ -22,21 +22,17 @@ LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv \ gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea RUN_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick -USE_BISON= yes USE_MESA= yes -USE_XLIB= yes USE_GNOMENG= yes USE_GNOME= gtk12 USE_LIBTOOL= yes -GNU_CONFIGURE= yes -CONFIGURE_ENV= \ - CPPFLAGS="${CXXFLAGS} ${PTHREAD_FLAGS} -I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -liconv -lintl -L${X11BASE}/lib" +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --enable-gtk --enable-threads --with-mesa --with-netcdf \ --with-mixkit=${LOCALBASE}/lib/libmix.a --with-x INSTALLS_SHLIB= yes -pre-build: - @${LN} -sf ${LOCALBASE}/bin/libtool ${WRKSRC} +CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_FLAGS} +LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS} .include <bsd.port.mk> diff --git a/science/vis5d+/files/patch-configure b/science/vis5d+/files/patch-configure new file mode 100644 index 000000000000..4bdb6b1ffc92 --- /dev/null +++ b/science/vis5d+/files/patch-configure @@ -0,0 +1,10 @@ +--- configure.orig Wed Nov 7 20:54:00 2001 ++++ configure Sun Sep 15 08:57:22 2002 +@@ -6903,6 +6903,7 @@ + + # This can be used to rebuild libtool when needed + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++$ac_aux_dir/ltconfig $LIBTOOL_DEPS + + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' diff --git a/science/vis5d+/pkg-plist b/science/vis5d+/pkg-plist index 3a4d36b8e8a1..73f91bfd5c9f 100644 --- a/science/vis5d+/pkg-plist +++ b/science/vis5d+/pkg-plist @@ -16,11 +16,9 @@ include/vis5d+/binio.h include/vis5d+/v5d.h include/vis5d+/v5df.h lib/libv5d.a -lib/libv5d.la lib/libv5d.so lib/libv5d.so.2 lib/libvis5d.a -lib/libvis5d.la lib/libvis5d.so lib/libvis5d.so.2 share/locale/es/LC_MESSAGES/vis5d+.mo @@ -28,5 +26,5 @@ share/locale/pt_BR/LC_MESSAGES/vis5d+.mo share/vis5d+/EARTH.TOPO share/vis5d+/OUTLSUPW share/vis5d+/OUTLUSAM -@dirrm include/vis5d+ @dirrm share/vis5d+ +@dirrm include/vis5d+ |