From c8c6e38e476c7c5f39c58e78bc1a7143efb16055 Mon Sep 17 00:00:00 2001 From: Pav Lucistnik Date: Sat, 5 Jun 2004 11:29:39 +0000 Subject: - Add WITH_MULTIBYTE knob PR: ports/67577 Submitted by: Andrey Slusar Approved by: maintainer --- x11-wm/ion-2/Makefile | 7 ++++++- x11-wm/ion-2/files/patch-system.mk | 12 +++--------- x11-wm/ion3/Makefile | 7 ++++++- x11-wm/ion3/files/patch-system.mk | 12 +++--------- 4 files changed, 18 insertions(+), 20 deletions(-) (limited to 'x11-wm') diff --git a/x11-wm/ion-2/Makefile b/x11-wm/ion-2/Makefile index d6a8b712c469..9a911cc1546c 100644 --- a/x11-wm/ion-2/Makefile +++ b/x11-wm/ion-2/Makefile @@ -1,4 +1,4 @@ -# New ports collection makefile for: ion-devel +# New ports collection makefile for: ion-2 # Date created: 20 August 2003 # Whom: anthony.ginepro@laposte.net # Original ion port: ricci@cs.utah.edu @@ -22,6 +22,11 @@ USE_LIBLTDL= yes USE_LIBTOOL_VER=15 USE_X_PREFIX= yes USE_GMAKE= yes +MAKE_ENV= DEFINES="${IONDEFINES}" + +.if !defined(WITH_MULTIBYTE) +IONDEFINES+= -DCF_NO_MB_SUPPORT +.endif MAN1= ion.1 pwm.1 DOCSDIR= share/doc/ion diff --git a/x11-wm/ion-2/files/patch-system.mk b/x11-wm/ion-2/files/patch-system.mk index 640dfbe61a76..a3770bb2bf14 100644 --- a/x11-wm/ion-2/files/patch-system.mk +++ b/x11-wm/ion-2/files/patch-system.mk @@ -1,5 +1,5 @@ --- system.mk.orig Tue Jun 1 16:35:23 2004 -+++ system.mk Wed Jun 2 05:15:27 2004 ++++ system.mk Sat Jun 5 13:27:08 2004 @@ -7,7 +7,7 @@ ## Installation paths ## @@ -51,7 +51,7 @@ # SunOS/Solaris #X11_PREFIX=/usr/openwin -@@ -119,29 +119,29 @@ +@@ -119,7 +119,7 @@ # asprintf and vasprintf in the c library. (gnu libc has.) # If HAS_SYSTEM_ASPRINTF is not defined, an implementation # in sprintf_2.2/ is used. @@ -60,13 +60,7 @@ # If you're on an archaic system (such as relatively recent *BSD releases) - # without even dummy multibyte/widechar support, you may have to uncomment - # the following line: --#DEFINES += -DCF_NO_MB_SUPPORT -+DEFINES += -DCF_NO_MB_SUPPORT - - - ## +@@ -132,16 +132,16 @@ ## C compiler ## diff --git a/x11-wm/ion3/Makefile b/x11-wm/ion3/Makefile index d6a8b712c469..9a911cc1546c 100644 --- a/x11-wm/ion3/Makefile +++ b/x11-wm/ion3/Makefile @@ -1,4 +1,4 @@ -# New ports collection makefile for: ion-devel +# New ports collection makefile for: ion-2 # Date created: 20 August 2003 # Whom: anthony.ginepro@laposte.net # Original ion port: ricci@cs.utah.edu @@ -22,6 +22,11 @@ USE_LIBLTDL= yes USE_LIBTOOL_VER=15 USE_X_PREFIX= yes USE_GMAKE= yes +MAKE_ENV= DEFINES="${IONDEFINES}" + +.if !defined(WITH_MULTIBYTE) +IONDEFINES+= -DCF_NO_MB_SUPPORT +.endif MAN1= ion.1 pwm.1 DOCSDIR= share/doc/ion diff --git a/x11-wm/ion3/files/patch-system.mk b/x11-wm/ion3/files/patch-system.mk index 640dfbe61a76..a3770bb2bf14 100644 --- a/x11-wm/ion3/files/patch-system.mk +++ b/x11-wm/ion3/files/patch-system.mk @@ -1,5 +1,5 @@ --- system.mk.orig Tue Jun 1 16:35:23 2004 -+++ system.mk Wed Jun 2 05:15:27 2004 ++++ system.mk Sat Jun 5 13:27:08 2004 @@ -7,7 +7,7 @@ ## Installation paths ## @@ -51,7 +51,7 @@ # SunOS/Solaris #X11_PREFIX=/usr/openwin -@@ -119,29 +119,29 @@ +@@ -119,7 +119,7 @@ # asprintf and vasprintf in the c library. (gnu libc has.) # If HAS_SYSTEM_ASPRINTF is not defined, an implementation # in sprintf_2.2/ is used. @@ -60,13 +60,7 @@ # If you're on an archaic system (such as relatively recent *BSD releases) - # without even dummy multibyte/widechar support, you may have to uncomment - # the following line: --#DEFINES += -DCF_NO_MB_SUPPORT -+DEFINES += -DCF_NO_MB_SUPPORT - - - ## +@@ -132,16 +132,16 @@ ## C compiler ## -- cgit v1.2.3