- Fix build on 4-stable

- Do not create useless empty directory

PR:		57835
Submitted by:	Ports Fury

3 files changed, 41 insertions, 8 deletions

diff --git a/science/xloops-ginac/Makefile b/science/xloops-ginac/Makefile
index 25bfb286231a..456bd64dc667 100644
--- a/science/xloops-ginac/Makefile
+++ b/science/xloops-ginac/Makefile
@@ -6,22 +6,34 @@
 # $FreeBSD$
 #
 
-PORTNAME=	xloops
+PORTNAME=	xloops-ginac
 PORTVERSION=	0.1.3
+PORTREVISOIN=	1
 CATEGORIES=	science
 MASTER_SITES=	http://wwwthep.physik.uni-mainz.de/~xloops/
-PKGNAMESUFFIX=	-ginac
-DISTNAME=	${PORTNAME}-ginac-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A program calculating Feynman diagrams
 
-LIB_DEPENDS=	ginac:${PORTSDIR}/math/GiNaC
+LIB_DEPENDS=	ginac-1.1.3:${PORTSDIR}/math/GiNaC
 
-USE_LIBTOOL=	yes
 USE_GMAKE=	yes
+USE_LIBTOOL=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
+		AUTOHEADER="${TRUE}"
+
+CPPFLAGS=	-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
+
+.include <bsd.port.pre.mk>
 
-post-install:
-	@${RMDIR} ${DOCSDIR}
+.if ${OSVERSION} < 500035
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
+RUN_DEPENDS+=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
+CPPFLAGS+=	-I${LOCALBASE}/include/stlport ${PTHREAD_CFLAGS}
+LDFLAGS+=	-lstlport_gcc ${PTHREAD_LIBS}
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/science/xloops-ginac/files/patch-Makefile.in b/science/xloops-ginac/files/patch-Makefile.in
new file mode 100644
index 000000000000..5ce920225565
--- /dev/null
+++ b/science/xloops-ginac/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Thu Nov  8 23:19:05 2001
++++ Makefile.in	Fri Oct 10 11:10:31 2003
+@@ -91,7 +91,7 @@
+ am__quote = @am__quote@
+ install_sh = @install_sh@
+ 
+-SUBDIRS = lib check xloops ginsh doc
++SUBDIRS = lib check xloops ginsh
+ 
+ # Requires automake 1.4
+ AUTOMAKE_OPTIONS = 1.4
diff --git a/science/xloops-ginac/files/patch-configure b/science/xloops-ginac/files/patch-configure
new file mode 100644
index 000000000000..83ea6ec44709
--- /dev/null
+++ b/science/xloops-ginac/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Thu Feb 28 01:06:04 2002
++++ configure	Fri Oct 10 10:45:33 2003
+@@ -7385,6 +7385,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'