4 files changed, 55 insertions, 71 deletions

diff --git a/math/pari/Makefile b/math/pari/Makefile
index d92dafb2f18a..fe773a19e1f5 100644
--- a/math/pari/Makefile
+++ b/math/pari/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pari
 PORTVERSION=	2.3.5
-PORTEPOCH=	1
+PORTEPOCH=	2
 CATEGORIES=	math
 MASTER_SITES=	http://pari.math.u-bordeaux.fr/pub/pari/unix/OLD/
 
@@ -12,29 +12,46 @@ COMMENT=	Mathematics library and advanced calculator package
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	gmp.10:${PORTSDIR}/math/gmp
+LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
 
 MAKE_JOBS_UNSAFE=	yes
 
 ALL_TARGET=	gp
+CONFIGURE_ENV=	ld="${LD}" perl="${PERL}" ranlib="${RANLIB}"
 CONFIGURE_SCRIPT=	Configure
-CONFIGURE_ARGS=	--prefix=${PREFIX} \
+CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man/man1 \
+		--prefix=${PREFIX} \
 		--share-prefix=${PREFIX}/share \
 		--with-gmp=${LOCALBASE}
 HAS_CONFIGURE=	yes
+MAKE_ENV+=	STRIP="${STRIP_CMD}"
 USE_LDCONFIG=	yes
+USE_PERL5=	build
+USES=		perl5
+
+OPTIONS_DEFINE=		OPTIMIZED_CFLAGS X11
+OPTIONS_DEFAULT=	OPTIMIZED_CFLAGS X11
+.ifndef WITH_DEBUG
+OPTIMIZED_CFLAGS_CFLAGS=	-O3 -fno-strict-aliasing -fomit-frame-pointer
+.endif
+X11_CONFIGURE_ON=	--graphic=X11
+X11_CONFIGURE_OFF=	--graphic=none
+X11_USE=		xorg=x11
 
-MAN1=		gp.1 gp-${GP_VERSION}.1 gphelp.1 tex2mail.1
-MLINKS=		gp.1 pari.1
-PORTDOCS=	*
 PLIST_SUB=	GP_VERSION=${GP_VERSION} PORTVERSION=${PORTVERSION}
+PORTDATA=	*
+PORTDOCS=	*
+PORTEXAMPLES=	*
 
 GP_VERSION=	${PORTVERSION:R}
 
