Date: Mon, 09 Oct 2000 11:42:38 +0300 From: Maxim Sobolev <sobomax@FreeBSD.org> To: ports@FreeBSD.org, reg@FreeBSD.org Cc: asami@FreeBSD.org Subject: Problems with bsd.gnome.mk [patch] Message-ID: <39E184FE.7FCE1E41@FreeBSD.org>
next in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--------------C3E54AE80D5590E6FB00BE44
Content-Type: text/plain; charset=koi8-r
Content-Transfer-Encoding: 7bit
Hi Jeremy and All,
I wonder if anyone noticed that bsd.gnome.mk does quite strange things with
package names when WANT_* defined, so example if you have WANT_GNOME defined in
your /etc/make.conf and gnome is in fact installed:
$ cd /usr/ports/audio/gnomeaudio ; make -V PKGNAME
gnomeaudio-gnome-1.0.0
$ cd /usr/ports/x11/gnomecore ; make -V PKGNAME
gnomecore-gnome-1.2.2.1
[etc.]
Please note strange '-gnome' suffix, it looks like there are some plans for
gnomecore-kde, gnomecore-nognome or something ;). This should be corrected by
surpressing appropriate suffix for the ports that define USE_GNOME, USE_ESOUND
etc.
Also I don't like the fact that bsd.gnome.mk adds
--localstatedir=${PREFIX}/share/gnome and --datadir=${PREFIX}/share/gnome
configure arguments even for those ports, which contains optional GNOME
dependencies, so for example port installs its files into ${PREFIX}/share/foo
for nognome case, but into ${PREFIX}/share/gnome/foo if WANT_GNOME is defined
(for example sawfish, xmms etc.). IMO this leads to confusion and doesn't
really necessary. At least this stuff should be made optional, so only ports
which really can benefit from that would use this feature. As an example of
possible problems with this behaviour, please considering somebody writing a
port of sawfish theme - and confusion as to where the theme files should go -
into share/gnome/safwish, or share/sawfish. Other packages may have similar
problems.
The attached patch is expected to solve both these problems.
-Maxim
--------------C3E54AE80D5590E6FB00BE44
Content-Type: text/plain; charset=koi8-r;
name="bsd.gnome.mk-fix.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="bsd.gnome.mk-fix.diff"
--- bsd.gnome.mk 2000/10/07 15:38:00 1.1
+++ bsd.gnome.mk 2000/10/07 19:14:38
@@ -67,6 +67,12 @@
# HAVE_GNOME:
# yes - either found Gnome or WITH_GNOME set to yes.
+.if defined(WANT_GNOME) || defined(HAVE_GNOME)
+.if !defined(USE_GNOME) && !defined(USE_GNOMELIBS) && !defined(USE_GNOMECTRL)
+NOGNOMECONFIGUREARGS= yes
+.endif
+.endif
+
.if defined(PACKAGE_BUILDING) && !defined(WITH_ALL)
WITHOUT_ALL= yes
.endif
@@ -209,7 +215,9 @@
CONFIGURE_ENV+= ESD_CONFIG="${ESD_CONFIG}"
MAKE_ENV+= ESD_CONFIG="${ESD_CONFIG}"
.if defined(HAVE_ESOUND)
+.if !defined(NOESOUNDSUFFIX) && !defined(USE_ESOUND)
PKGNAMESUFFIX= -esound
+.endif
CONFIGURE_ENV+= HAVE_ESOUND=${HAVE_ESOUND}
MAKE_ENV+= HAVE_ESOUND=${HAVE_ESOUND}
.endif
@@ -221,7 +229,9 @@
CONFIGURE_ENV+= GLIB_CONFIG="${GLIB_CONFIG}"
MAKE_ENV+= GLIB_CONFIG="${GLIB_CONFIG}"
.if defined(HAVE_GLIB)
+.if !defined(NOGLIBSUFFIX) && !defined(USE_GLIB)
PKGNAMESUFFIX= -glib
+.endif
CONFIGURE_ENV+= HAVE_GLIB=${HAVE_GLIB}
MAKE_ENV+= HAVE_GLIB=${HAVE_GLIB}
.endif
@@ -233,7 +243,9 @@
CONFIGURE_ENV+= GTK_CONFIG="${GTK_CONFIG}"
MAKE_ENV+= GTK_CONFIG="${GTK_CONFIG}"
.if defined(HAVE_GTK)
+.if !defined(NOGTKSUFFIX) defined(USE_GTK)
PKGNAMESUFFIX= -gtk
+.endif
CONFIGURE_ENV+= HAVE_GTK=${HAVE_GTK}
MAKE_ENV+= HAVE_GTK=${HAVE_GTK}
.endif
@@ -245,22 +257,28 @@
CONFIGURE_ENV+= IMLIB_CONFIG="${IMLIB_CONFIG}"
MAKE_ENV+= IMLIB_CONFIG="${IMLIB_CONFIG}"
.if defined(HAVE_IMLIB)
+.if !defined(NOIMLIBSUFFIX) && defined(USE_IMLIB)
PKGNAMESUFFIX= -imlib
+.endif
CONFIGURE_ENV+= HAVE_IMLIB=${HAVE_IMLIB}
MAKE_ENV+= HAVE_IMLIB=${HAVE_IMLIB}
.endif
.endif
.if defined(USE_GNOMELIBS)
-CONFIGURE_ARGS+=--localstatedir=${PREFIX}/share/gnome \
- --datadir=${PREFIX}/share/gnome \
- --with-gnome=${PREFIX}
+.if !defined(NOGNOMECONFIGUREARGS)
+CONFIGURE_ARGS+= --localstatedir=${PREFIX}/share/gnome \
+ --datadir=${PREFIX}/share/gnome
+.endif
+CONFIGURE_ARGS+= --with-gnome=${PREFIX}
LIB_DEPENDS+= gnome.4:${PORTSDIR}/x11/gnomelibs
GNOME_CONFIG?= ${X11BASE}/bin/gnome-config
CONFIGURE_ENV+= GNOME_CONFIG="${GNOME_CONFIG}"
MAKE_ENV+= GNOME_CONFIG="${GNOME_CONFIG}"
.if defined(HAVE_GNOME)
+.if !defined(NOGNOMESUFFIX) && defined(USE_GNOME)
PKGNAMESUFFIX= -gnome
+.endif
CONFIGURE_ENV+= HAVE_GNOME=${HAVE_GNOME}
MAKE_ENV+= HAVE_GNOME=${HAVE_GNOME}
PLIST_SUB+= GNOME:="" NOGNOME:="@comment " DATADIR="share/gnome"
--------------C3E54AE80D5590E6FB00BE44--
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?39E184FE.7FCE1E41>