base commit: r458624
diff --git databases/postgresql10-server/Makefile databases/postgresql10-server/Makefile
index 3b84aa2..05d68be 100644
--- databases/postgresql10-server/Makefile
+++ databases/postgresql10-server/Makefile
@@ -22,10 +22,4 @@ PG_USER?=	postgres
 PG_GROUP?=	postgres
 PG_UID?=	770
 
-.if defined(SERVER_ONLY)
-CONFIGURE_ARGS+=--with-icu
-LIB_DEPENDS+=	libicudata.so:devel/icu
-USES+=		pkgconfig
-.endif
-
 .include "${.CURDIR}/../postgresql92-server/Makefile"
diff --git databases/postgresql92-server/Makefile databases/postgresql92-server/Makefile
index 8107a80..c698388 100644
--- databases/postgresql92-server/Makefile
+++ databases/postgresql92-server/Makefile
@@ -88,6 +88,10 @@ XML_DESC=	Build with XML data type
 # See http://people.freebsd.org/~girgen/postgresql-icu/README.html for more info
 OPTIONS_DEFINE+=	ICU
 ICU_DESC=	Use ICU for unicode collation
+.else
+CONFIGURE_ARGS+=--with-icu
+LIB_DEPENDS+=	libicudata.so:devel/icu
+USES+=		pkgconfig
 .endif
 
 # See http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/76999 for more info