farewell to libxpg4.

17 files changed, 2 insertions, 106 deletions

diff --git a/japanese/chimera/files/patch-aa b/japanese/chimera/files/patch-aa
index df525e122eb8..1fc5a7efe300 100644
--- a/japanese/chimera/files/patch-aa
+++ b/japanese/chimera/files/patch-aa
@@ -35,14 +35,3 @@
  
 -mailto		/usr/X11/bin/mailto.pl
 +mailto		/usr/X11R6/lib/X11/chimera/mailto.pl
---- src/Imakefile.orig	Wed May 28 02:44:35 1997
-+++ src/Imakefile	Sun Feb 21 11:42:50 1999
-@@ -28,7 +28,7 @@
-                    -L../xloadimage -lxloadimage $(COMPATLIB) \
-                    -L../common -lcommon \
-                    $(CSOCKSLIB) $(CTERMLIB) $(CEXTRA_LIBS) \
--                   XawClientLibs -lm
-+                   XawClientLibs -lm -lxpg4
- 
- #ifdef __QNX__
- LOCAL_DEPLIBS    = ../common/common3r.lib ../mxw/mxw3r.lib \
diff --git a/japanese/emacs-emcws/Makefile b/japanese/emacs-emcws/Makefile
index ad9b0ff1b8ac..fba2a206c59d 100644
--- a/japanese/emacs-emcws/Makefile
+++ b/japanese/emacs-emcws/Makefile
@@ -143,15 +143,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
-CONFIGURE_ARGS+=	--with-xpg4
-.endif
-.if ${OSVERSION} >= 500000 && ${OSVERSION} < 500005
-CONFIGURE_ARGS+=	--with-xpg4
-.endif
-.endif
-
 .if exists(${PREFIX}/bin/emacs-${EMACS_VER})
 EMACS_BASE=${PREFIX}
 .else
diff --git a/japanese/emacs-emcws/files/patch-configure.in b/japanese/emacs-emcws/files/patch-configure.in
index 8d85d454258f..fe67db93fcff 100644
--- a/japanese/emacs-emcws/files/patch-configure.in
+++ b/japanese/emacs-emcws/files/patch-configure.in
@@ -58,11 +58,3 @@
        *-nextstep* )             opsys=nextstep ;;
        ## Otherwise, we'll fall through to the generic opsys code at the bottom.
      esac
-@@ -2131,6 +2150,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/japanese/emacs20-emcws/Makefile b/japanese/emacs20-emcws/Makefile
index ceb517365d12..87dc01383472 100644
--- a/japanese/emacs20-emcws/Makefile
+++ b/japanese/emacs20-emcws/Makefile
@@ -135,15 +135,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
-CONFIGURE_ARGS+=	--with-xpg4
-.endif
-.if ${OSVERSION} >= 500000 && ${OSVERSION} < 500005
-CONFIGURE_ARGS+=	--with-xpg4
-.endif
-.endif
-
 pre-fetch:
 	@${CAT} ${FILESDIR}/emcws-message
 
diff --git a/japanese/emacs20-emcws/pkg-message b/japanese/emacs20-emcws/pkg-message
deleted file mode 100644
index 70079d6ff153..000000000000
--- a/japanese/emacs20-emcws/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}/japanese/emacs20-emcws" directory to re-make
-  this package.
-
-****************************************************************************
diff --git a/japanese/jed/Makefile b/japanese/jed/Makefile
index b6ae585fcddd..ae175ec979dc 100644
--- a/japanese/jed/Makefile
+++ b/japanese/jed/Makefile
@@ -27,7 +27,7 @@ JP_VERSION=	067
 
 DIST_SUBDIR=	jed
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	JED_ROOT="${JED_ROOT}" X_EXTRA_LIBS="-lxpg4 -lcurses"
+CONFIGURE_ENV=	JED_ROOT="${JED_ROOT}" X_EXTRA_LIBS="-lcurses"
 CONFIGURE_ARGS=	--enable-x-locale=no
 ALL_TARGET=	${BINSTUFF} getmail
 MAN1=		jed.1 rgrep.1
diff --git a/japanese/jvim3/Makefile b/japanese/jvim3/Makefile
index 57772a1f1c69..e44d4fec6d25 100644
--- a/japanese/jvim3/Makefile
+++ b/japanese/jvim3/Makefile
@@ -35,7 +35,7 @@ PORT_DOCDIR=	${PREFIX}/share/doc/ja-jvim-${PORTVERSION}
 # -DUSE_X11 is the cause of a problem treating Japanese
 MACHINE=	-DBSD_UNIX -DUSE_LOCALE
 CC=		cc ${CFLAGS} -Wall