-NO_STAGE=	yes
-post-install:
-	@if [ -L ${MAN1PREFIX}/man/man1/pari.1 ]; then \
-		${RM} -f ${MAN1PREFIX}/man/man1/pari.1 ;\
-	fi
+post-patch:
+	@${REINPLACE_CMD} -E '/^list=/s/(ld|ranlib|perl|emacs)//g' \
+		${WRKSRC}/Configure
+	@${REINPLACE_CMD} -e '/^CFLAGS=/s/\$$cflags//' \
+		${WRKSRC}/config/get_cc
+
+post-build:
+	@${STRIP_CMD} ${WRKSRC}/*/libpari-gmp.so.*
 
 .include <bsd.port.mk>
diff --git a/math/pari/files/patch-af b/math/pari/files/patch-af
index 0fbd681788fe..94d1469873e0 100644
--- a/math/pari/files/patch-af
+++ b/math/pari/files/patch-af
@@ -1,69 +1,31 @@
---- config/Makefile.SH.orig	2010-01-09 17:59:48.000000000 +0000
-+++ config/Makefile.SH	2011-09-21 17:55:47.000000000 +0000
-@@ -216,9 +216,11 @@
- INCLUDEDIR= "\$(DESTDIR)$includedir"
- LIBDIR    = "\$(DESTDIR)$libdir"
- BINDIR    = "\$(DESTDIR)$bindir"
--MANDIR    = "\$(DESTDIR)$mandir"
-+MANDIR    = "\$(DESTDIR)\${PREFIX}/man/man1"
- EMACSDIR  = "\$(DESTDIR)$emacsdir"
--DATADIR   = "\$(DESTDIR)$datadir"
-+ALLDIR    = \${PREFIX}/share/doc/pari
-+READMEDIR = "\$(ALLDIR)"
-+DATADIR   = "\$(ALLDIR)"
- SYSDATADIR= "\$(DESTDIR)$sysdatadir"
- 
- EXDIR     = \$(DATADIR)/examples
-@@ -316,7 +318,7 @@
- .headers: $HEADERS
- 	@touch \$@
+--- config/Makefile.SH.orig	2010-01-09 12:59:48.000000000 -0500
++++ config/Makefile.SH	2014-07-08 04:15:24.000000000 -0400
+@@ -208,7 +208,6 @@
+ MV = mv -f
+ LN = $ln_s
+ CP_F = cp -f
+-STRIP      = strip
+ STRIPFLAGS =
  
--install: install-lib-$dft install-include install-bin install-man install-misc install-doc install-examples install-cfg install-data
-+install: install-lib-$dft install-include install-bin install-man install-misc install-doc install-examples install-cfg install-data install-top
+ # Change these installation directories to suit your needs.
+@@ -221,9 +220,9 @@
+ DATADIR   = "\$(DESTDIR)$datadir"
+ SYSDATADIR= "\$(DESTDIR)$sysdatadir"
  
- install-include:
- 	-mkdir -p \$(INCLUDEDIR)/pari
-@@ -367,6 +369,17 @@
- 	\$(INSTALL_DATA) $misc/pari.xpm  \$(MISCDIR)
- 	\$(INSTALL_PROGRAM) $misc/xgp    \$(MISCDIR)
+-EXDIR     = \$(DATADIR)/examples
++EXDIR     = \$(DESTDIR)/\$(PREFIX)/share/examples/pari
+ MISCDIR   = \$(DATADIR)/misc
+-DOCDIR    = \$(DATADIR)/doc
++DOCDIR    = \$(DESTDIR)/\$(PREFIX)/share/doc/pari
  
-+install-top::
-+	-mkdir -p \$(READMEDIR)
-+	\$(INSTALL_DATA) $TOP/AUTHORS      \$(READMEDIR)
-+	\$(INSTALL_DATA) $TOP/CHANGES      \$(READMEDIR)
-+	\$(INSTALL_DATA) $TOP/CHANGES-2.2  \$(READMEDIR)
-+	\$(INSTALL_DATA) $TOP/COMPAT       \$(READMEDIR)
-+	\$(INSTALL_DATA) $TOP/COPYING      \$(READMEDIR)
-+	\$(INSTALL_DATA) $TOP/MACHINES     \$(READMEDIR)
-+	\$(INSTALL_DATA) $TOP/NEW          \$(READMEDIR)
-+	\$(INSTALL_DATA) $TOP/README       \$(READMEDIR)
-+
- install-cfg::
- 	-mkdir -p \$(SYSDATADIR)
- 	-\$(INSTALL_DATA) pari.cfg \$(SYSDATADIR)
-@@ -377,7 +390,7 @@
+ INSTALL = $cfg/install
+ INSTALL_PROGRAM = \$(INSTALL)
+@@ -377,7 +376,7 @@
  
  install-doc::
  	-mkdir -p \$(BINDIR) \$(DOCDIR)
 -	-cd $doc; \$(MAKE) all
-+#	-cd $doc; \$(MAKE) all
++	#-cd $doc; \$(MAKE) all
  	-\$(INSTALL_PROGRAM) $doc/gphelp    \$(BINDIR)
  	-\$(INSTALL_DATA) $doc/Makefile     \$(DOCDIR)
  	-\$(INSTALL_DATA) $doc/translations \$(DOCDIR)
-@@ -395,11 +408,11 @@
- 	-\$(INSTALL_DATA) $doc/usersch4.tex \$(DOCDIR)
- 	-\$(INSTALL_DATA) $doc/usersch5.tex \$(DOCDIR)
- 	-\$(INSTALL_DATA) $doc/paricfg.tex  \$(DOCDIR)
--	-\$(INSTALL_DATA) $doc/libpari.dvi    \$(DOCDIR)
--	-\$(INSTALL_DATA) $doc/users.dvi    \$(DOCDIR)
--	-\$(INSTALL_DATA) $doc/tutorial.dvi \$(DOCDIR)
--	-\$(INSTALL_DATA) $doc/refcard.dvi  \$(DOCDIR)
--	-\$(INSTALL_DATA) $doc/refcard.ps   \$(DOCDIR)
-+#	-\$(INSTALL_DATA) $doc/libpari.dvi    \$(DOCDIR)
-+#	-\$(INSTALL_DATA) $doc/users.dvi    \$(DOCDIR)
-+#	-\$(INSTALL_DATA) $doc/tutorial.dvi \$(DOCDIR)
-+#	-\$(INSTALL_DATA) $doc/refcard.dvi  \$(DOCDIR)
-+#	-\$(INSTALL_DATA) $doc/refcard.ps   \$(DOCDIR)
- 
- install-examples:
- 	-mkdir -p \$(EXDIR)
diff --git a/math/pari/pkg-descr b/math/pari/pkg-descr
index d2804452f2d8..af105934e88f 100644
--- a/math/pari/pkg-descr
+++ b/math/pari/pkg-descr
@@ -15,4 +15,4 @@ Algorithm, improvement of implementation are done.
 Because improvement of performance was big, ports was made as -devel in
 particular.
 
-WWW:	http://pari.math.u-bordeaux.fr/
+WWW: http://pari.math.u-bordeaux.fr/
diff --git a/math/pari/pkg-plist b/math/pari/pkg-plist
index c315980d2b98..f00176853fc9 100644
--- a/math/pari/pkg-plist
+++ b/math/pari/pkg-plist
@@ -23,5 +23,10 @@ lib/libpari-gmp.so.%%PORTVERSION%%
 lib/libpari-gmp.so.2
 lib/libpari.so
 lib/pari/pari.cfg
+man/man1/gp-2.3.1.gz
+man/man1/gp.1.gz
+man/man1/gphelp.1.gz
+man/man1/pari.1.gz
+man/man1/tex2mail.1.gz
 @dirrm lib/pari
 @dirrm include/pari