farewell to libxpg4.

17 files changed, 2 insertions, 160 deletions

diff --git a/editors/emacs/files/patch-configure.in b/editors/emacs/files/patch-configure.in
index 6a3bd7899d58..6e50c0ea2567 100644
--- a/editors/emacs/files/patch-configure.in
+++ b/editors/emacs/files/patch-configure.in
@@ -27,11 +27,3 @@
        *-nextstep* )             opsys=nextstep ;;
        ## Otherwise, we'll fall through to the generic opsys code at the bottom.
      esac
-@@ -2050,6 +2061,7 @@
- # Solaris requires -lintl if you want strerror (which calls dgettext)
- # to return localized messages.
- AC_CHECK_LIB(intl, dgettext)
-+AC_CHECK_LIB(xpg4, _xpg4_setrunelocale)
- 
- AC_MSG_CHECKING(whether localtime caches TZ)
- AC_CACHE_VAL(emacs_cv_localtime_cache,
diff --git a/editors/emacs20-dl/Makefile b/editors/emacs20-dl/Makefile
index 9c77f2677f54..e170a794cfca 100644
--- a/editors/emacs20-dl/Makefile
+++ b/editors/emacs20-dl/Makefile
@@ -59,13 +59,6 @@ SCRIPTS_ENV=	SED=${SED} MV=${MV} \
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_XPG4)
-.if ${OSVERSION} >= 220000 && ${OSVERSION} < 400020 || \
-	${OSVERSION} >= 500000 && ${OSVERSION} < 500005
-CONFIGURE_ARGS+=	--with-xpg4
-.endif
-.endif
-
 RECOMPILE_ELS=	dired.el startup.el
 
 pre-patch:
diff --git a/editors/emacs20-dl/files/patch-cb b/editors/emacs20-dl/files/patch-cb
index 1d555e53674b..7eadaa1d8003 100644
--- a/editors/emacs20-dl/files/patch-cb
+++ b/editors/emacs20-dl/files/patch-cb
@@ -1,25 +1,5 @@
 --- src/s/freebsd.h.orig	Mon Jan 13 03:08:43 2003
 +++ src/s/freebsd.h	Mon Jan 13 03:10:05 2003
-@@ -41,8 +41,18 @@
- 
- #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
- 
-+/* Use XPG4 Library for FreeBSD */
-+#define LIBS_XPG
-+#if (__FreeBSD_version >= 220000 && __FreeBSD_version < 400020) \
-+    || (__FreeBSD_version >= 500000 && __FreeBSD_version < 500005)
-+#ifdef USE_XPG
-+#undef LIBS_XPG
-+#define LIBS_XPG -lxpg4
-+#endif
-+#endif
-+
- #define LIBS_DEBUG
--#define LIBS_SYSTEM -lutil
-+#define LIBS_SYSTEM -lutil LIBS_XPG
- #if __FreeBSD_version < 400000
- #define LIBS_TERMCAP -ltermcap
- #endif
 @@ -56,9 +66,20 @@
  #ifdef __ELF__
  
diff --git a/editors/emacs20-dl/files/patch-cc b/editors/emacs20-dl/files/patch-cc
index cc565bb5cd40..ef2271e18737 100644
--- a/editors/emacs20-dl/files/patch-cc
+++ b/editors/emacs20-dl/files/patch-cc
@@ -1,15 +1,5 @@
 --- configure.in.orig	Tue Jun  6 00:42:49 2000
 +++ configure.in	Sat Jul  1 20:46:31 2000
-@@ -42,6 +42,9 @@
- AC_ARG_WITH(hesiod,
- [  --with-hesiod           support Hesiod to get the POP server host],
- [AC_DEFINE(HESIOD)])
-+AC_ARG_WITH(xpg4,
-+[  --with-xpg4             support XPG4 library on FreeBSD system],
-+[AC_DEFINE(USE_XPG)])
- dnl This should be the last --with option, because --with-x is
- dnl added later on when we find the path of X, and it's best to
- dnl keep them together visually.
 @@ -147,6 +150,15 @@
  machine='' opsys='' unported=no
  case "${canonical}" in
