From owner-svn-ports-head@FreeBSD.ORG Tue Oct 15 09:47:14 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 67F70DF3; Tue, 15 Oct 2013 09:47:14 +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 5271620B3; Tue, 15 Oct 2013 09:47:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9F9lEJ0077948; Tue, 15 Oct 2013 09:47:14 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9F9lCAu077924; Tue, 15 Oct 2013 09:47:12 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201310150947.r9F9lCAu077924@svn.freebsd.org> From: Baptiste Daroussin Date: Tue, 15 Oct 2013 09:47:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330378 - in head: audio/gqmpeg audio/soundtracker deskutils/gaddr editors/gnotepad+ ftp/gftp games/xpuyopuyo graphics/jumpgis japanese/nethack34 x11/metisse X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Oct 2013 09:47:14 -0000 Author: bapt Date: Tue Oct 15 09:47:11 2013 New Revision: 330378 URL: http://svnweb.freebsd.org/changeset/ports/330378 Log: Remove all options bringing gnome1 libraries Modified: head/audio/gqmpeg/Makefile head/audio/soundtracker/Makefile head/deskutils/gaddr/Makefile head/editors/gnotepad+/Makefile head/ftp/gftp/Makefile head/ftp/gftp/pkg-plist head/games/xpuyopuyo/Makefile head/graphics/jumpgis/Makefile head/graphics/jumpgis/pkg-plist head/japanese/nethack34/Makefile head/x11/metisse/Makefile Modified: head/audio/gqmpeg/Makefile ============================================================================== --- head/audio/gqmpeg/Makefile Tue Oct 15 09:43:34 2013 (r330377) +++ head/audio/gqmpeg/Makefile Tue Oct 15 09:47:11 2013 (r330378) @@ -24,8 +24,8 @@ RUN_DEPENDS+= mpg123:${PORTSDIR}/audio/m USE_GNOME= gdkpixbuf NO_STAGE= yes USES= gettext -WANT_GNOME= yes USE_AUTOTOOLS= autoconf213 libtool +CONFIGURE_ENV+= USE_GNOME="" CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15 LDFLAGS+= -L${LOCALBASE}/lib -lintl @@ -34,13 +34,6 @@ MAN1= gqmpeg.1 .include -.if ${HAVE_GNOME:Mgnomelibs}!="" -USE_GNOME+= gnomeprefix gnomelibs -CONFIGURE_ENV+= USE_GNOME="yes" -.else -CONFIGURE_ENV+= USE_GNOME="" -.endif - .if !defined(WITH_MPG321) pre-everything:: @${ECHO_MSG} Modified: head/audio/soundtracker/Makefile ============================================================================== --- head/audio/soundtracker/Makefile Tue Oct 15 09:43:34 2013 (r330377) +++ head/audio/soundtracker/Makefile Tue Oct 15 09:47:11 2013 (r330378) @@ -4,7 +4,7 @@ PORTNAME= soundtracker PORTVERSION= 0.6.8 PORTREVISION= 14 -CATEGORIES= audio gnome +CATEGORIES= audio MASTER_SITES= http://www.soundtracker.org/dl/%SUBDIR%/ MASTER_SITE_SUBDIR= v${PORTVERSION:R} @@ -13,7 +13,7 @@ COMMENT= Mod player/tracking tool which LICENSE= GPLv2 -LIB_DEPENDS= sndfile:${PORTSDIR}/audio/libsndfile +LIB_DEPENDS= libsndfile.so:${PORTSDIR}/audio/libsndfile GNU_CONFIGURE= yes USES= pathfix pkgconfig @@ -23,11 +23,12 @@ USE_GNOME= esound gdkpixbuf CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -OPTIONS_DEFINE= GNOME1 JACK SDL NLS +OPTIONS_DEFINE= JACK SDL NLS OPTIONS_DEFINE_i386= ASM -GNOME1_DESC= Use GNOME 1.x (enables envelope editing) ASM_DESC= Use optimized assembly (potentially unstable) +CONFIGURE_ARGS+= --disable-gnome + DESKTOP_ENTRIES="SoundTracker" "Pattern-oriented music editor" \ "${PREFIX}/share/pixmaps/${PORTNAME}.xpm" \ "soundtracker" "AudioVideo;Audio;AudioVideoEditing;" false @@ -38,13 +39,6 @@ DESKTOP_ENTRIES="SoundTracker" "Pattern- CONFIGURE_ARGS+= --enable-asm .endif -.if ${PORT_OPTIONS:MGNOME} -USE_GNOME+= gnomelibs gnomeprefix -CONFIGURE_ARGS+= --enable-gnome -.else -CONFIGURE_ARGS+= --disable-gnome -.endif - .if ${PORT_OPTIONS:MJACK} LIB_DEPENDS+= jack:${PORTSDIR}/audio/jack .else Modified: head/deskutils/gaddr/Makefile ============================================================================== --- head/deskutils/gaddr/Makefile Tue Oct 15 09:43:34 2013 (r330377) +++ head/deskutils/gaddr/Makefile Tue Oct 15 09:47:11 2013 (r330378) @@ -14,16 +14,7 @@ COMMENT= GTK 1.x address book PLIST_FILES= bin/gaddr GNU_CONFIGURE= yes USE_GNOME= gtk12 -WANT_GNOME= yes MAKE_ARGS+= PREFIX="${STAGEDIR}${PREFIX}" -.include - -.if ${HAVE_GNOME:Mgnomelibs}!="" -USE_GNOME+= gnomelibs -PKGNAMESUFFIX= -gnome -CONFIGURE_ARGS+=--enable-gnome -.endif - .include Modified: head/editors/gnotepad+/Makefile ============================================================================== --- head/editors/gnotepad+/Makefile Tue Oct 15 09:43:34 2013 (r330377) +++ head/editors/gnotepad+/Makefile Tue Oct 15 09:47:11 2013 (r330378) @@ -26,6 +26,8 @@ GNU_CONFIGURE= yes MAN1= gnp.1 +CONFIGURE_ARGS= --disable-gnome + CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -34,13 +36,6 @@ DOCVERSION= 1.2.0 NO_STAGE= yes .include -.if ${HAVE_GNOME:Mgnomelibs}!="" -USE_GNOME+= gnomelibs -PKGNAMESUFFIX= -gnome -.else -CONFIGURE_ARGS+=--disable-gnome -.endif - .if defined(NOPORTDOCS) PLIST_SUB+= NOPORTDOCS="" .else Modified: head/ftp/gftp/Makefile ============================================================================== --- head/ftp/gftp/Makefile Tue Oct 15 09:43:34 2013 (r330377) +++ head/ftp/gftp/Makefile Tue Oct 15 09:47:11 2013 (r330378) @@ -57,14 +57,6 @@ PLIST_SUB+= NLS="@comment " .include -.if ${HAVE_GNOME:Mgnomelibs}!="" && ! ${PORT_OPTIONS:MGTK2} -USE_GNOME+= gnomeprefix gnomelibs -PLIST_SUB+= MYGNOME="" -MAKE_ENV= HAVE_GNOME=1 -.else -PLIST_SUB+= MYGNOME="@comment " -.endif - post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ Modified: head/ftp/gftp/pkg-plist ============================================================================== --- head/ftp/gftp/pkg-plist Tue Oct 15 09:43:34 2013 (r330377) +++ head/ftp/gftp/pkg-plist Tue Oct 15 09:47:11 2013 (r330378) @@ -1,7 +1,6 @@ bin/gftp %%NOX11:%%bin/gftp-gtk bin/gftp-text -%%NOX11:%%%%MYGNOME%%share/applications/gftp.desktop %%NOX11:%%%%DATADIR%%/COPYING %%NOX11:%%%%DATADIR%%/bookmarks %%NOX11:%%%%DATADIR%%/connect.xpm @@ -89,7 +88,6 @@ bin/gftp-text %%NLS%%share/locale/zh_CN/LC_MESSAGES/gftp.mo %%NLS%%share/locale/zh_HK/LC_MESSAGES/gftp.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/gftp.mo -%%NOX11:%%%%MYGNOME%%share/pixmaps/gftp.png %%NOX11:%%@dirrm %%DATADIR%% @dirrmtry share/applications @dirrmtry share/locale/dz/LC_MESSAGES Modified: head/games/xpuyopuyo/Makefile ============================================================================== --- head/games/xpuyopuyo/Makefile Tue Oct 15 09:43:34 2013 (r330377) +++ head/games/xpuyopuyo/Makefile Tue Oct 15 09:47:11 2013 (r330378) @@ -22,6 +22,8 @@ OPTIONS_DEFINE= MIKMOD ROTATE_FIXED AIBR ROTATE_FIXED_DESC= Fix position of one blob during rotation AIBREED_DESC= Allow AI breeding +CONFIGURE_ARGS+= --without-gnome + NO_STAGE= yes .include @@ -30,14 +32,6 @@ LIB_DEPENDS+= mikmod.2:${PORTSDIR}/audio CONFIGURE_ARGS+=--with-libmikmod-prefix=${LOCALBASE} .endif -.if ${HAVE_GNOME:Mgnomelibs}!="" -USES= pathfix -USE_GNOME+= gnomelibs -PKGNAMESUFFIX= -gnome -.else -CONFIGURE_ARGS+= --without-gnome -.endif - .if ${PORT_OPTIONS:MROTATE_FIXED} CONFIGURE_ARGS+=--enable-rotate-fixed .endif Modified: head/graphics/jumpgis/Makefile ============================================================================== --- head/graphics/jumpgis/Makefile Tue Oct 15 09:43:34 2013 (r330377) +++ head/graphics/jumpgis/Makefile Tue Oct 15 09:47:11 2013 (r330378) @@ -22,7 +22,6 @@ USE_JAVA= yes JAVA_VERSION= 1.6+ USE_ZIP= yes NO_BUILD= yes -WANT_GNOME= yes PORTDOCS= * REINPLACE_ARGS= -i "" @@ -30,12 +29,6 @@ REINPLACE_ARGS= -i "" NO_STAGE= yes .include -.if ${HAVE_GNOME:Mgnomelibs}!="" -PLIST_SUB+= GNOMELINKS="" -.else -PLIST_SUB+= GNOMELINKS="@comment " -.endif - post-patch: @${REINPLACE_CMD} -e "s,#!sh,#!/bin/sh,g" \ -e "s,^LIB=../lib,LIB=${TARGET_DIR}/lib,g" \ @@ -58,10 +51,4 @@ do-install: @${ECHO_MSG} "---> Skipping documentation" .endif -.if ${HAVE_GNOME:Mgnomelibs}!="" - @${ECHO_MSG} "---> Installing GNOME application links" - ${INSTALL_DATA} ${DISTDIR}/jump.desktop ${LOCALBASE}/share/applications/ - ${INSTALL_DATA} ${DISTDIR}/jump.png ${LOCALBASE}/share/pixmaps/ -.endif - .include Modified: head/graphics/jumpgis/pkg-plist ============================================================================== --- head/graphics/jumpgis/pkg-plist Tue Oct 15 09:43:34 2013 (r330377) +++ head/graphics/jumpgis/pkg-plist Tue Oct 15 09:47:11 2013 (r330378) @@ -7,10 +7,7 @@ jumpgis/lib/jump-1.1.2.jar jumpgis/lib/junit.jar jumpgis/lib/xercesImpl.jar jumpgis/lib/xml-apis.jar -%%GNOMELINKS%%share/applications/jump.desktop -%%GNOMELINKS%%share/pixmaps/jump.png @exec mkdir -p %D/jumpgis/lib/ext @dirrm jumpgis/lib/ext @dirrm jumpgis/lib @dirrm jumpgis -%%GNOMELINKS%%@dirrmtry share/applications Modified: head/japanese/nethack34/Makefile ============================================================================== --- head/japanese/nethack34/Makefile Tue Oct 15 09:43:34 2013 (r330377) +++ head/japanese/nethack34/Makefile Tue Oct 15 09:47:11 2013 (r330378) @@ -36,11 +36,7 @@ HACKDOCSDIR?= share/doc/ja/nethack USE_XORG= xaw xpm GRAPHICS= X11_GRAPHICS .else -.if ${PKGNAMESUFFIX} == "-gnome" -CATEGORIES+= gnome -USE_GNOME= gnomelibs -GRAPHICS= GNOME_GRAPHICS -.elif ${PKGNAMESUFFIX} == "-nox11" +.if ${PKGNAMESUFFIX} == "-nox11" GRAPHICS= # none .endif .endif Modified: head/x11/metisse/Makefile ============================================================================== --- head/x11/metisse/Makefile Tue Oct 15 09:43:34 2013 (r330377) +++ head/x11/metisse/Makefile Tue Oct 15 09:47:11 2013 (r330378) @@ -101,10 +101,6 @@ USE_GNOME+= gtk12 USE_GNOME+= imlib .endif -.if ${HAVE_GNOME:Mgnomelibs} || ${PORT_OPTIONS:MGNOME} -USE_GNOME+= gnomelibs -.endif - MAN1= FvwmAnimate.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 FvwmButtons.1 \ FvwmCommand.1 FvwmConsole.1 FvwmConsoleC.pl.1 FvwmCpp.1 FvwmDebug.1 \ FvwmDragWell.1 FvwmEvent.1 FvwmForm.1 FvwmGtkDebug.1 FvwmIconBox.1 \