Remove UNIQUENAME and LATEST_LINK.

UNIQUENAME was never unique, it was only used by USE_LDCONFIG and now,
we won't have conflicts there.

Use PKGBASE instead of LATEST_LINK in PKGLATESTFILE, the *only* consumer
is pkg-devel, and it works just fine without LATEST_LINK as pkg-devel
has the correct PKGNAME anyway.

Now that UNIQUENAME is gone, OPTIONSFILE is too. (it's been called
OPTIONS_FILE now.)

Reviewed by:	antoine, bapt
Exp-run by:	antoine
Sponsored by:	Absolight
Differential Revision:	https://reviews.freebsd.org/D3336

13 files changed, 11 insertions, 25 deletions

diff --git a/graphics/frei0r-plugins/Makefile b/graphics/frei0r-plugins/Makefile
index ab127fa94f02..56b75f76d4eb 100644
--- a/graphics/frei0r-plugins/Makefile
+++ b/graphics/frei0r-plugins/Makefile
@@ -8,9 +8,6 @@ EXTRACT_ONLY=	# empty
 
 COMMENT=	Frei0r meta-port
 
-# Required in order to avoid conflicts with graphics/frei0r's OPTIONS.
-LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}
-
 RUN_DEPENDS=	${LOCALBASE}/include/frei0r.h:${PORTSDIR}/graphics/frei0r
 
 MASTERDIR=	${.CURDIR}/../frei0r
diff --git a/graphics/jgraph/Makefile b/graphics/jgraph/Makefile
index d7174dd4f8a8..30c54f248171 100644
--- a/graphics/jgraph/Makefile
+++ b/graphics/jgraph/Makefile
@@ -11,7 +11,6 @@ DISTFILES=	${PORTNAME}.shar.Z
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Generates postscript graphs
 
-NO_LATEST_LINK=	yes
 EXTRACT_CMD=	uncompress
 EXTRACT_BEFORE_ARGS=	-c
 EXTRACT_AFTER_ARGS=	| ${SH}
diff --git a/graphics/libgnomecanvasmm26/Makefile b/graphics/libgnomecanvasmm26/Makefile
index 84507f4d28d3..6a5d701aaa71 100644
--- a/graphics/libgnomecanvasmm26/Makefile
+++ b/graphics/libgnomecanvasmm26/Makefile
@@ -15,8 +15,6 @@ COMMENT=	C++ wrapper for libgnomecanvas library
 LIB_DEPENDS=	libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
-LATEST_LINK=	libgnomecanvasmm26
-
 USES=		gmake libtool:keepla pathfix pkgconfig tar:bzip2
 USE_GNOME=	libgnomecanvas
 GNU_CONFIGURE=	yes
diff --git a/graphics/py-aafigure/Makefile b/graphics/py-aafigure/Makefile
index ff7e741f1b8a..837e777ce576 100644
--- a/graphics/py-aafigure/Makefile
+++ b/graphics/py-aafigure/Makefile
@@ -19,8 +19,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \
 USES=		python
 USE_PYTHON=	distutils autoplist
 
-DOCSDIR=	${PREFIX}/share/doc/${UNIQUENAME}
-EXAMPLESDIR=	${PREFIX}/share/examples/${UNIQUENAME}
+DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}
+EXAMPLESDIR=	${PREFIX}/share/examples/${PKGBASE}
 
 PORTDOCS=	README.txt
 PORTEXAMPLES=	*
diff --git a/graphics/py-actdiag/Makefile b/graphics/py-actdiag/Makefile
index 5d475bc0e8ad..038da04c09cd 100644
--- a/graphics/py-actdiag/Makefile
+++ b/graphics/py-actdiag/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS=	${PKGNAMEPREFIX}pillow>=2.2.1:${PORTSDIR}/graphics/py-pillow \
 USES=	python
 USE_PYTHON=	autoplist distutils
 
-DOCSDIR=	${PREFIX}/share/doc/${UNIQUENAME}
+DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}
 PORTDOCS=	README.rst
 
 OPTIONS_DEFINE=	DOCS
diff --git a/graphics/py-blockdiag/Makefile b/graphics/py-blockdiag/Makefile
index 076a5274438e..57186a2e2b2b 100644
--- a/graphics/py-blockdiag/Makefile
+++ b/graphics/py-blockdiag/Makefile
@@ -17,8 +17,6 @@ RUN_DEPENDS=	${PKGNAMEPREFIX}pillow>=2.2.1:${PORTSDIR}/graphics/py-pillow \
 		${PKGNAMEPREFIX}funcparserlib>=0.3.6:${PORTSDIR}/devel/py-funcparserlib \
 		${PKGNAMEPREFIX}webcolors>=0:${PORTSDIR}/graphics/py-webcolors
 
-UNIQUENAME=	py-${PORTNAME}
-
 USES=	python
 USE_PYTHON=	autoplist distutils
 
diff --git a/graphics/py-imaging/Makefile b/graphics/py-imaging/Makefile
index e4dfed9e4aad..79adbd76fade 100644
--- a/graphics/py-imaging/Makefile
+++ b/graphics/py-imaging/Makefile
@@ -16,8 +16,6 @@ COMMENT=	The Python Imaging Library
 LIB_DEPENDS=	liblcms.so:${PORTSDIR}/graphics/lcms \
 		libfreetype.so:${PORTSDIR}/print/freetype2
 
