diff options
| author | mat <mat@FreeBSD.org> | 2015-08-17 22:20:40 +0800 |
|---|---|---|
| committer | mat <mat@FreeBSD.org> | 2015-08-17 22:20:40 +0800 |
| commit | 92a3a7b1bca5423036bca4932e5384d3e51591bd (patch) | |
| tree | 16be3a9188cf2781563095e15839c170074dd7a7 /misc | |
| parent | ed2992b93f898f5612b3952782ac7d9206ed029a (diff) | |
| download | freebsd-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 'misc')
| -rw-r--r-- | misc/e2fsprogs-libuuid/Makefile | 1 | ||||
| -rw-r--r-- | misc/gnu-watch/Makefile | 8 | ||||
| -rw-r--r-- | misc/nut/Makefile | 3 | ||||
| -rw-r--r-- | misc/tellico-kde4/Makefile | 2 |
4 files changed, 6 insertions, 8 deletions
diff --git a/misc/e2fsprogs-libuuid/Makefile b/misc/e2fsprogs-libuuid/Makefile index 3221cdbd17cf..43cbff153191 100644 --- a/misc/e2fsprogs-libuuid/Makefile +++ b/misc/e2fsprogs-libuuid/Makefile @@ -12,7 +12,6 @@ CONFLICTS= ossp-uuid-[0-9]* CONFIGURE_ARGS= --enable-elf-shlibs OPTIONS_EXCLUDE= NLS -OPTIONSFILE= # works around optionsNG trouble MASTERDIR= ${.CURDIR}/../../sysutils/e2fsprogs MAKE_ARGS= LIB_SUBDIRS=lib/uuid USE_LDCONFIG= yes diff --git a/misc/gnu-watch/Makefile b/misc/gnu-watch/Makefile index 47c1cd1456c1..5ea887eb79ad 100644 --- a/misc/gnu-watch/Makefile +++ b/misc/gnu-watch/Makefile @@ -16,15 +16,15 @@ LICENSE= GPLv2 LDFLAGS+= -lncurses -PLIST_FILES= bin/${UNIQUENAME} man/man1/gnu-watch.1.gz +PLIST_FILES= bin/${PKGBASE} man/man1/gnu-watch.1.gz do-build: ${CC} ${CFLAGS} ${LDFLAGS} ${WRKSRC}/${PORTNAME}.c \ - -o ${WRKSRC}/${UNIQUENAME} + -o ${WRKSRC}/${PKGBASE} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${UNIQUENAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${PKGBASE} ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/watch.1 \ - ${STAGEDIR}${MANPREFIX}/man/man1/${UNIQUENAME}.1 + ${STAGEDIR}${MANPREFIX}/man/man1/${PKGBASE}.1 .include <bsd.port.mk> diff --git a/misc/nut/Makefile b/misc/nut/Makefile index 21c317bfc0d5..a2d8a0fb9888 100644 --- a/misc/nut/Makefile +++ b/misc/nut/Makefile @@ -3,6 +3,7 @@ PORTNAME= nut PORTVERSION= 20.1 +PORTREVISION= 1 CATEGORIES= misc MASTER_SITES= SF PKGNAMEPREFIX= health- @@ -15,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= gmake -DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} PORTDOCS= CREDITS README nut.html OPTIONS_DEFINE= FLTK DOCS diff --git a/misc/tellico-kde4/Makefile b/misc/tellico-kde4/Makefile index 82ca562ca12b..21e9266570ca 100644 --- a/misc/tellico-kde4/Makefile +++ b/misc/tellico-kde4/Makefile @@ -18,8 +18,6 @@ LIB_DEPENDS= libtag.so:${PORTSDIR}/audio/taglib \ libexempi.so:${PORTSDIR}/textproc/exempi \ libqjson.so:${PORTSDIR}/devel/qjson -LATEST_LINK= ${PORTNAME}-kde4 - USE_KDE4= kdelibs kdeprefix libksane pimlibs \ automoc4 qimageblitz libkcddb libkcompactdisc USE_QT4= qmake_build moc_build uic_build rcc_build |