Date: Fri, 30 Aug 2002 21:05:11 +1000 (EST) From: Edwin Groothuis <edwin@mavetju.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/42197: [patch] make ports/editors GNOMENG aware Message-ID: <20020830110511.2CACC6A7124@k7.mavetju>
next in thread | raw e-mail | index | archive | help
>Number: 42197
>Category: ports
>Synopsis: [patch] make ports/editors GNOMENG aware
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Aug 30 04:10:02 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: Edwin Groothuis
>Release: FreeBSD 4.5-RELEASE i386
>Organization:
-
>Environment:
System: FreeBSD k7.mavetju 4.5-RELEASE FreeBSD 4.5-RELEASE #3: Mon Mar 11 13:32:05 EST 2002 edwin@k7.mavetju.org:/usr/src/sys/compile/k7 i386
>Description:
make ports/editors GNOMENG aware
>How-To-Repeat:
n/a
>Fix:
editors/gnotepad+
editors/gxedit
editors/manedit
editors/vim
editors/vim5
editors/xemacs-devel
editors/xemacs-devel-mule
--- editors/gnotepad+/Makefile.old Fri Aug 30 20:41:41 2002
+++ editors/gnotepad+/Makefile Fri Aug 30 20:42:56 2002
@@ -21,7 +21,7 @@
USE_X_PREFIX= yes
USE_XPM= yes
-USE_GTK= yes
+USE_GNOMENG= yes
WANT_GNOME= yes
USE_LIBTOOL= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
@@ -40,8 +40,8 @@
@${CP} -R ${WRKDIR}/${PORTNAME}-help-${DOCVERSION}/docs ${WRKSRC}/docs
.endif
-.if defined(HAVE_GNOME)
-USE_GNOME= yes
+.if ${HAVE_GNOME:Mgnomelibs}!=""
+USE_GNOME= gtk12
.else
CONFIGURE_ARGS+=--disable-gnome
.endif
--- editors/gxedit/Makefile.old Fri Aug 30 20:43:07 2002
+++ editors/gxedit/Makefile Fri Aug 30 20:43:29 2002
@@ -15,7 +15,8 @@
MAINTAINER= dom@happygiraffe.net
USE_X_PREFIX= yes
-USE_GTK= yes
+USE_GNOMENG= yes
+USE_GNOME= gtk12
ALL_TARGET= gxedit
--- editors/manedit/Makefile.old Fri Aug 30 20:43:40 2002
+++ editors/manedit/Makefile Fri Aug 30 20:43:49 2002
@@ -16,7 +16,8 @@
USE_BZIP2= yes
USE_X_PREFIX= yes
-USE_GTK= yes
+USE_GNOMENG= yes
+USE_GNOME= gtk12
MAKEFILE= Makefile.FreeBSD
MAN1= manedit.1
--- editors/vim/Makefile.old Fri Aug 30 20:44:00 2002
+++ editors/vim/Makefile Fri Aug 30 21:00:18 2002
@@ -32,6 +32,8 @@
BUILD_DEPENDS= perl:${PORTSDIR}/lang/perl5
+USE_GNOMENG= yes
+
SLAVEDIRS= editors/vim-lite
.if defined(PACKAGE_BUILDING) && !defined(LITE)
@@ -98,17 +100,17 @@
# 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
+USE_GNOME+= gtk12
.endif
.if defined(WITH_ATHENA)
MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=athena" ${I18N}
.elif defined(WITH_GTK)
-USE_GTK= yes
+USE_GNOME+= gtk12
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
+USE_GNOME= gnomelibs libcapplet
MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gnome --with-gtk-prefix=${X11BASE}" ${I18N}
MAKE_ARGS+= X_LIBS="$(X_LIBS) -lXt"
.elif defined(WITH_MOTIF)
@@ -141,10 +143,10 @@
post-install:
[ -e ${PREFIX}/bin/gvim ] || (cd ${PREFIX}/bin ; ${LN} -sf vim gvim)
# below needed for `vim-lite' port
- ${TEST} -e ${PREFIX}/bin/rgvim || (cd ${PREFIX}/bin ; ${LN} -sf vim rgvim)
+ ${TEST} -e ${PREFIX}/bin/rgvim || (cd ${PREFIX}/bin ; ${LN} -sf vim rgvim)
${TEST} -e ${PREFIX}/bin/gview || (cd ${PREFIX}/bin ; ${LN} -sf vim gview)
${TEST} -e ${PREFIX}/bin/rgview || (cd ${PREFIX}/bin ; ${LN} -sf vim rgview)
- ${TEST} -e ${PREFIX}/bin/evim || (cd ${PREFIX}/bin ; ${LN} -sf vim evim)
+ ${TEST} -e ${PREFIX}/bin/evim || (cd ${PREFIX}/bin ; ${LN} -sf vim evim)
${TEST} -e ${PREFIX}/bin/eview || (cd ${PREFIX}/bin ; ${LN} -sf vim eview)
${TEST} -e ${PREFIX}/bin/gvimdiff \
|| (cd ${PREFIX}/bin ; ${LN} -sf vim gvimdiff)
--- editors/vim5/Makefile.old Fri Aug 30 20:52:13 2002
+++ editors/vim5/Makefile Fri Aug 30 20:52:56 2002
@@ -32,6 +32,8 @@
USE_PERL5= yes
.endif
+USE_GNOMENG= yes
+
LATEST_LINK?= vim5
DIST_SUBDIR= vim
WRKSRC= ${WRKDIR}/${DISTNAME}/src
@@ -64,7 +66,7 @@
MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=athena" ${I18N}
#MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=yes" ${I18N}
.elif defined(WITH_GTK)
-USE_GTK= yes
+USE_GNOME+= gtk12
MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gtk --with-gtk-prefix=${X11BASE}" ${I18N}
.else
USE_MOTIF= yes
--- editors/xemacs-devel/Makefile.old Fri Aug 30 21:00:43 2002
+++ editors/xemacs-devel/Makefile Fri Aug 30 21:01:36 2002
@@ -83,7 +83,8 @@
.if defined(WANT_GTK)
WITH_GTK= --with-gtk=yes \
--with-xpm=no
-USE_GTK= yes
+USE_GNOMENG= yes
+USE_GNOME= gtk12
USE_XPM= no
.endif
--- editors/xemacs-devel-mule/Makefile.old Fri Aug 30 21:02:47 2002
+++ editors/xemacs-devel-mule/Makefile Fri Aug 30 21:03:11 2002
@@ -107,7 +107,8 @@
.if defined(WANT_GTK)
WITH_GTK= --with-gtk=yes
WITH_XPM= --with-xpm=no
-USE_GTK= yes
+USE_GNOMENG= yes
+USE_GNOME= gtk12
USE_XPM= no
.endif
>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?20020830110511.2CACC6A7124>