diff options
Diffstat (limited to 'editors/vim6/Makefile')
| -rw-r--r-- | editors/vim6/Makefile | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/editors/vim6/Makefile b/editors/vim6/Makefile index 57eb2da08cf2..43484c3ac39c 100644 --- a/editors/vim6/Makefile +++ b/editors/vim6/Makefile @@ -9,7 +9,7 @@ PORTNAME?= vim6 PATCHLEVEL= 9 PORTVERSION= 6.4.${PATCHLEVEL} -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES?= editors MASTER_SITES= ${MASTER_SITE_VIM} DISTNAME= vim-${PORTVERSION:C/\.[0-9a-z]*$//} @@ -104,23 +104,26 @@ MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=athena" ${I18N} .elif defined(WITH_GTK2) USE_GNOME= gtk20 PKGNAMESUFFIX= -gtk2 -MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gtk2 --with-gtk-prefix=${X11BASE}" ${I18N} +MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gtk2 --with-gtk-prefix=${LOCALBASE}" ${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=${X11BASE}" ${I18N} +MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gnome --with-gtk-prefix=${LOCALBASE}" ${I18N} MAKE_ARGS+= X_LIBS="$(X_LIBS) -lXt" +USE_XORG+= xt .else USE_GNOME= gtk12 -MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gtk --with-gtk-prefix=${X11BASE}" ${I18N} +MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gtk --with-gtk-prefix=${LOCALBASE}" ${I18N} MAKE_ARGS+= X_LIBS="$(X_LIBS) -lXt" +USE_XORG+= xt .endif .elif defined(WITH_MOTIF) USE_MOTIF= yes -MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=motif --with-motif-lib=\"${MOTIFLIB}\"" MOTIFHOME=${X11BASE} ${I18N} +MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=motif --with-motif-lib=\"${MOTIFLIB}\"" MOTIFHOME=${LOCALBASE} ${I18N} .endif .else # WITHOUT_X11 MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=no --without-x" ${I18N} @@ -141,7 +144,7 @@ pre-configure: @${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; s|/usr/X11R6|${X11BASE}|g '\ + s|/usr/local|${LOCALBASE}|g; s|/usr/X11R6|${LOCALBASE}|g '\ ${WRKSRC}/auto/configure # Clean up junk files to keep them from being installed. |