- Resolve LATEST_LINK conflict

svn path=/head/; revision=234941
2024-12-19 03:52:17 +00:00 · 2009-05-31 20:31:08 +00:00 · 2009-05-31 20:31:08 +00:00 · aa952fd48f · 2021-03-31 03:12:20 +00:00
commit aa952fd48f
parent 06f1947ff9
47 changed files with 57 additions and 5 deletions
--- a/comms/smstools/Makefile
+++ b/comms/smstools/Makefile
@ -17,6 +17,7 @@ COMMENT=	Tools to handle Short Message Service
 LIB_DEPENDS=	mm:${PORTSDIR}/devel/mm

 CONFLICTS=	gnokii-[0-9]* smstools-3.* sendsms-[0-9]*
+NO_LATEST_LINK=	yes

 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_GMAKE=	yes
--- a/databases/adodb5/Makefile
+++ b/databases/adodb5/Makefile
@ -17,6 +17,7 @@ MAINTAINER=	mm@FreeBSD.org
 COMMENT=	Database library for PHP

 CONFLICTS=	adodb-4.*
+LATEST_LINK=	adodb5

 USE_PHP=	pcre

--- a/databases/mysql++/Makefile
+++ b/databases/mysql++/Makefile
@ -15,6 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Complex C++ API for MySQL${MYSQL_VER}

 CONFLICTS=	${PORTNAME}*-1.*
+NO_LATEST_LINK=	yes

 NOT_FOR_ARCHS=	amd64 sparc64
 NOT_FOR_ARCHS_REASON_amd64=	Fails to compile
--- a/deskutils/ljclive/Makefile
+++ b/deskutils/ljclive/Makefile
@ -22,6 +22,7 @@ MAN1=	clive.1
 GNU_CONFIGURE=	yes

 CONFLICTS=	*clive-[1-9]*
+LATEST_LINK=	ljclive

 .include <bsd.port.pre.mk>

--- a/devel/flex-sdk2/Makefile
+++ b/devel/flex-sdk2/Makefile
@ -19,6 +19,7 @@ RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper
 RESTRICTED=	Need agreement before download

 CONFLICTS=	ja-flex-sdk-2.* flex-sdk-3.*
+NO_LATEST_LINK=	YES
 USE_ZIP=	YES
 USE_JAVA=	YES
 JAVA_VERSION=	1.4+
--- a/devel/oniguruma4/Makefile
+++ b/devel/oniguruma4/Makefile
@ -15,6 +15,7 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	A BSDL Regular Expressions library compatible with POSIX/GNU/Perl

+NO_LATEST_LINK=	yes
 CONFLICTS=	oniguruma-2.*
 USE_GNOME=	gnometarget
 GNU_CONFIGURE=	yes
--- a/devel/pear-PHPUnit/Makefile
+++ b/devel/pear-PHPUnit/Makefile
@ -24,6 +24,8 @@ SUB_LIST+=	CHANNEL=${CHANNEL}
 PKGINSTALL=	${WRKDIR}/pear-install
 PKGDEINSTALL=	${WRKDIR}/pear-deinstall

+NO_LATEST_LINK=	yes
+
 FILES=		PHPUnit.php PHPUnit/GUI/Gtk.php PHPUnit/GUI/HTML.php \
 		PHPUnit/GUI/HTML.tpl PHPUnit/GUI/SetupDecorator.php \
 		PHPUnit/Assert.php PHPUnit/RepeatedTest.php PHPUnit/Skeleton.php \
--- a/devel/ptlib26/Makefile
+++ b/devel/ptlib26/Makefile
@ -26,6 +26,8 @@ WANT_SDL=	yes
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes

+NO_LATEST_LINK=	yes
+
 .include <bsd.port.pre.mk>

 CONFIGURE_ENV=	\
--- a/devel/subcommander/Makefile
+++ b/devel/subcommander/Makefile
@ -28,4 +28,6 @@ CONFIGURE_ARGS+=	--with-boost=${LOCALBASE} --with-neon=${LOCALBASE}
 CONFIGURE_ENV=	QTDIR=${LOCALBASE} CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"

+NO_LATEST_LINK=	yes
+
 .include <bsd.port.mk>
--- a/emulators/linux-vmware-toolbox5/Makefile
+++ b/emulators/linux-vmware-toolbox5/Makefile
@ -15,6 +15,8 @@ DISTNAME=	VMwareTools-${VMWARE_VER}-${BUILD_VER}
 MAINTAINER=	matusita@FreeBSD.org
 COMMENT=VMware toolbox for guest OS (VMware Workstation 5.x, Linux version)

