ports/151421: [PATCH] editors/vim: remove obsolete options (gtk1/gnome1)

[Herbert J. Skuhra]

>Number:         151421
>Category:       ports
>Synopsis:       [PATCH] editors/vim: remove obsolete options (gtk1/gnome1)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Oct 13 08:20:07 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Herbert J. Skuhra
>Release:        FreeBSD 8.1-STABLE amd64
>Organization:
>Environment:
FreeBSD oslo.ath.cx 8.1-STABLE FreeBSD 8.1-STABLE #0: Fri Sep 24 21:12:01 CEST 2010     root at oslo.ath.cx:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
I think the port editors/vim uses options (gtk1 & gnome1) that have been removed in vim-7.3!

VIM 7.2:

% ./configure --help |grep gui
  --enable-gui=OPTS     X11 GUI default=auto OPTS=auto/no/gtk/gtk2/gnome/gnome2/motif/athena/neXtaw/photon/carbon

VIM 7.3:

 ./configure --help |grep gui
  --enable-gui=OPTS     X11 GUI default=auto OPTS=auto/no/gtk2/gnome2/motif/athena/neXtaw/photon/carbon
>How-To-Repeat:

>Fix:
The attached patch updates OPTIONS: gtk1/gnome1 removed and gnome2 added.

Patch attached with submission follows:

diff -ru editors/vim.orig/Makefile editors/vim/Makefile
--- editors/vim.orig/Makefile	2010-10-13 09:45:20.000000000 +0200
+++ editors/vim/Makefile	2010-10-13 10:05:05.000000000 +0200
@@ -130,29 +130,23 @@
 
 .if !defined(WITHOUT_X11)
 #	for now default the GUI to the GTK+ one
-. if !defined(WITH_X11_ONLY) && !defined(WITH_ATHENA) && !defined(WITH_MOTIF) && !defined(WITH_GNOME) && !defined(WITH_GTK1) && !defined(WITH_GTK2)
+. if !defined(WITH_X11_ONLY) && !defined(WITH_ATHENA) && !defined(WITH_MOTIF) && !defined(WITH_GNOME2) && !defined(WITH_GTK2)
 WITH_GTK2=	yes
 . endif
 
 . if defined(WITH_ATHENA)
 MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=athena" ${I18N}
-. elif defined(WITH_GTK1)
-USE_GNOME=	gtk12
-MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=gtk --with-gtk-prefix=${LOCALBASE}" ${I18N}
-MAKE_ARGS+=	X_LIBS="$(X_LIBS) -lXt"
-USE_XORG+=	xt
-PKGNAMESUFFIX=	-gtk1
 . elif defined(WITH_GTK2)
 USE_GNOME=	gtk20
-MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=gtk2 --with-gtk-prefix=${LOCALBASE}" ${I18N}
+MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=gtk2" ${I18N}
 MAKE_ARGS+=	X_LIBS="$(X_LIBS) -lXt"
 USE_XORG+=	xt
-. elif defined(WITH_GNOME)
-.  if ${WITH_GNOME:Mgnomelibs}!="" || ${WITH_GNOME}=="yes" || \
-	${WITH_GNOME}=="1"
-USE_GNOME=	gnomelibs gnomeprefix
-PKGNAMESUFFIX=	-gnome
-MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=gnome --with-gtk-prefix=${LOCALBASE}" ${I18N}
+. elif defined(WITH_GNOME2)
+.  if ${WITH_GNOME2:Mlibgnomeui}!="" || ${WITH_GNOME2}=="yes" || \
+	${WITH_GNOME2}=="1"
+USE_GNOME=	libgnomeui	
+PKGNAMESUFFIX=	-gnome2
+MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=gnome2" ${I18N}
 MAKE_ARGS+=	X_LIBS="$(X_LIBS) -lXt"
 USE_XORG+=	xt
 .  endif
@@ -192,8 +186,6 @@
 pre-configure:
 	@(cd ${WRKSRC} ; ${MAKE} distclean)
 	@${REINPLACE_CMD} -e ' \
-		s|\$$gtk_config_prefix/bin/gtk-config|\$${GTK_CONFIG}|g; \
-		s|\$$gtk_config_exec_prefix/bin/gtk-config|\$${GTK_CONFIG}|g; \
 		s|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/auto/configure
 .if defined(WITH_XTERM_SAVE)
@@ -244,12 +236,6 @@
 show-options:
 	@${MAKE} -DWITH_OPTIONS showconfig
 
-.if defined(WITH_GTK)
-.BEGIN:
-	@${ECHO_CMD} "WITH_GTK has been renamed WITH_GTK1."
-	@exit 1
-.endif
-
 cklatest:
 	-ncftpls \
 	    ftp://ftp.vim.org/pub/vim/patches/${PORTVERSION:C/\.[0-9a-z]*$//}/ \
diff -ru editors/vim.orig/options editors/vim/options
--- editors/vim.orig/options	2010-10-13 09:45:20.000000000 +0200
+++ editors/vim/options	2010-10-13 09:54:41.000000000 +0200
@@ -9,7 +9,6 @@
 		X11_ONLY "CLI-only Vim, but with basic X11 support" off \
 		XTERM_SAVE "Restore xterm screen after exit" off \
 		ATHENA "Athena GUI" off \
-		GTK1 "GTK+ 1.2 GUI" off \
 		GTK2 "GTK2 GUI" off \
-		GNOME "Gnome1 GUI" off \
+		GNOME2 "Gnome2 GUI" off \
 		MOTIF "Motif GUI" off \


>Release-Note:
>Audit-Trail:
>Unformatted: