diff options
| author | sat <sat@FreeBSD.org> | 2006-08-27 02:35:42 +0800 |
|---|---|---|
| committer | sat <sat@FreeBSD.org> | 2006-08-27 02:35:42 +0800 |
| commit | 1083915622583384ed03ddedd1c71cef0ffab41c (patch) | |
| tree | 8103c4ba22f9f24bc6e6e628900f763a97966662 /games/freeciv | |
| parent | ca842f099fc326d0bb0a7bac8b937380a0066809 (diff) | |
| download | freebsd-ports-gnome-1083915622583384ed03ddedd1c71cef0ffab41c.tar.gz freebsd-ports-gnome-1083915622583384ed03ddedd1c71cef0ffab41c.tar.zst freebsd-ports-gnome-1083915622583384ed03ddedd1c71cef0ffab41c.zip | |
- Fix a glitch when both WITHOUT_X11 and WITH_GTK* are defined
Reported by: itetcu, Jason Boisvert <boisvert@colorado.edu>
Diffstat (limited to 'games/freeciv')
| -rw-r--r-- | games/freeciv/Makefile | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile index 607ab25cd098..ea42412b337d 100644 --- a/games/freeciv/Makefile +++ b/games/freeciv/Makefile @@ -48,7 +48,11 @@ CFG_PATCH=s/[[:<:]](test)[[:space:]]*([^=]*)[[:>:]][[:space:]]*==[[:space:]]*([^ CONFLICTS_ALL= freeciv freeciv-gtk freeciv-gtk2 freeciv-nox11 CONFLICTS= ${CONFLICTS_ALL:S/^${PKGBASE}$//:S/$/-[0-9]*/} -.if defined(WITH_GTK2) +.if defined(WITHOUT_X11) +PLIST_SUB+= X11="@comment " +PKGNAMESUFFIX?= -nox11 +CONFIGURE_ARGS+= --enable-client=no +.elif defined(WITH_GTK2) USE_GNOME+= gtk20 PKGNAMESUFFIX?= -gtk2 CONFIGURE_ARGS+= --enable-client=gtk2 @@ -58,10 +62,6 @@ USE_GNOME+= imlib gtk12 PKGNAMESUFFIX?= -gtk CONFIGURE_ARGS+= --enable-client=gtk PLIST_FILES+= %%DATADIR%%/freeciv.rc -.elif defined(WITHOUT_X11) -PLIST_SUB+= X11="@comment " -PKGNAMESUFFIX?= -nox11 -CONFIGURE_ARGS+= --enable-client=no .else LIB_DEPENDS+= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d CONFIGURE_ARGS+= --enable-client=xaw3d @@ -71,12 +71,12 @@ PLIST_FILES+= %%DATADIR%%/Freeciv pre-fetch: .ifdef AUTO_DEPENDS @${ECHO} -n "No WITH_GTK, WITH_GTK2, WITHOUT_GNOME or WITHOUT_X11 defined, autodetecting: " -.ifdef WITH_GTK - @${ECHO} "GTK" +.ifdef WITHOUT_X11 + @${ECHO} "NOX11" .elifdef WITH_GTK2 @${ECHO} "GTK2" -.elifdef WITHOUT_X11 - @${ECHO} "NOX11" +.elifdef WITH_GTK + @${ECHO} "GTK" .else @${ECHO} "Xaw3d" .endif |