- Simplify version-related variables

- Add LICENSE
- Sort MAN1 and PLIST
- Remove PKGMESSAGE
- Cosmetic change

3 files changed, 19 insertions, 45 deletions

diff --git a/math/pari/Makefile b/math/pari/Makefile
index 3b19d5ffaad0..faa258216ac6 100644
--- a/math/pari/Makefile
+++ b/math/pari/Makefile
@@ -6,37 +6,34 @@
 #
 
 PORTNAME=	pari
-PORTVERSION=	${MAJOR_VERSION}.${MINOR_VERSION}.${REV_VERSION}
+PORTVERSION=	2.5.0
 CATEGORIES=	math
 MASTER_SITES=	http://pari.math.u-bordeaux.fr/pub/pari/unix/
-DISTNAME=	pari-${MAJOR_VERSION}.${MINOR_VERSION}.${REV_VERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Mathematics library and advanced calculator package
 
+LICENSE=	GPLv2
+
 LIB_DEPENDS=	gmp.10:${PORTSDIR}/math/gmp
 
 MAKE_JOBS_UNSAFE=	yes
 
-USE_LDCONFIG=	yes
-HAS_CONFIGURE=	yes
+ALL_TARGET=	gp
 CONFIGURE_SCRIPT=	Configure
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--share-prefix=${PREFIX}/share \
 		--with-gmp=${LOCALBASE}
+#MAKE_ARGS=	gp
+HAS_CONFIGURE=	yes
+USE_LDCONFIG=	yes
 
-MAKE_ARGS=	gp
-
+MAN1=		gp.1 gp-${GP_VERSION}.1 gphelp.1 tex2mail.1
+MLINKS=		gp.1 pari.1
 PORTDOCS=	*
-PLIST_SUB=	MAJOR_VERSION=${MAJOR_VERSION} MINOR_VERSION=${MINOR_VERSION} \
-		REV_VERSION=${REV_VERSION}
+PLIST_SUB=	GP_VERSION=${GP_VERSION} PORTVERSION=${PORTVERSION}
 
-MAJOR_VERSION=	2
-MINOR_VERSION=	5
-REV_VERSION=	0
-
-MAN1=		gp.1 gphelp.1 gp-${MAJOR_VERSION}.${MINOR_VERSION}.1 tex2mail.1
-MLINKS=		gp.1 pari.1
+GP_VERSION=	${PORTVERSION:R}
 
 post-install:
 	@if [ -L ${MAN1PREFIX}/man/man1/pari.1 ]; then \
diff --git a/math/pari/pkg-message b/math/pari/pkg-message
deleted file mode 100644
index ad56da4b7e4f..000000000000
--- a/math/pari/pkg-message
+++ /dev/null
@@ -1,23 +0,0 @@
-This is PARI/GP, version 2.1.x (*).
-
-PARI/GP Number Theory-oriented Computer Algebra System
-        Copyright (C) 2000 The PARI Group, Bordeaux.
-
-PARI/GP is free software; you can redistribute it and/or modify it under the
-terms of the GNU General Public License as published by the Free Software
-Foundation. It is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY WHATSOEVER.
-
-Check the License for details. You should have received a copy of it, along
-with the package; see the file 'COPYING'. If not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-==========================================================================
-*****
-Original copyright is in pari-2.1.1/README in the distfile:
-pari-2.1.1.tar.gz
-
-
-This distfile can be found in /cdrom/ports/distfiles or 
-ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/.
-*************************************************************************
diff --git a/math/pari/pkg-plist b/math/pari/pkg-plist
index 1fabb427f61c..7bf91947d890 100644
--- a/math/pari/pkg-plist
+++ b/math/pari/pkg-plist
@@ -1,26 +1,26 @@
-bin/gp-%%MAJOR_VERSION%%.%%MINOR_VERSION%%
 bin/gp
+bin/gp-%%GP_VERSION%%
 bin/gphelp
 bin/tex2mail
-include/pari/paricfg.h
-include/pari/paridecl.h
-include/pari/paripriv.h
+include/pari/genpari.h
+include/pari/mpinl.h
 include/pari/pari.h
 include/pari/paricast.h
+include/pari/paricfg.h
 include/pari/paricom.h
+include/pari/paridecl.h
 include/pari/parierr.h
 include/pari/parigen.h
 include/pari/pariinl.h
 include/pari/parinf.h
 include/pari/pariold.h
+include/pari/paripriv.h
 include/pari/paristio.h
 include/pari/parisys.h
 include/pari/paritune.h
-include/pari/genpari.h
-include/pari/mpinl.h
-lib/libpari-gmp.so.%%MAJOR_VERSION%%.%%MINOR_VERSION%%.%%REV_VERSION%%
+lib/libpari-gmp.so.%%PORTVERSION%%
 lib/libpari-gmp.so.3
 lib/libpari.so
 lib/pari/pari.cfg
-@dirrm include/pari
 @dirrm lib/pari
+@dirrm include/pari