Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 5 May 2000 22:13:53 -0700
From:      Jeremy Lea <reg@FreeBSD.ORG>
To:        "David O'Brien" <obrien@FreeBSD.ORG>
Cc:        ports@FreeBSD.ORG
Subject:   Re: Proposal for USE_* directives in Mk/bsd.port.mk
Message-ID:  <20000505221353.A80558@shale.csir.co.za>
In-Reply-To: <20000505180558.A9575@dragon.nuxi.com>; from obrien@FreeBSD.ORG on Fri, May 05, 2000 at 06:05:58PM -0700
References:  <20000430161123149.IASO.904.t-mta2.odn.ne.jp@mta2.odn.ne.jp> <20000430105058.B309@shale.csir.co.za> <20000430181355835.KOJS.890.t-mta4.odn.ne.jp@mta4.odn.ne.jp> <20000430120305.C309@shale.csir.co.za> <20000504225027.B40806@dragon.nuxi.com> <20000504235443.H309@shale.csir.co.za> <20000505180558.A9575@dragon.nuxi.com>

next in thread | previous in thread | raw e-mail | index | archive | help
Hi,

On Fri, May 05, 2000 at 06:05:58PM -0700, David O'Brien wrote:
> On Thu, May 04, 2000 at 11:54:43PM -0700, Jeremy Lea wrote:
> > > > USE_* are not user options, and should *never* be set from the command
> > > > line.
> > > Uh... Wrong.
> > Elaborate.
> 
> I intend people to build vim with ``make HAVE_GTK=1'' (or USE_GTK if
> renamed).  Same for several of my other ports.

USE_GTK is going to do something soon...  WITH_GTK and WITHOUT_GTK will
be the switches.  http://people.freebsd.org/~reg/

I missed vim5 in the cleanup - didn't check for HAVE_*.  editors/vim5
looks something like this:

editors/vim5:
  Maintainer:	obrien@FreeBSD.org
  Changes: Makefile patches/patch-02 pkg/PLIST
  Adds   :
  Removes:

--- /usr/ports.ref/editors/vim5/Makefile	Fri Apr 21 02:06:51 2000
+++ editors/vim5/Makefile	Fri Apr 21 01:12:28 2000
@@ -28,6 +28,8 @@
 Y2K=		http://www.vim.org/y2k.html
 SLAVEDIRS=	editors/vim-lite
 
+WANT_GTK=	yes
+
 .if defined(PACKAGE_BUILDING) && !defined(LITE)
 BUILD_DEPENDS=	tclsh8.0:${PORTSDIR}/lang/tcl80 \
 		python:${PORTSDIR}/lang/python