+NO_LATEST_LINK=	yes
+
 DISTDIR=	${MOUNT_PT}
 IGNOREFILES=	${DISTFILES}
 PLIST_FILES=	bin/linux-vmware-toolbox bin/linux-vmware-toolbox-gtk \
--- a/emulators/vmware-guestd5/Makefile
+++ b/emulators/vmware-guestd5/Makefile
@ -20,6 +20,8 @@ COMMENT?=VMware guest OS supporting daemon (VMware Workstation 5.x, FreeBSD vers
 RUN_DEPENDS=	${LOCALBASE}/sbin/vmware-guestd:${PORTSDIR}/emulators/vmware-guestd5
 .endif

+NO_LATEST_LINK=	yes
+
 DISTDIR=	${MOUNT_PT}
 IGNOREFILES=	${DISTFILES}
 WRKSRC=		${WRKDIR}/vmware-tools-distrib
--- a/games/crimson/Makefile
+++ b/games/crimson/Makefile
@ -21,4 +21,6 @@ USE_SDL=	mixer sdl ttf

 MAN6=		crimson.6

+NO_LATEST_LINK=	yes
+
 .include <bsd.port.mk>
--- a/games/linux-enemyterritory-omni-bot-0660/Makefile
+++ b/games/linux-enemyterritory-omni-bot-0660/Makefile
@ -19,6 +19,7 @@ COMMENT=	Omni-Bot is a bot for Enemy Territory
 RUN_DEPENDS=	et:${PORTSDIR}/games/linux-enemyterritory

 CONFLICTS=	linux-enemyterritory-omni-bot-0.[7-9]*
+NO_LATEST_LINK=	yes

 USE_ZIP=	yes
 USE_LINUX=	yes
--- a/java/netbeans61/Makefile
+++ b/java/netbeans61/Makefile
@ -19,6 +19,7 @@ USE_ZIP=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.5+
 NO_BUILD=	yes
+NO_LATEST_LINK=	yes

 WRKSRC=		${WRKDIR}/netbeans

--- a/lang/expect-devel/Makefile
+++ b/lang/expect-devel/Makefile
@ -16,6 +16,7 @@ MAINTAINER=	mm@FreeBSD.org
 COMMENT=	A sophisticated scripter based on tcl/tk

 CONFLICTS=	expect-5.43*
+LATEST_LINK=	expect-devel

 USE_AUTOTOOLS=	autoconf:262

--- a/lang/tolua50/Makefile
+++ b/lang/tolua50/Makefile
@ -20,6 +20,8 @@ USE_GMAKE=	yes
 USE_LUA=	5.0
 WRKSRC=		${WRKDIR}/${PORTNAME}-5.0

+NO_LATEST_LINK=	yes
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|make|$${MAKE}|' ${WRKSRC}/${MAKEFILE}
 	@${REINPLACE_CMD} -Ee \
--- a/mail/dbmail23/Makefile
+++ b/mail/dbmail23/Makefile
@ -20,6 +20,7 @@ LIB_DEPENDS+=	mhash.2:${PORTSDIR}/security/mhash
 LIB_DEPENDS+=	zdb.6:${PORTSDIR}/databases/libzdb

 CONFLICTS=	dbmail-*-2.0.* dbmail-2.1.* dbmail-2.2.*
+NO_LATEST_LINK=	yes

 OPTIONS=	MYSQL		"Build with MySQL support" on \
 		POSTGRESQL	"Build with PostgreSQL support"	off \
--- a/mail/dovecot-devel/Makefile
+++ b/mail/dovecot-devel/Makefile
@ -20,6 +20,7 @@ USE_RC_SUBR=	dovecot.sh
 DEPRECATED=	Please use mail/dovecot instead

 CONFLICTS?=	${PORTNAME}-1.[02-9].*
+NO_LATEST_LINK=	yes

 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-shadow --localstatedir=/var
--- a/mail/gmime24/Makefile
+++ b/mail/gmime24/Makefile
@ -31,7 +31,7 @@ CONFIGURE_ARGS?=	--with-libiconv=${LOCALBASE} \
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib"

-LATEST_LINK?=	${PORTNAME}2
+LATEST_LINK?=	${PORTNAME}24

 post-patch:
 	@${REINPLACE_CMD} -e "s|stdint.h|inttypes.h|" ${WRKSRC}/zentimer.h
--- a/mail/james/Makefile
+++ b/mail/james/Makefile
@ -26,7 +26,6 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 APP_HOME?=	${PREFIX}/${PKGBASE}${PORTVERSION}
 PID_FILE=	/var/run/${APP_SHORTNAME}.pid
 PLIST_SUB+=	T=${APP_HOME:S/^${PREFIX}\///}
-LATEST_LINK=	${APP_SHORTNAME}

 SUB_LIST=	JAVA_HOME=${JAVA_HOME} \
 		PID_FILE=${PID_FILE} \
--- a/mail/qmail-scanner1/Makefile
+++ b/mail/qmail-scanner1/Makefile
@ -22,6 +22,7 @@ BUILD_DEPENDS=	reformime:${PORTSDIR}/mail/maildrop \

 MANUAL_PACKAGE_BUILD=	Requires qmail built with non-standard setting

+NO_LATEST_LINK=	yes
 CONFLICTS=	qmail-scanner-2.*

 QMAIL_QUEUE=	${QMAIL_PREFIX}/bin/qmail-queue
--- a/mail/squirrelmail-compatibility-plugin1/Makefile
+++ b/mail/squirrelmail-compatibility-plugin1/Makefile
@ -19,6 +19,7 @@ COMMENT=	Required by many plugins for compatibility with SquirrelMail
 RUN_DEPENDS=	${SQUIRRELDIR}/index.php:${PORTSDIR}/mail/squirrelmail

 CONFLICTS=	squirrelmail-compatibility-plugin-2.*
+NO_LATEST_LINK=	yes

 SQUIRREL_PLUGIN_NAME=	${PORTNAME}

--- a/misc/xdelta/Makefile
+++ b/misc/xdelta/Makefile
@ -20,4 +20,6 @@ USE_LDCONFIG=	yes

 MAN1=		xdelta.1

+NO_LATEST_LINK=	yes
+
 .include <bsd.port.mk>
--- a/net-mgmt/nagios2/Makefile
+++ b/net-mgmt/nagios2/Makefile
@ -23,6 +23,7 @@ USE_AUTOTOOLS=	autoconf:262 libltdl:15
 USE_RC_SUBR=	nagios

 CONFLICTS=	nagios-[13].* nagios-devel-*
+NO_LATEST_LINK=	yes

 OPTIONS=	EMBEDDED_PERL "Enable embedded Perl [requires Perl 5.8+]" OFF \
 		NANOSLEEP "Use nanosleep in event timing" OFF
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@ -36,6 +36,7 @@ PKGNAMESUFFIX=	-mysql
 .else
 CONFLICTS+=	freeradius-mysql-[0-9].* freeradius-[02-9].*
 .endif
+NO_LATEST_LINK=	yes

 USE_RC_SUBR=	radiusd.sh
 USE_AUTOTOOLS=	libltdl:15 libtool:15 autoconf:262
--- a/ports-mgmt/barry/Makefile
+++ b/ports-mgmt/barry/Makefile
@ -24,6 +24,8 @@ USE_AUTOTOOLS=	libtool:15
 INSTALLS_ICONS=	yes
 USE_GETTEXT=	yes

+NO_LATEST_LINK=	yes
+
 .include <bsd.port.pre.mk>

 .if ${OSVERSION} >= 700042
--- a/science/hdf5-18/Makefile
+++ b/science/hdf5-18/Makefile
@ -15,6 +15,7 @@ MAINTAINER=	koziol@hdfgroup.org
 COMMENT=	Hierarchical Data Format library (from NCSA)

 CONFLICTS=	hdf5-1.6.*
+NO_LATEST_LINK=	yes

 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
--- a/science/netcdf4/Makefile
+++ b/science/netcdf4/Makefile
@ -16,6 +16,7 @@ MAINTAINER=	sunpoet@sunpoet.net
 COMMENT=	Library for machine-independent, array-oriented data access

 CONFLICTS=	hdf-4.* netcdf-3.*
+LATEST_LINK=	netcdf4

 CONFIGURE_ARGS=	--disable-f77 --disable-f90 \
 		--enable-cxx --enable-cxx-4 --enable-netcdf-4 --enable-shared \
--- a/sysutils/rdiff-backup10/Makefile
+++ b/sysutils/rdiff-backup10/Makefile
@ -22,6 +22,7 @@ COMMENT=	Local/remote mirroring+incremental backup

 LIB_DEPENDS=	rsync.1:${PORTSDIR}/net/librsync

+NO_LATEST_LINK=	yes
 CONFLICTS=	rdiff-backup-1.2* rdiff-backup-devel-[0-9]*

 USE_PYTHON=	yes
--- a/sysutils/rsyslog/Makefile
+++ b/sysutils/rsyslog/Makefile
@ -21,6 +21,7 @@ MAN8=	rfc3195d.8 rklogd.8 rsyslogd.8
 MAN5=	rsyslog.conf.5
 .endif

+NO_LATEST_LINK=	yes
 CONFLICTS=	rsyslog-3.[0-9]*
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib
--- a/sysutils/rsyslog3/bsd.rsyslog.mk
+++ b/sysutils/rsyslog3/bsd.rsyslog.mk
@ -4,6 +4,7 @@ CATEGORIES?=	sysutils
 MASTER_SITES?=	http://download.rsyslog.com/rsyslog/
 MAINTAINER?=	miwi@FreeBSD.org

+NO_LATEST_LINK=	yes
 CONFLICTS=	rsyslog-2.[0-9]*
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
--- a/www/cacheboy15-devel/Makefile
+++ b/www/cacheboy15-devel/Makefile
@ -87,6 +87,7 @@ MAINTAINER=	adrian@freebsd.org
 COMMENT=	HTTP Caching Proxy (Squid Derivative) - Development Release

 CONFLICTS=	squid-[0-9]* cacheboy*
+LATEST_LINK=	cacheboy15-devel
 GNU_CONFIGURE=	yes
 USE_PERL5=	yes
 USE_RC_SUBR=	squid
--- a/www/cacheboy16/Makefile
+++ b/www/cacheboy16/Makefile
@ -86,6 +86,7 @@ MAINTAINER=	adrian@freebsd.org
 COMMENT=	HTTP Caching Proxy (Squid Derivative) - Development Release

 CONFLICTS=	squid-[0-9]* cacheboy*
+LATEST_LINK=	cacheboy16
 GNU_CONFIGURE=	yes
 USE_PERL5=	yes
 USE_RC_SUBR=	squid
--- a/www/dillo2/Makefile
+++ b/www/dillo2/Makefile
@ -25,6 +25,7 @@ PORTDOCS=	*
 CONFIGURE_ARGS=	--libdir=${PREFIX}/libexec
 CONFLICTS=	dillo-i18n-[0-9]* \
 		dillo-0*
+LATEST_LINK=	dillo2

 OPTIONS=	COOKIES 	"Enable cookies" On \
 		DEBUG		"Enable profiling and extra logging" Off \
--- a/www/mediawiki112/Makefile
+++ b/www/mediawiki112/Makefile
@ -14,6 +14,7 @@ MAINTAINER=	gerrit.beine@gmx.de
 COMMENT=	The wiki engine used by Wikipedia

 CONFLICTS=	mediawiki-1.[0-9].* mediawiki-1.1[0-13-9].*
+NO_LATEST_LINK=	yes

 USE_PHP=	iconv mbstring pcre session xml zlib readline dom
 IGNORE_WITH_PHP=	4
--- a/www/mediawiki12/Makefile
+++ b/www/mediawiki12/Makefile
@ -14,6 +14,7 @@ MAINTAINER=	gerrit.beine@gmx.de
 COMMENT=	The wiki engine used by Wikipedia

 CONFLICTS=	mediawiki-1.[0-9].* mediawiki-1.1[0-13-9].*
+NO_LATEST_LINK=	yes

 USE_PHP=	iconv mbstring pcre session xml zlib readline dom
 IGNORE_WITH_PHP=	4
--- a/www/mod_log_sql2-dtc/Makefile
+++ b/www/mod_log_sql2-dtc/Makefile
@ -16,7 +16,7 @@ COMMENT=	Allows Apache to log to a MySQL database

 MAKE_JOBS_SAFE=  yes

-LATEST_LINK=	mod_log_sql2
+LATEST_LINK=	mod_log_sql2-dtc
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
--- a/www/tinymce/Makefile
+++ b/www/tinymce/Makefile
@ -19,6 +19,7 @@ COMMENT=	An open source Javascript HTML WYSIWYG editor for web sites
 WRKSRC=		${WRKDIR}/${PORTNAME}

 NO_BUILD=	YES
+NO_LATEST_LINK=	YES

 do-install:
 	${INSTALL} -d -m 0755 ${WWWDIR}
--- a/x11-fm/krusader2/Makefile
+++ b/x11-fm/krusader2/Makefile
@ -21,6 +21,7 @@ QT_COMPONENTS=	gui network xml moc_build qmake_build\
 USE_GETTEXT=	yes
 USE_ICONV=	yes
 MAKE_JOBS_UNSAFE=	yes
+LATEST_LINK=	krusader2

 post-extract:
 	${MKDIR} ${WRKSRC}
--- a/x11-themes/kde-windeco-crystal/Makefile
+++ b/x11-themes/kde-windeco-crystal/Makefile
@ -20,6 +20,8 @@ USE_KDEBASE_VER=3
 USE_AUTOTOOLS=	libtool:15
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}

+NO_LATEST_LINK=	yes
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT}