diff --git a/editors/emacs20-dl/pkg-descr b/editors/emacs20-dl/pkg-descr
index 24eecb6774c1..b42cfaf7a6ab 100644
--- a/editors/emacs20-dl/pkg-descr
+++ b/editors/emacs20-dl/pkg-descr
@@ -10,15 +10,6 @@ Emacs binary is:
 Dynamic loading patch:
     ftp://ftp.m17n.org/mule/dynamic-loading/emacs-20.4-dl3.diff.gz
 
-NOTE: This binary is not linked with libxpg4 shared library by default.
-If your LANG environment variable has a value but "C", the following
-warning message may be displayed:
-
-	Warning: locale not supported by C library, locale unchanged
-
-If you complain about this message, type `make install WITH_XPG4=yes'
-at the "${PORTSDIR}/editors/emacs20-dl" directory to re-make this package.
-
 WWW: http://www.m17n.org/mule/dynamic-loading/
 
 --- Ported by shige@FreeBSD.ORG
diff --git a/editors/emacs20-dl/pkg-message b/editors/emacs20-dl/pkg-message
deleted file mode 100644
index fcc358a279cc..000000000000
--- a/editors/emacs20-dl/pkg-message
+++ /dev/null
@@ -1,13 +0,0 @@
-****************************************************************************
- NOTE: Warning message about locale.
-
-  This binary is not linked with libxpg4 shared library by default.
-  If your LANG environment variable has a value but "C", the following
-  warning message may be displayed:
-
-  	Warning: locale not supported by C library, locale unchanged
-
-  If you complain about this message, type `make install WITH_XPG4=yes'
-  at the "${PORTSDIR}/editors/emacs20-dl" directory to re-make this package.
-
-****************************************************************************
diff --git a/editors/emacs20-mule-devel/Makefile b/editors/emacs20-mule-devel/Makefile
index 7f5f7684efa4..f5971742ad8a 100644
--- a/editors/emacs20-mule-devel/Makefile
+++ b/editors/emacs20-mule-devel/Makefile
@@ -67,13 +67,6 @@ PLIST_SUB=	EMACS_VER=${EMACS_VER} EMACS_ARCH=${CONFIGURE_TARGET} \
 SCRIPTS_ENV=	SED=${SED} MV=${MV} \
 		DOC_FILE=${DOC_FILE}
 
