mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00
Code Issues Releases Activity

- Fix a glitch when both WITHOUT_X11 and WITH_GTK* are defined

Browse Source 
Reported by:	itetcu, Jason Boisvert <boisvert@colorado.edu>
This commit is contained in:
Andrew Pantyukhin 2006-08-26 18:35:42 +00:00
parent bc24c9fc08
commit 2b957e9ea5
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=171447
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
games/freeciv/Makefile
View File

@ -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