-UNIQUENAME=	py-${PORTNAME}
-
 USES=		jpeg python
 DIST_SUBDIR=	python
 USE_PYTHON=	distutils autoplist concurrent
diff --git a/graphics/py-nwdiag/Makefile b/graphics/py-nwdiag/Makefile
index d849d674dc7b..95ffafa7c37f 100644
--- a/graphics/py-nwdiag/Makefile
+++ b/graphics/py-nwdiag/Makefile
@@ -20,8 +20,8 @@ RUN_DEPENDS=	${PKGNAMEPREFIX}pillow>=2.2.1:${PORTSDIR}/graphics/py-pillow \
 USES=	python
 USE_PYTHON=	autoplist distutils
 
-DOCSDIR=	${PREFIX}/share/doc/${UNIQUENAME}
-EXAMPLESDIR=	${PREFIX}/share/examples/${UNIQUENAME}
+DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}
+EXAMPLESDIR=	${PREFIX}/share/examples/${PKGBASE}
 
 PORTDOCS=	README.rst
 PORTEXAMPLES=	*
diff --git a/graphics/py-opengl/Makefile b/graphics/py-opengl/Makefile
index ac030c4da688..54c87f17f497 100644
--- a/graphics/py-opengl/Makefile
+++ b/graphics/py-opengl/Makefile
@@ -19,7 +19,6 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 OPTIONS_DEFINE=	TKINTER
 OPTIONS_DEFAULT=	TKINTER
 TKINTER_DESC=	Build with tkinter for X support
-OPTIONSFILE?=	${PORT_DBDIR}/${PORTNAME}/options
 
 USES=		dos2unix python
 USE_GL=		glut
diff --git a/graphics/py-seqdiag/Makefile b/graphics/py-seqdiag/Makefile
index b0f701a6c4d7..8875d42a0067 100644
--- a/graphics/py-seqdiag/Makefile
+++ b/graphics/py-seqdiag/Makefile
@@ -20,8 +20,8 @@ RUN_DEPENDS=	${PKGNAMEPREFIX}pillow>=2.2.1:${PORTSDIR}/graphics/py-pillow \
 USES=	python
 USE_PYTHON=	autoplist distutils
 
-DOCSDIR=	${PREFIX}/share/doc/${UNIQUENAME}
-EXAMPLESDIR=	${PREFIX}/share/examples/${UNIQUENAME}
+DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}
+EXAMPLESDIR=	${PREFIX}/share/examples/${PKGBASE}
 
 PORTDOCS=	README.rst
 PORTEXAMPLES=	*
diff --git a/graphics/py-sorl-thumbnail/Makefile b/graphics/py-sorl-thumbnail/Makefile
index 82eb79a5b4eb..fa4b2d314cea 100644
--- a/graphics/py-sorl-thumbnail/Makefile
+++ b/graphics/py-sorl-thumbnail/Makefile
@@ -20,7 +20,6 @@ USE_PYTHON=	autoplist distutils
 
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
 
-OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 OPTIONS_DEFINE=	DJANGO PDF WORD
 DJANGO_DESC=	Enable Django
 PDF_DESC=	PDF Thumbnails
diff --git a/graphics/py-webcolors/Makefile b/graphics/py-webcolors/Makefile
index 8e1faeae81ce..324d03687f4d 100644
--- a/graphics/py-webcolors/Makefile
+++ b/graphics/py-webcolors/Makefile
@@ -15,7 +15,7 @@ LICENSE=	BSD3CLAUSE
 USES=		python
 USE_PYTHON=	distutils autoplist
 
-DOCSDIR=	${PREFIX}/share/doc/${UNIQUENAME}
+DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}
 PORTDOCS=	README
 
 OPTIONS_DEFINE=	DOCS
diff --git a/graphics/quat-gui/Makefile b/graphics/quat-gui/Makefile
index 6fb643daca2e..54895a8862e7 100644
--- a/graphics/quat-gui/Makefile
+++ b/graphics/quat-gui/Makefile
@@ -18,8 +18,6 @@ LIB_DEPENDS=	libfltk.so:${PORTSDIR}/x11-toolkits/fltk
 
 OPTIONS_DEFINE=	OPTIMIZED_CFLAGS DOCS
 
-UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
-
 USE_XORG=	xext
 USE_GL=		gl glut
 GNU_CONFIGURE=	yes
@@ -29,7 +27,7 @@ CONFIGURE_ARGS=	--datadir=${PREFIX}/share/doc
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-DOCSDIR=	${PREFIX}/share/doc/${UNIQUENAME}
+DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}
 
 PORTDOCS=	*
 PLIST_FILES=	bin/quat
@@ -51,7 +49,7 @@ post-patch:
 		${WRKSRC}/gui/Makefile.in
 	@${REINPLACE_CMD} -e \
 		's|<FL/fl_file_chooser.H>|<FL/Fl_File_Chooser.H>| ; \
-		 s|/doc/quat/|/doc/${UNIQUENAME}/|' \
+		 s|/doc/quat/|/doc/${PKGBASE}/|' \
 		${WRKSRC}/gui/MainWindow.cxx
 # disable data file installation since distfile does not do
 # The Right Thing(TM)
@@ -60,7 +58,7 @@ post-patch:
 		 s|^(SUBDIRS.*)doc|\1|' \
 		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e \
-		's|@PACKAGE@|${UNIQUENAME}|' \
+		's|@PACKAGE@|${PKGBASE}|' \
 		${WRKSRC}/doc/Makefile.in
 
 post-install: