svn commit: r313760 - in head: Mk comms/acfax devel/pdcurses devel/pdcurses-the editors/emacs21 editors/emacs22 editors/emacs23 editors/xemacs editors/xemacs-devel-mule editors/xemacs21-mule emulat...
Baptiste Daroussin
bapt at FreeBSD.org
Sat Mar 9 21:43:06 UTC 2013
Author: bapt
Date: Sat Mar 9 21:43:02 2013
New Revision: 313760
URL: http://svnweb.freebsd.org/changeset/ports/313760
Log:
Get rid of XAWVER option in bsd.port.mk it does not need to be specified there also remove a useless global XAWVER PLIST_SUB
Modified:
head/Mk/bsd.port.mk
head/comms/acfax/Makefile
head/devel/pdcurses-the/Makefile
head/devel/pdcurses/Makefile
head/editors/emacs21/Makefile
head/editors/emacs22/Makefile
head/editors/emacs23/Makefile
head/editors/xemacs-devel-mule/Makefile
head/editors/xemacs/Makefile
head/editors/xemacs21-mule/Makefile
head/emulators/vice/Makefile
head/games/3dc/Makefile
head/games/xfrisk/Makefile
head/games/xmine/Makefile
head/x11-toolkits/Xaw3d/Makefile
head/x11-toolkits/Xaw3d/pkg-plist
head/x11-toolkits/neXtaw/Makefile
head/x11-toolkits/neXtaw/pkg-plist
Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk Sat Mar 9 21:36:59 2013 (r313759)
+++ head/Mk/bsd.port.mk Sat Mar 9 21:43:02 2013 (r313760)
@@ -1976,11 +1976,8 @@ MAKE_ENV+= DISPLAY="localhost:1001"
.endif
.endif
-XAWVER= 8
PKG_IGNORE_DEPENDS?= 'this_port_does_not_exist'
-PLIST_SUB+= XAWVER=${XAWVER}
-
_GL_gl_LIB_DEPENDS= GL.1:${PORTSDIR}/graphics/libGL
_GL_glew_LIB_DEPENDS= GLEW.1:${PORTSDIR}/graphics/glew
_GL_glu_LIB_DEPENDS= GLU.1:${PORTSDIR}/graphics/libGLU
Modified: head/comms/acfax/Makefile
==============================================================================
--- head/comms/acfax/Makefile Sat Mar 9 21:36:59 2013 (r313759)
+++ head/comms/acfax/Makefile Sat Mar 9 21:43:02 2013 (r313760)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: acfax
-# Date created: 20 February 2002
-# Whom: Darren <igla at batterybackups.net>
-#
+# Created by: Darren <igla at batterybackups.net>
# $FreeBSD$
-#
PORTNAME= acfax
PORTVERSION= 0.981011
@@ -15,7 +11,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/^0
MAINTAINER= hamradio at FreeBSD.org
COMMENT= Receive faxes using sound card and radio
-LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
+LIB_DEPENDS= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
PLIST_FILES= bin/acfax
WRKSRC= ${WRKDIR}/${PORTNAME}
Modified: head/devel/pdcurses-the/Makefile
==============================================================================
--- head/devel/pdcurses-the/Makefile Sat Mar 9 21:36:59 2013 (r313759)
+++ head/devel/pdcurses-the/Makefile Sat Mar 9 21:43:02 2013 (r313760)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: pdcurses
-# Date created: 1 Jul 2006
-# Whom: alepulver
-#
+# Created by: alepulver
# $FreeBSD$
-#
PORTNAME= pdcurses
PORTVERSION= 3.2
@@ -36,12 +32,12 @@ CONFIGURE_ARGS+=--enable-${opt:L}
.endfor
.if ${PORT_OPTIONS:MNEXTAW}
-LIB_DEPENDS+= neXtaw.${XAWVER}:${PORTSDIR}/x11-toolkits/neXtaw
+LIB_DEPENDS+= neXtaw:${PORTSDIR}/x11-toolkits/neXtaw
CONFIGURE_ARGS+=--with-nextaw
.endif
.if ${PORT_OPTIONS:MXAW3D}
-LIB_DEPENDS+= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
+LIB_DEPENDS+= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
CONFIGURE_ARGS+=--with-xaw3d
.endif
Modified: head/devel/pdcurses/Makefile
==============================================================================
--- head/devel/pdcurses/Makefile Sat Mar 9 21:36:59 2013 (r313759)
+++ head/devel/pdcurses/Makefile Sat Mar 9 21:43:02 2013 (r313760)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: pdcurses
-# Date created: 1 Jul 2006
-# Whom: alepulver
-#
+# Created by: alepulver
# $FreeBSD$
-#
PORTNAME= pdcurses
PORTVERSION= 3.4
@@ -35,12 +31,12 @@ CONFIGURE_ARGS+=--enable-${opt:L}
.endfor
.if ${PORT_OPTIONS:MNEXTAW}
-LIB_DEPENDS+= neXtaw.${XAWVER}:${PORTSDIR}/x11-toolkits/neXtaw
+LIB_DEPENDS+= neXtaw:${PORTSDIR}/x11-toolkits/neXtaw
CONFIGURE_ARGS+=--with-nextaw
.endif
.if ${PORT_OPTIONS:MXAW3D}
-LIB_DEPENDS+= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
+LIB_DEPENDS+= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
CONFIGURE_ARGS+=--with-xaw3d
.endif
Modified: head/editors/emacs21/Makefile
==============================================================================
--- head/editors/emacs21/Makefile Sat Mar 9 21:36:59 2013 (r313759)
+++ head/editors/emacs21/Makefile Sat Mar 9 21:43:02 2013 (r313760)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: GNU emacs
-# Date created: 11 October 2001
-# Whom: MANTANI Nobutaka <nobutaka at nobutaka.com>
-#
+# Created by: MANTANI Nobutaka <nobutaka at nobutaka.com>
# $FreeBSD$
-#
PORTNAME= emacs
PORTVERSION= 21.3
@@ -26,7 +22,7 @@ CONFLICTS= emacs-19.* emacs-22.* emacs-2
xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]*
.if !defined(WITHOUT_X11)
-LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d \
+LIB_DEPENDS= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d \
jpeg.11:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff \
gif.5:${PORTSDIR}/graphics/giflib \
Modified: head/editors/emacs22/Makefile
==============================================================================
--- head/editors/emacs22/Makefile Sat Mar 9 21:36:59 2013 (r313759)
+++ head/editors/emacs22/Makefile Sat Mar 9 21:43:02 2013 (r313760)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: GNU emacs
-# Date created: 11 October 2001
-# Whom: MANTANI Nobutaka <nobutaka at nobutaka.com>
-#
+# Created by: MANTANI Nobutaka <nobutaka at nobutaka.com>
# $FreeBSD$
-#
PORTNAME= emacs
PORTVERSION= ${EMACS_VER}
@@ -18,7 +14,7 @@ COMMENT= GNU editing macros
.if !defined(WITHOUT_X11)
.if defined(WITHOUT_GTK)
-LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
+LIB_DEPENDS= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
.endif
LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff \
Modified: head/editors/emacs23/Makefile
==============================================================================
--- head/editors/emacs23/Makefile Sat Mar 9 21:36:59 2013 (r313759)
+++ head/editors/emacs23/Makefile Sat Mar 9 21:43:02 2013 (r313760)
@@ -95,7 +95,7 @@ CONFIGURE_ARGS+= --without-rsvg
USE_GNOME+= gtk20
CONFIGURE_ARGS+= --with-x-toolkit=gtk
.elif ${PORT_OPTIONS:MXAW3D}
-LIB_DEPENDS+= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
+LIB_DEPENDS+= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
CONFIGURE_ARGS+= --with-x-toolkit=athena
.elif ${PORT_OPTIONS:MXAW}
USE_XORG= xaw
Modified: head/editors/xemacs-devel-mule/Makefile
==============================================================================
--- head/editors/xemacs-devel-mule/Makefile Sat Mar 9 21:36:59 2013 (r313759)
+++ head/editors/xemacs-devel-mule/Makefile Sat Mar 9 21:43:02 2013 (r313760)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: X-Emacs with mule
-# Date created: 3 Jan 2002
-# Whom: KIRIYAMA Kazuhiko<kiri at FreeBSD.org>
-#
+# Created by: KIRIYAMA Kazuhiko<kiri at FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= xemacs-devel-mule
PORTVERSION= ${XEMACS_VER:S/-/./}
@@ -172,7 +168,7 @@ WITH_DIALOGS?= --enable-dialogs=athena
WITH_WIDGETS?= --enable-widgets=athena
.if defined(WITH_XAW3D)
-LIB_DEPENDS+= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
+LIB_DEPENDS+= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
CONFIGURE_ARGS+=--with-athena=3d
.else
CONFIGURE_ARGS+=--with-athena=xaw
Modified: head/editors/xemacs/Makefile
==============================================================================
--- head/editors/xemacs/Makefile Sat Mar 9 21:36:59 2013 (r313759)
+++ head/editors/xemacs/Makefile Sat Mar 9 21:43:02 2013 (r313760)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: X-Emacs
-# Date created: 25 Oct 2001
-# Whom: Gary Jennejohn (gj at FreeBSD.org)
-#
+# Created by: Gary Jennejohn (gj at FreeBSD.org)
# $FreeBSD$
-#
PORTNAME= xemacs
PORTVERSION= ${XEMACS_VER}
@@ -108,7 +104,7 @@ WITH_SCROLLBARS= --with-scrollbars=athen
WITH_DIALOGS= --with-dialogs=athena
WITH_WIDGETS= --with-widgets=athena
.if defined(WITH_XAW3D)
-LIB_DEPENDS+= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
+LIB_DEPENDS+= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
CONFIGURE_ARGS+= --with-athena=3d
.endif
Modified: head/editors/xemacs21-mule/Makefile
==============================================================================
--- head/editors/xemacs21-mule/Makefile Sat Mar 9 21:36:59 2013 (r313759)
+++ head/editors/xemacs21-mule/Makefile Sat Mar 9 21:43:02 2013 (r313760)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: XEmacs with Mule
-# Date created: 8 Dec 1999
-# Whom: KIRIYAMA Kazuhiko<kiri at pis.toba-cmt.ac.jp>
-#
+# Created by: KIRIYAMA Kazuhiko<kiri at pis.toba-cmt.ac.jp>
# $FreeBSD$
-#
PORTNAME= xemacs-mule
PORTVERSION= ${XEMACS_VER}
@@ -139,7 +135,7 @@ WITH_DIALOGS?= --with-dialogs=athena
WITH_WIDGETS?= --with-widgets=athena
.if defined(WITH_XAW3D)
-LIB_DEPENDS+= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
+LIB_DEPENDS+= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
CONFIGURE_ARGS+=--with-athena=3d
.else
CONFIGURE_ARGS+=--with-athena=xaw
Modified: head/emulators/vice/Makefile
==============================================================================
--- head/emulators/vice/Makefile Sat Mar 9 21:36:59 2013 (r313759)
+++ head/emulators/vice/Makefile Sat Mar 9 21:43:02 2013 (r313760)
@@ -18,7 +18,7 @@ LIB_DEPENDS= png15:${PORTSDIR}/graphics/
gif:${PORTSDIR}/graphics/giflib \
mp3lame:${PORTSDIR}/audio/lame
.if defined(VICE_WITH_XAW3D)
-LIB_DEPENDS+= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
+LIB_DEPENDS+= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
.endif
RESTRICTED= "ROMs are copyrighted by Commodore Business Machines"
Modified: head/games/3dc/Makefile
==============================================================================
--- head/games/3dc/Makefile Sat Mar 9 21:36:59 2013 (r313759)
+++ head/games/3dc/Makefile Sat Mar 9 21:43:02 2013 (r313760)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: 3Dc
-# Date created: 2 May 1998
-# Whom: Andrey Zakhvatov
-#
+# Created by: Andrey Zakhvatov
# $FreeBSD$
-#
PORTNAME= 3dc
PORTVERSION= 0.8.1
@@ -18,7 +14,7 @@ COMMENT= 3-Dimensional Chess for X Windo
LICENSE= GPLv2
-LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
+LIB_DEPENDS= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
USE_PERL5_BUILD=yes
USE_XORG= x11 xaw xext xmu xpm xt
Modified: head/games/xfrisk/Makefile
==============================================================================
--- head/games/xfrisk/Makefile Sat Mar 9 21:36:59 2013 (r313759)
+++ head/games/xfrisk/Makefile Sat Mar 9 21:43:02 2013 (r313760)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: xfrisk
-# Date created: 20 April 1997
-# Whom: Matthew Hunt <mph at pobox.com>
-#
+# Created by: Matthew Hunt <mph at pobox.com>
# $FreeBSD$
-#
PORTNAME= xfrisk
PORTVERSION= 1.2
@@ -16,7 +12,7 @@ DISTNAME= XFrisk-${PORTVERSION}
MAINTAINER= ports at FreeBSD.org
COMMENT= A multi-player networked Risk game for X11
-LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
+LIB_DEPENDS= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
NO_CDROM= Possible trademark infringement
Modified: head/games/xmine/Makefile
==============================================================================
--- head/games/xmine/Makefile Sat Mar 9 21:36:59 2013 (r313759)
+++ head/games/xmine/Makefile Sat Mar 9 21:43:02 2013 (r313760)
@@ -1,6 +1,4 @@
-# New ports collection makefile for: xmine
-# Date created: 25 December 1994
-# Whom: joerg
+# Created by: joerg
#
# $FreeBSD$
#
@@ -17,7 +15,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-Xaw
MAINTAINER= joerg at FreeBSD.org
COMMENT= The `Athena' port of the xminesweeper game
-LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
+LIB_DEPENDS= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
USE_IMAKE= yes
USE_XORG= x11 xaw xext xmu xt xpm sm ice
Modified: head/x11-toolkits/Xaw3d/Makefile
==============================================================================
--- head/x11-toolkits/Xaw3d/Makefile Sat Mar 9 21:36:59 2013 (r313759)
+++ head/x11-toolkits/Xaw3d/Makefile Sat Mar 9 21:43:02 2013 (r313760)
@@ -20,6 +20,7 @@ USE_XORG= x11 xext xmu xt sm ice xpm
USE_LDCONFIG= yes
SUB_FILES= pkg-message
+XAWVER= 8
SUB_LIST= XAWVER="${XAWVER}"
.include <bsd.port.pre.mk>
Modified: head/x11-toolkits/Xaw3d/pkg-plist
==============================================================================
--- head/x11-toolkits/Xaw3d/pkg-plist Sat Mar 9 21:36:59 2013 (r313759)
+++ head/x11-toolkits/Xaw3d/pkg-plist Sat Mar 9 21:43:02 2013 (r313760)
@@ -1,6 +1,6 @@
lib/libXaw3d.a
lib/libXaw3d.so
-lib/libXaw3d.so.%%XAWVER%%
+lib/libXaw3d.so.8
include/X11/Xaw3d/AllWidgets.h
include/X11/Xaw3d/AsciiSink.h
include/X11/Xaw3d/AsciiSinkP.h
Modified: head/x11-toolkits/neXtaw/Makefile
==============================================================================
--- head/x11-toolkits/neXtaw/Makefile Sat Mar 9 21:36:59 2013 (r313759)
+++ head/x11-toolkits/neXtaw/Makefile Sat Mar 9 21:43:02 2013 (r313760)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: neXtaw
-# Date created: 16 January 1997
-# Whom: Thomas Gellekum <tg at FreeBSD.org>
-#
+# Created by: Thomas Gellekum <tg at FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= neXtaw
PORTVERSION= 0.15.1
@@ -22,7 +18,7 @@ LDFLAGS+= -L${LOCALBASE}/lib
USE_LDCONFIG= yes
post-patch:
- @${REINPLACE_CMD} -e 's|version-info.*$$|version-info ${XAWVER}:0:0|g' \
+ @${REINPLACE_CMD} -e 's|version-info.*$$|version-info 8:0:0|g' \
${WRKSRC}/X11/neXtaw/Makefile.in
post-install:
Modified: head/x11-toolkits/neXtaw/pkg-plist
==============================================================================
--- head/x11-toolkits/neXtaw/pkg-plist Sat Mar 9 21:36:59 2013 (r313759)
+++ head/x11-toolkits/neXtaw/pkg-plist Sat Mar 9 21:43:02 2013 (r313760)
@@ -82,7 +82,7 @@ include/X11/neXtaw/laygram.h
lib/libneXtaw.a
lib/libneXtaw.la
lib/libneXtaw.so
-lib/libneXtaw.so.%%XAWVER%%
+lib/libneXtaw.so.8
%%PORTDOCS%%%%DOCSDIR%%/CHANGES
%%PORTDOCS%%%%DOCSDIR%%/FAQ
%%PORTDOCS%%%%DOCSDIR%%/README
More information about the svn-ports-all
mailing list