--- a/x11-toolkits/ruby-fox16/Makefile
+++ b/x11-toolkits/ruby-fox16/Makefile
@ -24,7 +24,7 @@ LIB_DEPENDS=	FOX-1.6:${PORTSDIR}/x11-toolkits/fox16 \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		fxscintilla.19:${PORTSDIR}/x11-toolkits/fxscintilla

-LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}12
+LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}16

 USE_RUBY=	yes
 USE_RUBY_SETUP=	yes
--- a/x11-toolkits/swt31/Makefile
+++ b/x11-toolkits/swt31/Makefile
@ -28,6 +28,7 @@ PLIST_FILES=	%%JAVAJARDIR%%/swt.jar \
 		lib/libswt-awt-gtk-%%BUILD%%.so \
 		lib/libswt-gtk-%%BUILD%%.so \
 		lib/libswt-pi-gtk-%%BUILD%%.so
+NO_LATEST_LINK=	yes

 USE_JAVA=	yes
 JAVA_VERSION=	1.4+
--- a/x11-toolkits/tk84/Makefile
+++ b/x11-toolkits/tk84/Makefile
@ -60,7 +60,7 @@ MAN1=	wish${TCL_VER}${THREADS_SUFFIX}.1
 CONFIGURE_ARGS+=	--enable-threads --with-tcl=${LOCALBASE}/lib/tcl${TK_VER}${THREADS_SUFFIX}
 CONFIGURE_ENV+=		PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 			ac_cv_path_tclsh="${LOCALBASE}/bin/tclsh${TK_VER}${THREADS_SUFFIX}"
