From owner-svn-ports-all@FreeBSD.ORG Fri Oct 4 08:52:37 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id C00DBA49; Fri, 4 Oct 2013 08:52:37 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9EB012EF3; Fri, 4 Oct 2013 08:52:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r948qbAi000801; Fri, 4 Oct 2013 08:52:37 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r948qXDp000770; Fri, 4 Oct 2013 08:52:33 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201310040852.r948qXDp000770@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 4 Oct 2013 08:52:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329271 - in head: audio/dumb audio/libmikmod audio/mp3info audio/muse audio/taglib audio/xmixer databases/sqsh devel/sdl12 editors/elvis editors/hte emulators/zsnes ftp/gftp ftp/pavuk ... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Oct 2013 08:52:37 -0000 Author: bapt Date: Fri Oct 4 08:52:32 2013 New Revision: 329271 URL: http://svnweb.freebsd.org/changeset/ports/329271 Log: Do not arbitrary rename packages Modified: head/audio/dumb/Makefile head/audio/libmikmod/Makefile head/audio/mp3info/Makefile head/audio/muse/Makefile head/audio/taglib/Makefile head/audio/xmixer/Makefile head/databases/sqsh/Makefile head/devel/sdl12/Makefile head/editors/elvis/Makefile head/editors/hte/Makefile head/emulators/zsnes/Makefile head/ftp/gftp/Makefile head/ftp/pavuk/Makefile head/games/freeciv/Makefile head/graphics/GraphicsMagick/Makefile head/graphics/GraphicsMagick12/Makefile head/graphics/GraphicsMagick13/Makefile head/graphics/ImageMagick/Makefile head/graphics/gifsicle/Makefile head/graphics/imlib2/Makefile head/graphics/xpdf/Makefile Modified: head/audio/dumb/Makefile ============================================================================== --- head/audio/dumb/Makefile Fri Oct 4 08:09:02 2013 (r329270) +++ head/audio/dumb/Makefile Fri Oct 4 08:52:32 2013 (r329271) @@ -23,7 +23,6 @@ LIB_DEPENDS+= alleg:${PORTSDIR}/devel/al PLIST_SUB+= ALLEGRO="" MAKE_ARGS= _PORT_ALLEGRO_CFLAGS="`allegro-config --cflags`" MAKE_ARGS+= LINK_ALLEGRO="-lm -L${LOCALBASE}/lib -lalleg" -PKGNAMESUFFIX= -allegro CONFLICTS= dumb-[0-9]* .else PLIST_SUB+= ALLEGRO="@comment " Modified: head/audio/libmikmod/Makefile ============================================================================== --- head/audio/libmikmod/Makefile Fri Oct 4 08:09:02 2013 (r329270) +++ head/audio/libmikmod/Makefile Fri Oct 4 08:52:32 2013 (r329271) @@ -26,7 +26,6 @@ INFO= mikmod .if ${HAVE_GNOME:Mesound}!="" USE_GNOME+= esound CONFIGURE_ARGS+= --enable-esd -PKGNAMESUFFIX= -esound .else CONFIGURE_ARGS+= --disable-esd .endif Modified: head/audio/mp3info/Makefile ============================================================================== --- head/audio/mp3info/Makefile Fri Oct 4 08:09:02 2013 (r329270) +++ head/audio/mp3info/Makefile Fri Oct 4 08:52:32 2013 (r329271) @@ -32,7 +32,6 @@ ALL_TARGET= doc mp3info .include .if ${PORT_OPTIONS:MGTK2} -PKGNAMESUFFIX= -gtk USE_GNOME+= gtk20 ALL_TARGET+= gmp3info MAKE_ARGS= install-gmp3info Modified: head/audio/muse/Makefile ============================================================================== --- head/audio/muse/Makefile Fri Oct 4 08:09:02 2013 (r329270) +++ head/audio/muse/Makefile Fri Oct 4 08:52:32 2013 (r329271) @@ -38,7 +38,6 @@ PLIST_FILES+= share/locale/${lang}/LC_ME .if ${PORT_OPTIONS:MX11} USE_GNOME+= gtk20 .else -PKGNAMESUFFIX= -nox11 CONFIGURE_ARGS+=--without-x --with-rubik .endif Modified: head/audio/taglib/Makefile ============================================================================== --- head/audio/taglib/Makefile Fri Oct 4 08:09:02 2013 (r329270) +++ head/audio/taglib/Makefile Fri Oct 4 08:52:32 2013 (r329271) @@ -27,7 +27,6 @@ USE_LDCONFIG= yes .include .if ${PORT_OPTIONS:MRCC} -PKGNAMESUFFIX= -rcc EXTRA_PATCHES+= ${FILESDIR}/extrapatch-rcc LIB_DEPENDS+= rcc:${PORTSDIR}/devel/librcc PLIST_SUB+= RCC="" Modified: head/audio/xmixer/Makefile ============================================================================== --- head/audio/xmixer/Makefile Fri Oct 4 08:09:02 2013 (r329270) +++ head/audio/xmixer/Makefile Fri Oct 4 08:52:32 2013 (r329271) @@ -23,7 +23,6 @@ NO_STAGE= yes .include .if ${HAVE_GNOME:Mgtk12}!="" -PKGNAMESUFFIX= -gtk USE_GNOME+= gtk12 PROGRAMS= xmixer xgmixer MLINKS+= xmixer.1 xgmixer.1 Modified: head/databases/sqsh/Makefile ============================================================================== --- head/databases/sqsh/Makefile Fri Oct 4 08:09:02 2013 (r329270) +++ head/databases/sqsh/Makefile Fri Oct 4 08:52:32 2013 (r329271) @@ -31,8 +31,6 @@ NO_STAGE= yes .if ${PORT_OPTIONS:MX11} USES+= motif CONFIGURE_ARGS+= --with-motif --with-x -.else -PKGNAMESUFFIX= -nox11 .endif post-patch: Modified: head/devel/sdl12/Makefile ============================================================================== --- head/devel/sdl12/Makefile Fri Oct 4 08:09:02 2013 (r329270) +++ head/devel/sdl12/Makefile Fri Oct 4 08:52:32 2013 (r329271) @@ -112,7 +112,6 @@ DISPLAY_MSG= ${DO_NADA} .if ${PORT_OPTIONS:MX11} USE_XORG= x11 xrender xrandr xextproto .else -PKGNAMESUFFIX= -nox11 CONFIGURE_ARGS+= --disable-video-x11 .endif Modified: head/editors/elvis/Makefile ============================================================================== --- head/editors/elvis/Makefile Fri Oct 4 08:09:02 2013 (r329270) +++ head/editors/elvis/Makefile Fri Oct 4 08:52:32 2013 (r329271) @@ -25,7 +25,6 @@ NO_STAGE= yes # Support building on systems with or without X11 installed. .if defined(WITHOUT_X11) -PKGNAMESUFFIX= -nox11 CONFIGURE_ARGS+= --without-x .else USE_XORG= xpm Modified: head/editors/hte/Makefile ============================================================================== --- head/editors/hte/Makefile Fri Oct 4 08:09:02 2013 (r329270) +++ head/editors/hte/Makefile Fri Oct 4 08:52:32 2013 (r329271) @@ -40,7 +40,6 @@ USE_XORG= x11 CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib .else -PKGNAMESUFFIX= -nox11 CONFIGURE_ARGS+=--disable-x11-textmode .endif Modified: head/emulators/zsnes/Makefile ============================================================================== --- head/emulators/zsnes/Makefile Fri Oct 4 08:09:02 2013 (r329270) +++ head/emulators/zsnes/Makefile Fri Oct 4 08:52:32 2013 (r329271) @@ -59,7 +59,6 @@ CONFIGURE_ARGS+= --disable-jma CONFIGURE_ARGS+= --with-x .else CONFIGURE_ARGS+= --without-x -PKGNAMESUFFIX= -nox11 .endif .if ${PORT_OPTIONS:MOPENGL} Modified: head/ftp/gftp/Makefile ============================================================================== --- head/ftp/gftp/Makefile Fri Oct 4 08:09:02 2013 (r329270) +++ head/ftp/gftp/Makefile Fri Oct 4 08:52:32 2013 (r329271) @@ -41,7 +41,6 @@ USE_GNOME+= gtk20 CONFIGURE_ENV+= _GTHREAD_LIBS="-lgthread-2.0" .else CONFIGURE_ARGS+=--disable-gtkport -PKGNAMESUFFIX= -nox11 USE_GNOME+= glib20 PLIST_SUB+= NOX11:="@comment " .endif @@ -60,7 +59,6 @@ PLIST_SUB+= NLS="@comment " .if ${HAVE_GNOME:Mgnomelibs}!="" && ! ${PORT_OPTIONS:MGTK2} USE_GNOME+= gnomeprefix gnomelibs -PKGNAMESUFFIX+= -gnome PLIST_SUB+= MYGNOME="" MAKE_ENV= HAVE_GNOME=1 .else Modified: head/ftp/pavuk/Makefile ============================================================================== --- head/ftp/pavuk/Makefile Fri Oct 4 08:09:02 2013 (r329270) +++ head/ftp/pavuk/Makefile Fri Oct 4 08:52:32 2013 (r329271) @@ -37,7 +37,6 @@ PLIST_SUB+= NLS="@comment " .include .if ${HAVE_GNOME:Mgtk20}!="" -PKGNAMESUFFIX= -gtk USE_GNOME+= gtk20 .else CONFIGURE_ARGS+= --disable-gtk Modified: head/games/freeciv/Makefile ============================================================================== --- head/games/freeciv/Makefile Fri Oct 4 08:09:02 2013 (r329270) +++ head/games/freeciv/Makefile Fri Oct 4 08:52:32 2013 (r329271) @@ -48,7 +48,6 @@ CONFIGURE_ARGS+=--enable-client=gtk CONFLICTS= freeciv-nox11-[0-9]* PLIST_SUB+= X11="" GTK="" .else -PKGNAMESUFFIX?= -nox11 CONFIGURE_ARGS+=--enable-client=no CONFLICTS= freeciv-[0-9]* PLIST_SUB+= X11="@comment " GTK="@comment " Modified: head/graphics/GraphicsMagick/Makefile ============================================================================== --- head/graphics/GraphicsMagick/Makefile Fri Oct 4 08:09:02 2013 (r329270) +++ head/graphics/GraphicsMagick/Makefile Fri Oct 4 08:52:32 2013 (r329271) @@ -76,7 +76,6 @@ CONFIGURE_ARGS+= --with-windows-font-dir .endif .if ${PORT_OPTIONS:MX11} == "" -PKGNAMESUFFIX+= -nox11 CONFIGURE_ARGS+=--without-x LIB_DEPENDS+= wmflite:${PORTSDIR}/graphics/libwmf-nox11 .else Modified: head/graphics/GraphicsMagick12/Makefile ============================================================================== --- head/graphics/GraphicsMagick12/Makefile Fri Oct 4 08:09:02 2013 (r329270) +++ head/graphics/GraphicsMagick12/Makefile Fri Oct 4 08:52:32 2013 (r329271) @@ -116,7 +116,6 @@ CONFIGURE_ARGS+= --with-windows-font-dir .endif .if ${PORT_OPTIONS:MX11} == "" -PKGNAMESUFFIX+= -nox11 CONFIGURE_ARGS+=--without-x LIB_DEPENDS+= wmflite:${PORTSDIR}/graphics/libwmf-nox11 .else Modified: head/graphics/GraphicsMagick13/Makefile ============================================================================== --- head/graphics/GraphicsMagick13/Makefile Fri Oct 4 08:09:02 2013 (r329270) +++ head/graphics/GraphicsMagick13/Makefile Fri Oct 4 08:52:32 2013 (r329271) @@ -117,7 +117,6 @@ CONFIGURE_ARGS+= --with-windows-font-dir .endif .if ${PORT_OPTIONS:MX11} == "" -PKGNAMESUFFIX+= -nox11 CONFIGURE_ARGS+=--without-x LIB_DEPENDS+= wmflite:${PORTSDIR}/graphics/libwmf-nox11 .else Modified: head/graphics/ImageMagick/Makefile ============================================================================== --- head/graphics/ImageMagick/Makefile Fri Oct 4 08:09:02 2013 (r329270) +++ head/graphics/ImageMagick/Makefile Fri Oct 4 08:52:32 2013 (r329271) @@ -350,7 +350,6 @@ USE_GHOSTSCRIPT= yes .endif .if defined(WITHOUT_X11) -PKGNAMESUFFIX+= -nox11 CONFIGURE_ARGS+= --without-x CONFLICTS+= ImageMagick-6* PLIST_SUB+= X11='@comment ' Modified: head/graphics/gifsicle/Makefile ============================================================================== --- head/graphics/gifsicle/Makefile Fri Oct 4 08:09:02 2013 (r329270) +++ head/graphics/gifsicle/Makefile Fri Oct 4 08:52:32 2013 (r329271) @@ -26,7 +26,6 @@ NO_STAGE= yes .include .if ! ${PORT_OPTIONS:MX11} -PKGNAMESUFFIX= -nox11 CONFIGURE_ARGS+= --without-x --disable-gifview .else USE_XORG= x11 Modified: head/graphics/imlib2/Makefile ============================================================================== --- head/graphics/imlib2/Makefile Fri Oct 4 08:09:02 2013 (r329270) +++ head/graphics/imlib2/Makefile Fri Oct 4 08:52:32 2013 (r329271) @@ -42,7 +42,6 @@ CONFIGURE_ARGS+= --disable-amd64 .if ! ${PORT_OPTIONS:MX11} CONFIGURE_ARGS+= --without-x -PKGNAMESUFFIX+= -nox11 PLIST_SUB= X11="@comment " .else USE_XORG= x11 sm xext Modified: head/graphics/xpdf/Makefile ============================================================================== --- head/graphics/xpdf/Makefile Fri Oct 4 08:09:02 2013 (r329270) +++ head/graphics/xpdf/Makefile Fri Oct 4 08:52:32 2013 (r329271) @@ -65,7 +65,6 @@ USES+= motif MAN1+= xpdf.1 PLIST_SUB+= X11="" .else -PKGNAMESUFFIX+= -nox11 CONFIGURE_ARGS+= --without-x PLIST_SUB+= X11="@comment " .endif