-.if defined(WITH_XPG4)
-.if ${OSVERSION} >= 220000 && ${OSVERSION} < 400020 || \
-	${OSVERSION} >= 500000 && ${OSVERSION} < 500005
-CONFIGURE_ARGS+=	--with-xpg4
-.endif
-.endif
-
 pre-patch:
 	@(cd ${WRKSRC} ; \
 	  ${PATCH} ${PATCH_ARGS} -p1 < ../${XIM_PATCH}/${XIM_PATCH}.diff ;\
diff --git a/editors/emacs20-mule-devel/files/patch-cb b/editors/emacs20-mule-devel/files/patch-cb
index 1d555e53674b..7eadaa1d8003 100644
--- a/editors/emacs20-mule-devel/files/patch-cb
+++ b/editors/emacs20-mule-devel/files/patch-cb
@@ -1,25 +1,5 @@
 --- src/s/freebsd.h.orig	Mon Jan 13 03:08:43 2003
 +++ src/s/freebsd.h	Mon Jan 13 03:10:05 2003
-@@ -41,8 +41,18 @@
- 
- #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
- 
-+/* Use XPG4 Library for FreeBSD */
-+#define LIBS_XPG
-+#if (__FreeBSD_version >= 220000 && __FreeBSD_version < 400020) \
-+    || (__FreeBSD_version >= 500000 && __FreeBSD_version < 500005)
-+#ifdef USE_XPG
-+#undef LIBS_XPG
-+#define LIBS_XPG -lxpg4
-+#endif
-+#endif
-+
- #define LIBS_DEBUG
--#define LIBS_SYSTEM -lutil
-+#define LIBS_SYSTEM -lutil LIBS_XPG
- #if __FreeBSD_version < 400000
- #define LIBS_TERMCAP -ltermcap
- #endif
 @@ -56,9 +66,20 @@
  #ifdef __ELF__
  
diff --git a/editors/emacs20-mule-devel/files/patch-cc b/editors/emacs20-mule-devel/files/patch-cc
index 06b6e1189300..460a0be633fe 100644
--- a/editors/emacs20-mule-devel/files/patch-cc
+++ b/editors/emacs20-mule-devel/files/patch-cc
@@ -21,16 +21,6 @@
  etcdir='${datadir}/emacs/${version}/etc'
  archlibdir='${libexecdir}/emacs/${version}/${configuration}'
  docdir='${datadir}/emacs/${version}/etc'
-@@ -42,6 +48,9 @@
- AC_ARG_WITH(hesiod,
- [  --with-hesiod           support Hesiod to get the POP server host],
- [AC_DEFINE(HESIOD)])
-+AC_ARG_WITH(xpg4,
-+[  --with-xpg4             support XPG4 library on FreeBSD system],
-+[AC_DEFINE(USE_XPG)])
- dnl This should be the last --with option, because --with-x is
- dnl added later on when we find the path of X, and it's best to
- dnl keep them together visually.
 @@ -147,6 +156,15 @@
  machine='' opsys='' unported=no
  case "${canonical}" in
diff --git a/editors/emacs20-mule-devel/pkg-descr b/editors/emacs20-mule-devel/pkg-descr
index 58f6c92b24fa..31204094eb6e 100644
--- a/editors/emacs20-mule-devel/pkg-descr
+++ b/editors/emacs20-mule-devel/pkg-descr
@@ -9,16 +9,6 @@ Emacs binary is:
 Dynamic loading patch:
     ftp://ftp.m17n.org/mule/dynamic-loading/emacs-20.4-dl3.diff.gz
 
-NOTE: This binary is not linked with libxpg4 shared library by default.
-If your LANG environment variable has a value but "C", the following
-warning message may be displayed:
-
-	Warning: locale not supported by C library, locale unchanged
-
-If you complain about this message, type `make install WITH_XPG4=yes'
-at the "${PORTSDIR}/editors/emacs20-mule-devel" directory to re-make
-this package.
-
 WWW: http://www.m17n.org/mule/dynamic-loading/
 
 --- Ported by shige@FreeBSD.ORG
diff --git a/editors/emacs20-mule-devel/pkg-message b/editors/emacs20-mule-devel/pkg-message
deleted file mode 100644
index c3c5240d92b9..000000000000
--- a/editors/emacs20-mule-devel/pkg-message
+++ /dev/null
@@ -1,14 +0,0 @@
-****************************************************************************
- NOTE: Warning message about locale.
-
-  This binary is not linked with libxpg4 shared library by default.
-  If your LANG environment variable has a value but "C", the following
-  warning message may be displayed:
-
-  	Warning: locale not supported by C library, locale unchanged
-
-  If you complain about this message, type `make install WITH_XPG4=yes'
-  at the "${PORTSDIR}/editors/emacs20-mule-devel" directory to re-make
-  this package.
-
-****************************************************************************
diff --git a/editors/emacs20/files/patch-cc b/editors/emacs20/files/patch-cc
index 0638d51e8d61..a8b400f7e6f9 100644
--- a/editors/emacs20/files/patch-cc
+++ b/editors/emacs20/files/patch-cc
@@ -33,11 +33,3 @@
  
  # UNIX98 PTYs.
  AC_CHECK_FUNCS(grantpt)
-@@ -1656,6 +1664,7 @@
- # Solaris requires -lintl if you want strerror (which calls dgettext)
- # to return localized messages.
- AC_CHECK_LIB(intl, dgettext)
-+AC_CHECK_LIB(xpg4, _xpg4_setrunelocale)
- 
- AC_MSG_CHECKING(whether localtime caches TZ)
- AC_CACHE_VAL(emacs_cv_localtime_cache,
diff --git a/editors/emacs22/files/patch-configure.in b/editors/emacs22/files/patch-configure.in
index 6a3bd7899d58..6e50c0ea2567 100644
--- a/editors/emacs22/files/patch-configure.in
+++ b/editors/emacs22/files/patch-configure.in
@@ -27,11 +27,3 @@
        *-nextstep* )             opsys=nextstep ;;
        ## Otherwise, we'll fall through to the generic opsys code at the bottom.
      esac
-@@ -2050,6 +2061,7 @@
- # Solaris requires -lintl if you want strerror (which calls dgettext)
- # to return localized messages.
- AC_CHECK_LIB(intl, dgettext)
-+AC_CHECK_LIB(xpg4, _xpg4_setrunelocale)
- 
- AC_MSG_CHECKING(whether localtime caches TZ)
- AC_CACHE_VAL(emacs_cv_localtime_cache,
diff --git a/editors/emacs23/files/patch-configure.in b/editors/emacs23/files/patch-configure.in
index 6a3bd7899d58..6e50c0ea2567 100644
--- a/editors/emacs23/files/patch-configure.in
+++ b/editors/emacs23/files/patch-configure.in
@@ -27,11 +27,3 @@
        *-nextstep* )             opsys=nextstep ;;
        ## Otherwise, we'll fall through to the generic opsys code at the bottom.
      esac
-@@ -2050,6 +2061,7 @@
- # Solaris requires -lintl if you want strerror (which calls dgettext)
- # to return localized messages.
- AC_CHECK_LIB(intl, dgettext)
-+AC_CHECK_LIB(xpg4, _xpg4_setrunelocale)
- 
- AC_MSG_CHECKING(whether localtime caches TZ)
- AC_CACHE_VAL(emacs_cv_localtime_cache,
diff --git a/editors/mule-common/files/patch-mc b/editors/mule-common/files/patch-mc
index 3ed24fa0acd6..e3d77ac5c660 100644
--- a/editors/mule-common/files/patch-mc
+++ b/editors/mule-common/files/patch-mc
@@ -5,7 +5,7 @@
  
  #define LIBS_DEBUG
 -#define LIBS_SYSTEM -lutil
-+#define LIBS_SYSTEM -lutil -lcrypt -lxpg4
++#define LIBS_SYSTEM -lutil -lcrypt
  #define LIBS_TERMCAP -ltermcap
  
  #define SYSV_SYSTEM_DIR
diff --git a/editors/mule-common/files/patch-na b/editors/mule-common/files/patch-na
index 68edbae7ba58..bbcfbee5b929 100644
--- a/editors/mule-common/files/patch-na
+++ b/editors/mule-common/files/patch-na
@@ -3,7 +3,7 @@
 @@ -43,7 +43,16 @@
  
  #define LIBS_DEBUG
- #define LIBS_SYSTEM -lutil -lcrypt -lxpg4
+ #define LIBS_SYSTEM -lutil -lcrypt
 +#if __FreeBSD_version < 400000
  #define LIBS_TERMCAP -ltermcap
 +#else
diff --git a/editors/vim5/Makefile b/editors/vim5/Makefile
index feb369b43cd5..6e24ae4156da 100644
--- a/editors/vim5/Makefile
+++ b/editors/vim5/Makefile
@@ -73,12 +73,6 @@ MAKE_ARGS+=	CONF_OPT_PERL="--disable-perlinterp --disable-pythoninterp --disable
 
 .include <bsd.port.pre.mk>
 
-# Determine if we need xpg4.
-# No xpg4 in libc below 400020 and 500005
-.if ${OSVERSION} < 400020 && ${OSVERSION} < 500005
-MAKE_ARGS+=	LIBS=-lxpg4
-.endif
-
 .if ${PERL_LEVEL} >= 500800
 BROKEN=		"Does not compile with perl 5.8"
 .endif