-LATEST_LINK=		tk85${THREADS_SUFFIX}
+LATEST_LINK=		tk84${THREADS_SUFFIX}
 SUB_LIST+=		TK_PROVIDE="; package provide Tk-threads ${TK_VER}"
 .else
 CONFIGURE_ARGS+=	--disable-threads --with-tcl=${LOCALBASE}/lib/tcl${TK_VER}
--- a/x11/gtk-theme-switch2/Makefile
+++ b/x11/gtk-theme-switch2/Makefile
@ -21,4 +21,6 @@ USE_GMAKE=	yes
 MAN1=		switch2.1
 PLIST_FILES=	bin/switch2

+LATEST_LINK=	gtk-theme-switch2
+
 .include <bsd.port.mk>
--- a/x11/nvidia-driver-173/Makefile
+++ b/x11/nvidia-driver-173/Makefile
@ -8,5 +8,6 @@
 DISTVERSION=	173.14.18

 MASTERDIR=	${.CURDIR}/../nvidia-driver
+NO_LATEST_LINK=	yes

 .include "${MASTERDIR}/Makefile"
--- a/x11/nvidia-driver-71/Makefile
+++ b/x11/nvidia-driver-71/Makefile
@ -8,5 +8,6 @@
 DISTVERSION=	71.86.09

 MASTERDIR=	${.CURDIR}/../nvidia-driver
+NO_LATEST_LINK=	yes

 .include "${MASTERDIR}/Makefile"
--- a/x11/nvidia-driver-96/Makefile
+++ b/x11/nvidia-driver-96/Makefile
@ -8,5 +8,6 @@
 DISTVERSION=	96.43.11

 MASTERDIR=	${.CURDIR}/../nvidia-driver
+NO_LATEST_LINK=	yes

 .include "${MASTERDIR}/Makefile"