aboutsummaryrefslogtreecommitdiffstats
path: root/x11-toolkits
diff options
context:
space:
mode:
authormat <mat@FreeBSD.org>2015-08-17 22:20:40 +0800
committermat <mat@FreeBSD.org>2015-08-17 22:20:40 +0800
commit92a3a7b1bca5423036bca4932e5384d3e51591bd (patch)
tree16be3a9188cf2781563095e15839c170074dd7a7 /x11-toolkits
parented2992b93f898f5612b3952782ac7d9206ed029a (diff)
downloadfreebsd-ports-gnome-92a3a7b1bca5423036bca4932e5384d3e51591bd.tar.gz
freebsd-ports-gnome-92a3a7b1bca5423036bca4932e5384d3e51591bd.tar.zst
freebsd-ports-gnome-92a3a7b1bca5423036bca4932e5384d3e51591bd.zip
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
Diffstat (limited to 'x11-toolkits')
-rw-r--r--x11-toolkits/py-gui/Makefile1
-rw-r--r--x11-toolkits/tk84/Makefile2
-rw-r--r--x11-toolkits/tk85/Makefile4
-rw-r--r--x11-toolkits/tk86/Makefile2
4 files changed, 4 insertions, 5 deletions
diff --git a/x11-toolkits/py-gui/Makefile b/x11-toolkits/py-gui/Makefile
index 6c7e9b8785e0..eba8d1ce032b 100644
--- a/x11-toolkits/py-gui/Makefile
+++ b/x11-toolkits/py-gui/Makefile
@@ -15,7 +15,6 @@ COMMENT= Cross-platform pythonic GUI API
BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/Pyrex/Distutils/__init__.py:${PORTSDIR}/devel/pyrex
OPTIONS_DEFINE= DOCS EXAMPLES OPENGL
-OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options
USE_GNOME= pygtk2
USES= python
diff --git a/x11-toolkits/tk84/Makefile b/x11-toolkits/tk84/Makefile
index 0cff9f305399..11f52fbbae29 100644
--- a/x11-toolkits/tk84/Makefile
+++ b/x11-toolkits/tk84/Makefile
@@ -41,7 +41,7 @@ CFLAGS+= -I${TCL_INCLUDEDIR}
TK_VER= ${PORTVERSION:R}
SHORT_TK_VER= ${TK_VER:S/.//}
-MAN_SUFFIX= ${LATEST_LINK}
+MAN_SUFFIX= ${PKGBASE}
MAKE_ENV= SHORT_TK_VER=${SHORT_TK_VER}
diff --git a/x11-toolkits/tk85/Makefile b/x11-toolkits/tk85/Makefile
index 279fbf55d7e6..cbaf9c3d530b 100644
--- a/x11-toolkits/tk85/Makefile
+++ b/x11-toolkits/tk85/Makefile
@@ -32,7 +32,7 @@ CONFIGURE_ARGS= --enable-shared \
CONFIGURE_ENV= PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk${SHORT_TK_VER}.so.1 \
ac_cv_path_tclsh="${LOCALBASE}/bin/tclsh${TK_VER}"
-MAN_SUFFIX= ${LATEST_LINK}
+MAN_SUFFIX= ${PKGBASE}
INSTALL_TARGET= install
@@ -73,7 +73,7 @@ PLIST_SUB+= MAN=""
PLIST_SUB+= MAN="@comment "
.endif
-TKBASE?= ${PORTSDIR}/${PKGCATEGORY}/${LATEST_LINK}
+TKBASE?= ${PORTSDIR}/${PKGCATEGORY}/${PKGBASE}
post-patch:
${REINPLACE_CMD} -e \
diff --git a/x11-toolkits/tk86/Makefile b/x11-toolkits/tk86/Makefile
index 7d420ca2e864..cad1f38697e6 100644
--- a/x11-toolkits/tk86/Makefile
+++ b/x11-toolkits/tk86/Makefile
@@ -45,7 +45,7 @@ CFLAGS+= -I${TCL_INCLUDEDIR} \
TK_VER= ${PORTVERSION:R}
SHORT_TK_VER= ${TK_VER:S/.//}
-MAN_SUFFIX= ${LATEST_LINK}
+MAN_SUFFIX= ${PKGBASE}
MAKE_ENV= SHORT_TK_VER=${SHORT_TK_VER}