-LIBS=		-ltermlib -lxpg4 -L${PREFIX}/lib 
+LIBS=		-ltermlib -L${PREFIX}/lib 
 
 .if !defined(WITHOUT_X11)
 USE_XLIB=	yes
diff --git a/japanese/kterm/files/patch-aa b/japanese/kterm/files/patch-aa
index 4ac4ebc311ec..d915ee0bdca4 100644
--- a/japanese/kterm/files/patch-aa
+++ b/japanese/kterm/files/patch-aa
@@ -18,12 +18,3 @@
  /*
   * add -DWTMP and -DLASTLOG if you want them.
   */
-@@ -81,7 +90,7 @@
- SpecialCObjectRule(charproc,$(_NOOP_),$(MISC_DEFINES))
- 
- #if InstallXtermSetUID
--SetUIDProgramTarget(kterm,$(OBJS1),$(DEPLIBS1),XkbClientLibs XawClientLibs,$(XPMLIB) $(TERMCAPLIB) $(PTYLIB))
-+SetUIDProgramTarget(kterm,$(OBJS1),$(DEPLIBS1),XkbClientLibs XawClientLibs,$(XPMLIB) $(TERMCAPLIB) $(PTYLIB) -lxpg4)
- #else
- NormalProgramTarget(kterm,$(OBJS1),$(DEPLIBS1),XkbClientLibs XawClientLibs,$(XPMLIB) $(TERMCAPLIB) $(PTYLIB))
- #endif
diff --git a/japanese/kterm16c/files/patch-aa b/japanese/kterm16c/files/patch-aa
index 4ac4ebc311ec..d915ee0bdca4 100644
--- a/japanese/kterm16c/files/patch-aa
+++ b/japanese/kterm16c/files/patch-aa
@@ -18,12 +18,3 @@
  /*
   * add -DWTMP and -DLASTLOG if you want them.
   */
-@@ -81,7 +90,7 @@
- SpecialCObjectRule(charproc,$(_NOOP_),$(MISC_DEFINES))
- 
- #if InstallXtermSetUID
--SetUIDProgramTarget(kterm,$(OBJS1),$(DEPLIBS1),XkbClientLibs XawClientLibs,$(XPMLIB) $(TERMCAPLIB) $(PTYLIB))
-+SetUIDProgramTarget(kterm,$(OBJS1),$(DEPLIBS1),XkbClientLibs XawClientLibs,$(XPMLIB) $(TERMCAPLIB) $(PTYLIB) -lxpg4)
- #else
- NormalProgramTarget(kterm,$(OBJS1),$(DEPLIBS1),XkbClientLibs XawClientLibs,$(XPMLIB) $(TERMCAPLIB) $(PTYLIB))
- #endif
diff --git a/japanese/less/files/patch-ab b/japanese/less/files/patch-ab
deleted file mode 100644
index 1c0c2c17f424..000000000000
--- a/japanese/less/files/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.in.orig	Sat Feb 17 16:37:23 2001
-+++ configure.in	Sat Feb 17 16:38:58 2001
-@@ -26,6 +26,7 @@
- AC_CHECK_LIB(gen, regcmp)
- AC_CHECK_LIB(intl, regcmp)
- AC_CHECK_LIB(PW, regcmp)
-+AC_CHECK_LIB(xpg4, _xpg4_setrunelocale)
- dnl Checks for terminal libraries
- 
- AC_MSG_CHECKING(for working terminal libraries)
diff --git a/japanese/lyx/Makefile b/japanese/lyx/Makefile
index dd3198a20e6d..140fc05fa758 100644
--- a/japanese/lyx/Makefile
+++ b/japanese/lyx/Makefile
@@ -27,7 +27,6 @@ LIB_DEPENDS=	forms.1:${PORTSDIR}/x11-toolkits/xforms
 USE_XPM=	yes
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LYX_LIBS="-lxpg4"
 STRIP=
 CONFIGURE_ARGS= --with-extra-lib=${X11BASE}/lib --with-extra-inc="${X11BASE}/include ${X11BASE}/include/X11"
 MAN1=		lyx.1 reLyX.1
diff --git a/japanese/mozilla-jlp-devel/Makefile b/japanese/mozilla-jlp-devel/Makefile
index 94974f0304da..1724702aab23 100644
--- a/japanese/mozilla-jlp-devel/Makefile
+++ b/japanese/mozilla-jlp-devel/Makefile
@@ -40,14 +40,12 @@ LOCALENAME=	ja_JP.eucJP
 LOCALENAME=	ja_JP.EUC
 .else
 LOCALENAME=	ja_JP.EUC
