Date: Sat, 4 Jan 2003 20:00:26 -0500 (EST) From: Joe Marcus Clarke <marcus@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/46770: [PATCH] Patch editors/vim to use GNOMENG Message-ID: <200301050100.h0510QTc085136@shumai.marcuscom.com>
next in thread | raw e-mail | index | archive | help
>Number: 46770
>Category: ports
>Synopsis: [PATCH] Patch editors/vim to use GNOMENG
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sat Jan 04 17:10:02 PST 2003
>Closed-Date:
>Last-Modified:
>Originator: Joe Marcus Clarke
>Release: FreeBSD 4.7-STABLE i386
>Organization:
>Environment:
System: FreeBSD shumai.marcuscom.com 4.7-STABLE FreeBSD 4.7-STABLE #6: Fri Jan 3 18:17:43 EST 2003 marcus@shumai.marcuscom.com:/usr/obj/usr/src/sys/SHUMAI i386
>Description:
The FreeBSD GNOME team is trying to phase out the old style of configuring
GNOME-based ports. The attached patch moves vim over to the new GNOMENG
framework.
>How-To-Repeat:
>Fix:
--- vim.diff begins here ---
diff -ruN vim.orig/Makefile vim/Makefile
--- vim.orig/Makefile Sat Jan 4 19:50:53 2003
+++ vim/Makefile Sat Jan 4 19:54:53 2003
@@ -41,6 +41,7 @@
USE_BZIP2= yes
USE_REINPLACE= yes
+USE_GNOMENG= yes
DIST_SUBDIR= vim
WRKSRC= ${WRKDIR}/vim${PORTVERSION:C/\.[0-9]*$//:S/.//g}/src
PATCH_DIST_ARGS= -d ${WRKSRC:S/src$//} --forward --quiet -E ${PATCH_DIST_STRIP}
@@ -96,20 +97,24 @@
.if !defined(WITHOUT_X11)
# for now default the GUI to the GTK+ one
# will be reviewed when the GTK+ 1.{3,4} behemoth is released
-.if !defined(WITH_ATHENA) && !defined(WITH_GTK) && !defined(WITH_MOTIF) && !defined(WITH_GNOME)
-WITH_GTK= yes
+.if !defined(WITH_ATHENA) && !defined(WITH_MOTIF) && !defined(WITH_GNOME)
+WITH_GNOME= gtk12
.endif
.if defined(WITH_ATHENA)
MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=athena" ${I18N}
-.elif defined(WITH_GTK)
-USE_GTK= yes
-MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gtk --with-gtk-prefix=${X11BASE}" ${I18N}
-MAKE_ARGS+= X_LIBS="$(X_LIBS) -lXt"
.elif defined(WITH_GNOME)
-USE_GNOME= yes
+.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=${X11BASE}" ${I18N}
MAKE_ARGS+= X_LIBS="$(X_LIBS) -lXt"
+.else
+USE_GNOME= gtk12
+MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gtk --with-gtk-prefix=${X11BASE}" ${I18N}
+MAKE_ARGS+= X_LIBS="$(X_LIBS) -lXt"
+.endif
.elif defined(WITH_MOTIF)
USE_MOTIF= yes
MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=motif --with-motif-lib=\"${MOTIFLIB}\"" MOTIFHOME=${X11BASE} ${I18N}
@@ -129,7 +134,7 @@
.endif
# Until the bsd.gnome.mk people fix their damned file
-.if defined(WITH_GTK)
+.if defined(WITH_GNOME)
USE_XLIB= yes
.endif
--- vim.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200301050100.h0510QTc085136>