diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-02-04 05:27:54 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-02-04 05:27:54 +0800 |
| commit | a20a55c33c5604b5021e83bc9225d443f6629948 (patch) | |
| tree | 3b0acf2fb74ab3e6bc0f048a4bdd91ee62e141a8 /Mk | |
| parent | 1acd1332ece71a8da05c438437060f30de8b81cf (diff) | |
| download | marcuscom-ports-a20a55c33c5604b5021e83bc9225d443f6629948.tar marcuscom-ports-a20a55c33c5604b5021e83bc9225d443f6629948.tar.gz marcuscom-ports-a20a55c33c5604b5021e83bc9225d443f6629948.tar.bz2 marcuscom-ports-a20a55c33c5604b5021e83bc9225d443f6629948.tar.lz marcuscom-ports-a20a55c33c5604b5021e83bc9225d443f6629948.tar.xz marcuscom-ports-a20a55c33c5604b5021e83bc9225d443f6629948.tar.zst marcuscom-ports-a20a55c33c5604b5021e83bc9225d443f6629948.zip | |
* Add an additional check to make sure we don't include bsd.gnome.mk more than
we need
* Remove all trailing whitespace
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1766 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.gnome.mk | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk index 66961abe9..1f9e5d7c6 100644 --- a/Mk/bsd.gnome.mk +++ b/Mk/bsd.gnome.mk @@ -6,11 +6,12 @@ # # Please view me with 4 column tabs! -.if !defined(_POSTMKINCLUDED) +.if !defined(_POSTMKINCLUDED) && !defined(Gnome_Pre_Include) # Please make sure all changes to this file are passed through the maintainer. # Do not commit them yourself (unless of course you're the Port's Wraith ;). Gnome_Include_MAINTAINER= gnome@FreeBSD.org +Gnome_Pre_Include= bsd.gnome.mk # This section defines possible names of GNOME components and all information # necessary for ports to use those components. @@ -452,7 +453,7 @@ evolutiondataserver_USE_GNOME_IMPL=gtkhtml3 # .endif # If the user has not defined GNOME_DESKTOP_VERSION, let's try to prevent -# users from shooting themselves in the foot. We will try to make an +# users from shooting themselves in the foot. We will try to make an # intelligent choice on the user's behalf. .if exists(${gnomepanel_DETECT}) GNOME_DESKTOP_VERSION?= 2 @@ -502,9 +503,11 @@ HAVE_GNOME+= ${component} .endif # End of optional part. -.if defined(_POSTMKINCLUDED) +.if defined(_POSTMKINCLUDED) && !defined(Gnome_Post_Include) -# DO NOT USE THESE MACROS! They are obsolete, and only provided for +Gnome_Post_Include= bsd.gnome.mk + +# DO NOT USE THESE MACROS! They are obsolete, and only provided for # backward compatibility with old ports that have not converted to the new # GNOME infrastructure. .if defined(USE_GTK) @@ -535,8 +538,8 @@ ${component}_USE_GNOME_IMPL+=${${subcomponent}_USE_GNOME_IMPL} . if defined(GNOME_DESKTOP_VERSION) && \ defined(${component}_GNOME_DESKTOP_VERSION) . if ${GNOME_DESKTOP_VERSION}!=${${component}_GNOME_DESKTOP_VERSION} -BROKEN= ${PORTNAME} wants to use the GNOME -BROKEN+=${${component}_GNOME_DESKTOP_VERSION} desktop, but you wish to use +BROKEN= ${PORTNAME} wants to use the GNOME +BROKEN+=${${component}_GNOME_DESKTOP_VERSION} desktop, but you wish to use BROKEN+=the GNOME ${GNOME_DESKTOP_VERSION} desktop . endif . endif |