-LIBXPG4=	LD_PRELOAD=/usr/lib/libxpg4.so.2; export LD_PRELOAD
 .endif
 
 do-build:
 	${SED} -e "s^%%PREFIX%%^${PREFIX}^g" \
 	       -e "s^%%LOCALBASE%%^${LOCALBASE}^g" \
 	       -e "s^%%LOCALENAME%%^${LOCALENAME}^g" \
-	       -e "s^%%LIBXPG4%%^${LIBXPG4}^g" \
 	       -e "s^%%MOZILLA%%^${MOZILLA}^g" \
 	${FILESDIR}/mozilla.sh > ${WRKDIR}/${MOZILLA}
 
diff --git a/japanese/mozilla-jlp-devel/files/mozilla.sh b/japanese/mozilla-jlp-devel/files/mozilla.sh
index 93205ea8f917..b5a015c99c7c 100644
--- a/japanese/mozilla-jlp-devel/files/mozilla.sh
+++ b/japanese/mozilla-jlp-devel/files/mozilla.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 
 LANG=%%LOCALENAME%%; export LANG
-%%LIBXPG4%%
 #XMODIFIERS=@im=kinput2; export XMODIFIERS
 #LD_PRELOAD=%%LOCALBASE%%/lib/libflashplayer.so.1; export LD_PRELOAD
 
diff --git a/japanese/mozilla-jlp/Makefile b/japanese/mozilla-jlp/Makefile
index 1d7b2312597a..270387331cde 100644
--- a/japanese/mozilla-jlp/Makefile
+++ b/japanese/mozilla-jlp/Makefile
@@ -40,14 +40,12 @@ LOCALENAME=	ja_JP.eucJP
 LOCALENAME=	ja_JP.EUC
 .else
 LOCALENAME=	ja_JP.EUC
-LIBXPG4=	LD_PRELOAD=/usr/lib/libxpg4.so.2; export LD_PRELOAD
 .endif
 
 do-build:
 	${SED} -e "s^%%PREFIX%%^${PREFIX}^g" \
 	       -e "s^%%LOCALBASE%%^${LOCALBASE}^g" \
 	       -e "s^%%LOCALENAME%%^${LOCALENAME}^g" \
-	       -e "s^%%LIBXPG4%%^${LIBXPG4}^g" \
 	       -e "s^%%MOZILLA%%^${MOZILLA}^g" \
 	${FILESDIR}/mozilla.sh > ${WRKDIR}/${MOZILLA}
 
diff --git a/japanese/mozilla-jlp/files/mozilla.sh b/japanese/mozilla-jlp/files/mozilla.sh
index 93205ea8f917..b5a015c99c7c 100644
--- a/japanese/mozilla-jlp/files/mozilla.sh
+++ b/japanese/mozilla-jlp/files/mozilla.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 
 LANG=%%LOCALENAME%%; export LANG
-%%LIBXPG4%%
 #XMODIFIERS=@im=kinput2; export XMODIFIERS
 #LD_PRELOAD=%%LOCALBASE%%/lib/libflashplayer.so.1; export LD_PRELOAD
 
diff --git a/japanese/nethack32/files/patch-ae b/japanese/nethack32/files/patch-ae
index 1b495ca33ae9..ab14e679a021 100644
--- a/japanese/nethack32/files/patch-ae
+++ b/japanese/nethack32/files/patch-ae
@@ -41,12 +41,3 @@ diff -ruN ./sys/unix/Makefile.src ../nethack-3.2.2/sys/unix/Makefile.src
  
  # any other strange libraries your system needs (for Sysunix only -- the more
  # specialized targets should already be right)
-@@ -204,7 +205,7 @@
- #
- # LIBS = -lxpg4
- #
--LIBS =
-+LIBS = -lxpg4
- 
- # make NetHack
- #JP by issei(96/5/27)
diff --git a/japanese/perl5/files/patch-aa b/japanese/perl5/files/patch-aa
index 75362d5e9a0e..65a10d94e33f 100644
--- a/japanese/perl5/files/patch-aa
+++ b/japanese/perl5/files/patch-aa
@@ -18,12 +18,3 @@
  runnm=''
  usenm=''
  useperlio=''
-@@ -858,7 +858,7 @@
- : If anyone needs -lnet, put it in a hint file.
- libswanted='sfio socket inet nsl nm ndbm gdbm dbm db malloc dl'
- libswanted="$libswanted dld ld sun m c cposix posix ndir dir crypt"
--libswanted="$libswanted ucb bsd BSD PW x"
-+libswanted="xpg4 $libswanted ucb bsd BSD PW x"
- : We probably want to search /usr/shlib before most other libraries.
- : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist.
- glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'`