@@ -43,15 +45,17 @@
 ALL_TARGET=	#
 PLIST_SUB=	VIM_VER=${DISTNAME:S/-//:S/.//}
 MAN1=		vim.1 vimtutor.1 xxd.1 ectags.1
-MLINKS=		vim.1 rvim.1  vim.1 rview.1  ectags.1 etags.1
+MLINKS=		vim.1 rvim.1  vim.1 rview.1  vim.1 ex.1  vim.1 view.1 ectags.1 etags.1
 
 .if !defined(LITE)
 MLINKS+=	vim.1 gvim.1  vim.1 gview.1  vim.1 rgvim.1  vim.1 rgview.1
 
 MAKE_FLAGS:=	X_LIBS=-lxpg4 CONF_OPT_MAX="--enable-max-features" ${MAKE_FLAGS}
 
+.include <bsd.port.pre.mk>
+
 .if defined(HAVE_GTK)
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+USE_GTK=	yes
 MAKE_FLAGS:=	CONF_OPT_GUI="--enable-gui=gtk --with-gtk-prefix=${X11BASE} --enable-multibyte --enable-fontset --enable-multibyte --enable-xim" ${MAKE_FLAGS}
 .elif defined(HAVE_MOTIF)
 REQUIRES_MOTIF=	yes
@@ -81,4 +85,4 @@
 	@${RM} -f ${PREFIX}/man/man1/etags.1
 	@${MV} ${PREFIX}/man/man1/ctags.1 ${PREFIX}/man/man1/ectags.1
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- /usr/ports.ref/editors/vim5/patches/patch-02	Thu Oct 28 00:22:03 1999
+++ editors/vim5/patches/patch-02	Sun Jan 30 12:35:44 2000
@@ -5,12 +5,12 @@
    if test "x$gtk_config_prefix" != "x" ; then
       gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
 -     GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
-+     GTK_CONFIG=$gtk_config_prefix/bin/gtk12-config
++     GTK_CONFIG=${GTK_CONFIG}
    fi
    if test "x$gtk_config_exec_prefix" != "x" ; then
       gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
 -     GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
-+     GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk12-config
++     GTK_CONFIG=${GTK_CONFIG}
    fi
    if test "X$GTK_CONFIG" = "X"; then
      # Extract the first word of "gtk-config", so it can be a program name with args.
--- /usr/ports.ref/editors/vim5/pkg/PLIST	Wed Mar  1 23:47:18 2000
+++ editors/vim5/pkg/PLIST	Thu Mar  2 00:03:13 2000
@@ -13,6 +13,7 @@
 bin/rview
 bin/rvim
 @comment bin/view
+share/vim/%%VIM_VER%%/bugreport.vim
 share/vim/%%VIM_VER%%/doc/autocmd.txt
 share/vim/%%VIM_VER%%/doc/change.txt
 share/vim/%%VIM_VER%%/doc/cmdline.txt
@@ -61,8 +62,9 @@
 share/vim/%%VIM_VER%%/doc/scroll.txt
 share/vim/%%VIM_VER%%/doc/starting.txt
 share/vim/%%VIM_VER%%/doc/syntax.txt
-share/vim/%%VIM_VER%%/doc/term.txt
+share/vim/%%VIM_VER%%/doc/tags
 share/vim/%%VIM_VER%%/doc/tagsearch.txt
+share/vim/%%VIM_VER%%/doc/term.txt
 share/vim/%%VIM_VER%%/doc/tips.txt
 share/vim/%%VIM_VER%%/doc/todo.txt
 share/vim/%%VIM_VER%%/doc/uganda.txt
@@ -71,11 +73,38 @@
 share/vim/%%VIM_VER%%/doc/version4.txt
 share/vim/%%VIM_VER%%/doc/version5.txt
 share/vim/%%VIM_VER%%/doc/vi_diff.txt
+share/vim/%%VIM_VER%%/doc/vim2html.pl
 share/vim/%%VIM_VER%%/doc/visual.txt
 share/vim/%%VIM_VER%%/doc/windows.txt
-share/vim/%%VIM_VER%%/doc/tags
-share/vim/%%VIM_VER%%/doc/vim2html.pl
-share/vim/%%VIM_VER%%/syntax
+share/vim/%%VIM_VER%%/filetype.vim
+share/vim/%%VIM_VER%%/ftoff.vim
+share/vim/%%VIM_VER%%/gvimrc_example.vim
+share/vim/%%VIM_VER%%/macros/README.txt
+share/vim/%%VIM_VER%%/macros/diffwin.vim
+share/vim/%%VIM_VER%%/macros/dvorak
+share/vim/%%VIM_VER%%/macros/hanoi/click.me
+share/vim/%%VIM_VER%%/macros/hanoi/hanoi.vim
+share/vim/%%VIM_VER%%/macros/hanoi/poster
+share/vim/%%VIM_VER%%/macros/html
+share/vim/%%VIM_VER%%/macros/justify.vim
+share/vim/%%VIM_VER%%/macros/life/click.me
+share/vim/%%VIM_VER%%/macros/life/life.vim
+share/vim/%%VIM_VER%%/macros/maze/Makefile
+share/vim/%%VIM_VER%%/macros/maze/README.txt
+share/vim/%%VIM_VER%%/macros/maze/maze.c
+share/vim/%%VIM_VER%%/macros/maze/maze_5.78
+share/vim/%%VIM_VER%%/macros/maze/maze_mac
+share/vim/%%VIM_VER%%/macros/maze/mazeansi.c
+share/vim/%%VIM_VER%%/macros/maze/poster
+share/vim/%%VIM_VER%%/macros/shellmenu.vim
+share/vim/%%VIM_VER%%/macros/swapmous.vim
+share/vim/%%VIM_VER%%/macros/urm/README.txt
+share/vim/%%VIM_VER%%/macros/urm/examples
+share/vim/%%VIM_VER%%/macros/urm/urm
+share/vim/%%VIM_VER%%/macros/urm/urm.vim
+share/vim/%%VIM_VER%%/menu.vim
+share/vim/%%VIM_VER%%/optwin.vim
+share/vim/%%VIM_VER%%/scripts.vim
 share/vim/%%VIM_VER%%/syntax/2html.vim
 share/vim/%%VIM_VER%%/syntax/abc.vim
 share/vim/%%VIM_VER%%/syntax/abel.vim
@@ -253,8 +282,8 @@
 share/vim/%%VIM_VER%%/syntax/viminfo.vim
 share/vim/%%VIM_VER%%/syntax/vrml.vim
 share/vim/%%VIM_VER%%/syntax/web.vim
-share/vim/%%VIM_VER%%/syntax/winbatch.vim
 share/vim/%%VIM_VER%%/syntax/whitespace.vim
+share/vim/%%VIM_VER%%/syntax/winbatch.vim
 share/vim/%%VIM_VER%%/syntax/xdefaults.vim
 share/vim/%%VIM_VER%%/syntax/xmath.vim
 share/vim/%%VIM_VER%%/syntax/xml.vim
@@ -265,46 +294,6 @@
 share/vim/%%VIM_VER%%/syntax/yacc.vim
 share/vim/%%VIM_VER%%/syntax/z8a.vim
 share/vim/%%VIM_VER%%/syntax/zsh.vim
-share/vim/%%VIM_VER%%/tutor
-share/vim/%%VIM_VER%%/tutor/README.txt
-share/vim/%%VIM_VER%%/tutor/tutor
-share/vim/%%VIM_VER%%/menu.vim
-share/vim/%%VIM_VER%%/bugreport.vim
-share/vim/%%VIM_VER%%/vimrc_example.vim
-share/vim/%%VIM_VER%%/gvimrc_example.vim
-share/vim/%%VIM_VER%%/filetype.vim
-share/vim/%%VIM_VER%%/ftoff.vim
-share/vim/%%VIM_VER%%/scripts.vim
-share/vim/%%VIM_VER%%/optwin.vim
-share/vim/%%VIM_VER%%/macros
-share/vim/%%VIM_VER%%/macros/README.txt
-share/vim/%%VIM_VER%%/macros/diffwin.vim
-share/vim/%%VIM_VER%%/macros/dvorak
-share/vim/%%VIM_VER%%/macros/hanoi
-share/vim/%%VIM_VER%%/macros/hanoi/poster
-share/vim/%%VIM_VER%%/macros/hanoi/click.me
-share/vim/%%VIM_VER%%/macros/hanoi/hanoi.vim
-share/vim/%%VIM_VER%%/macros/html
-share/vim/%%VIM_VER%%/macros/justify.vim
-share/vim/%%VIM_VER%%/macros/life
-share/vim/%%VIM_VER%%/macros/life/click.me
-share/vim/%%VIM_VER%%/macros/life/life.vim
-share/vim/%%VIM_VER%%/macros/maze
-share/vim/%%VIM_VER%%/macros/maze/README.txt
-share/vim/%%VIM_VER%%/macros/maze/Makefile
-share/vim/%%VIM_VER%%/macros/maze/maze.c
-share/vim/%%VIM_VER%%/macros/maze/maze_5.78
-share/vim/%%VIM_VER%%/macros/maze/mazeansi.c
-share/vim/%%VIM_VER%%/macros/maze/maze_mac
-share/vim/%%VIM_VER%%/macros/maze/poster
-share/vim/%%VIM_VER%%/macros/shellmenu.vim
-share/vim/%%VIM_VER%%/macros/swapmous.vim
-share/vim/%%VIM_VER%%/macros/urm
-share/vim/%%VIM_VER%%/macros/urm/urm
-share/vim/%%VIM_VER%%/macros/urm/urm.vim
-share/vim/%%VIM_VER%%/macros/urm/examples
-share/vim/%%VIM_VER%%/macros/urm/README.txt
-share/vim/%%VIM_VER%%/tools
 share/vim/%%VIM_VER%%/tools/README.txt
 share/vim/%%VIM_VER%%/tools/blink.c
 share/vim/%%VIM_VER%%/tools/ccfilter.1
@@ -324,14 +313,17 @@
 share/vim/%%VIM_VER%%/tools/vimm
 share/vim/%%VIM_VER%%/tools/vimspell.sh
 share/vim/%%VIM_VER%%/tools/vimspell.txt
-@dirrm share/vim/%%VIM_VER%%/doc
-@dirrm share/vim/%%VIM_VER%%/macros/hanoi
-@dirrm share/vim/%%VIM_VER%%/macros/life
-@dirrm share/vim/%%VIM_VER%%/macros/maze
+share/vim/%%VIM_VER%%/tutor/README.txt
+share/vim/%%VIM_VER%%/tutor/tutor
+share/vim/%%VIM_VER%%/vimrc_example.vim
+@dirrm share/vim/%%VIM_VER%%/tutor
+@dirrm share/vim/%%VIM_VER%%/tools
+@dirrm share/vim/%%VIM_VER%%/syntax
 @dirrm share/vim/%%VIM_VER%%/macros/urm
+@dirrm share/vim/%%VIM_VER%%/macros/maze
+@dirrm share/vim/%%VIM_VER%%/macros/life
+@dirrm share/vim/%%VIM_VER%%/macros/hanoi
 @dirrm share/vim/%%VIM_VER%%/macros
-@dirrm share/vim/%%VIM_VER%%/syntax
-@dirrm share/vim/%%VIM_VER%%/tools
-@dirrm share/vim/%%VIM_VER%%/tutor
+@dirrm share/vim/%%VIM_VER%%/doc
 @dirrm share/vim/%%VIM_VER%%
 @dirrm share/vim

Regards,
 -Jeremy

-- 
FreeBSD - Because the best things in life are free...
                                           http://www.freebsd.org/


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?20000505221353.A80558>