diff options
| author | FUJISHIMA Satsuki <sf@FreeBSD.org> | 2004-11-15 05:19:30 +0000 |
|---|---|---|
| committer | FUJISHIMA Satsuki <sf@FreeBSD.org> | 2004-11-15 05:19:30 +0000 |
| commit | a787f0b0758f9b6d92f3c10d2621440a61b1977e (patch) | |
| tree | 74196deef164c8bc31ec614fc52cd43fcb949f20 | |
| parent | 88479b1d0703b73d3f20015a53e8a442505bfddd (diff) | |
| download | ports-a787f0b0758f9b6d92f3c10d2621440a61b1977e.tar.gz ports-a787f0b0758f9b6d92f3c10d2621440a61b1977e.zip | |
Notes
64 files changed, 30 insertions, 551 deletions
diff --git a/chinese/tk83/files/patch-aa b/chinese/tk83/files/patch-aa index 8f7de8a0de37..2a934f2b2697 100644 --- a/chinese/tk83/files/patch-aa +++ b/chinese/tk83/files/patch-aa @@ -1,5 +1,5 @@ ---- configure.orig Thu Feb 10 11:11:02 2000 -+++ configure Wed Feb 21 23:03:47 2001 +--- configure.orig Thu Feb 10 20:11:02 2000 ++++ configure Mon Nov 15 10:15:21 2004 @@ -18,6 +18,8 @@ ac_help="$ac_help --with-tcl directory containing tcl configuration (tclConfig.sh)" @@ -1380,7 +1380,7 @@ # Check whether --enable-shared or --disable-shared was given. if test "${enable_shared+set}" = set; then enableval="$enable_shared" -@@ -4049,6 +4097,202 @@ +@@ -4049,6 +4097,143 @@ TK_SHARED_BUILD=${SHARED_BUILD} #-------------------------------------------------------------------- @@ -1517,65 +1517,6 @@ + rm -rf ImakeCheck +fi + -+# At last check FreeBSD and have -lxpg4. -+echo $ac_n "checking system version (for additional locale library)""... $ac_c" 1>&6 -+echo "configure:4234: checking system version (for additional locale library)" >&5 -+if test -f /usr/lib/NextStep/software_version; then -+ system=NEXTSTEP-`awk '/3/,/3/' /usr/lib/NextStep/software_version` -+else -+ system=`uname -s`-`uname -r` -+ if test "$?" -ne 0 ; then -+ system=unknown -+ else -+ # Special check for weird MP-RAS system (uname returns weird -+ # results, and the version is kept in special file). -+ -+ if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then -+ system=MP-RAS-`awk '{print $3}' /etc/.relid'` -+ fi -+ if test "`uname -s`" = "AIX" ; then -+ system=AIX-`uname -v`.`uname -r` -+ fi -+ fi -+fi -+ -+case $system in -+ FreeBSD-*) -+ LIBS="$XLIBSW -lxpg4 $tk_oldLibs" -+ CFLAGS="$CFLAGS $X11_IMAKE_FLAGS" -+ cat > conftest.$ac_ext <<EOF -+#line 4259 "configure" -+#include "confdefs.h" -+ -+#include <locale.h> -+ -+int main() { -+ -+(void)setlocale(LC_ALL, ""); -+ -+; return 0; } -+EOF -+if { (eval echo configure:4270: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ -+echo "$ac_t""use xpg4 library." 1>&6 -+XLIBSW="$XLIBSW -lxpg4" -+ -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ -+echo "$ac_t""no need other libraries." 1>&6 -+ -+fi -+rm -f conftest* -+ ;; -+ *) -+ echo "$ac_t""No additional library is needed." 1>&6 -+ ;; -+esac -+ +CFLAGS=$tk_oldCflags +LIBS=$tk_oldLibs + @@ -1583,7 +1524,7 @@ # The statements below define various symbols relating to creating # the stub'd version of the Tk library # -@@ -4281,10 +4525,12 @@ +@@ -4281,10 +4466,12 @@ s%@TCL_BIN_DIR@%$TCL_BIN_DIR%g s%@TCL_SRC_DIR@%$TCL_SRC_DIR%g s%@TCL_LIB_FILE@%$TCL_LIB_FILE%g @@ -1596,7 +1537,7 @@ s%@STUB_LIB_FILE@%$STUB_LIB_FILE%g s%@TK_STUB_LIB_FILE@%$TK_STUB_LIB_FILE%g s%@TK_STUB_LIB_FLAG@%$TK_STUB_LIB_FLAG%g -@@ -4327,6 +4573,7 @@ +@@ -4327,6 +4514,7 @@ s%@XINCLUDES@%$XINCLUDES%g s%@XLIBSW@%$XLIBSW%g s%@TK_SHARED_BUILD@%$TK_SHARED_BUILD%g diff --git a/chinese/tk83/files/patch-ah b/chinese/tk83/files/patch-ah index c865aa3e756f..48ecb7b56b74 100644 --- a/chinese/tk83/files/patch-ah +++ b/chinese/tk83/files/patch-ah @@ -1,5 +1,5 @@ ---- configure.in.orig Thu Feb 10 11:11:02 2000 -+++ configure.in Wed Feb 21 21:27:45 2001 +--- configure.in.orig Thu Feb 10 20:11:02 2000 ++++ configure.in Mon Nov 15 10:10:10 2004 @@ -60,6 +60,12 @@ SC_LOAD_TCLCONFIG @@ -13,7 +13,7 @@ # Recompute the necessary flags to run the compiler #-------------------------------------------------------------------- -@@ -372,6 +378,113 @@ +@@ -372,6 +378,72 @@ TK_SHARED_BUILD=${SHARED_BUILD} #-------------------------------------------------------------------- @@ -79,47 +79,6 @@ + rm -rf ImakeCheck +fi + -+# At last check FreeBSD and have -lxpg4. -+AC_MSG_CHECKING([system version (for additional locale library)]) -+if test -f /usr/lib/NextStep/software_version; then -+ system=NEXTSTEP-`awk '/3/,/3/' /usr/lib/NextStep/software_version` -+else -+ system=`uname -s`-`uname -r` -+ if test "$?" -ne 0 ; then -+ system=unknown -+ else -+ # Special check for weird MP-RAS system (uname returns weird -+ # results, and the version is kept in special file). -+ -+ if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then -+ system=MP-RAS-`awk '{print $3}' /etc/.relid'` -+ fi -+ if test "`uname -s`" = "AIX" ; then -+ system=AIX-`uname -v`.`uname -r` -+ fi -+ fi -+fi -+ -+case $system in -+ FreeBSD-*) -+ LIBS="$XLIBSW -lxpg4 $tk_oldLibs" -+ CFLAGS="$CFLAGS $X11_IMAKE_FLAGS" -+ AC_TRY_COMPILE([ -+#include <locale.h> -+], [ -+(void)setlocale(LC_ALL, ""); -+], [ -+AC_MSG_RESULT(use xpg4 library.) -+XLIBSW="$XLIBSW -lxpg4" -+], [ -+AC_MSG_RESULT(no need other libraries.) -+]) -+ ;; -+ *) -+ AC_MSG_RESULT(No additional library is needed.) -+ ;; -+esac -+ +CFLAGS=$tk_oldCflags +LIBS=$tk_oldLibs + @@ -127,7 +86,7 @@ # The statements below define various symbols relating to creating # the stub'd version of the Tk library # -@@ -453,5 +566,5 @@ +@@ -453,5 +525,5 @@ AC_SUBST(XINCLUDES) AC_SUBST(XLIBSW) AC_SUBST(TK_SHARED_BUILD) diff --git a/devel/ruby-locale/files/patch-aa b/devel/ruby-locale/files/patch-aa deleted file mode 100644 index 5789b00980e5..000000000000 --- a/devel/ruby-locale/files/patch-aa +++ /dev/null @@ -1,8 +0,0 @@ ---- extconf.rb.orig Fri Apr 14 13:20:58 2000 -+++ extconf.rb Tue Aug 15 21:16:38 2000 -@@ -1,4 +1,5 @@ - require 'mkmf' - - have_header 'locale.h' -+have_library 'xpg4', 'setlocale' - create_makefile 'locale' 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 diff --git a/emulators/xsystem35/files/patch-configure.in b/emulators/xsystem35/files/patch-configure.in index 38f5a9ec38d4..98350fe3a160 100644 --- a/emulators/xsystem35/files/patch-configure.in +++ b/emulators/xsystem35/files/patch-configure.in @@ -1,11 +1,10 @@ ---- configure.ac.orig Tue Nov 27 04:26:47 2001 -+++ configure.ac Sun Dec 23 07:26:26 2001 -@@ -316,7 +316,7 @@ +--- configure.ac.orig Sun Dec 21 16:18:05 2003 ++++ configure.ac Mon Nov 15 10:22:54 2004 +@@ -463,7 +463,6 @@ *-*-linux*) ;; *-*-freebsd*) - EXTRALIBS="$EXTRALIBS -lxpg4" -+ AC_CHECK_LIB(xpg4, _xpg4_setrunelocale, EXTRALIBS="$EXTRALIBS -lxpg4") ;; *-irix*) chk_rgb=yes diff --git a/games/xshisen/Makefile b/games/xshisen/Makefile index de8630adf17f..3c577b099db5 100644 --- a/games/xshisen/Makefile +++ b/games/xshisen/Makefile @@ -25,11 +25,6 @@ CONFIGURE_ARGS= --datadir="${X11BASE}/lib/X11" \ .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 220000 && ${OSVERSION} < 400020 || \ - ${OSVERSION} >= 500000 && ${OSVERSION} < 500005 -CONFIGURE_ENV= LIBS="-lxpg4" -.endif - MANLANG= "" ja MAN6= xshisen.6 diff --git a/graphics/xv/files/patch-ad b/graphics/xv/files/patch-ad index 776bffa91580..ea06f11a1925 100644 --- a/graphics/xv/files/patch-ad +++ b/graphics/xv/files/patch-ad @@ -1,5 +1,5 @@ ---- Imakefile.orig Thu Jun 14 00:25:24 2001 -+++ Imakefile Thu Jun 14 00:26:01 2001 +--- Imakefile.orig Mon Nov 15 10:27:12 2004 ++++ Imakefile Mon Nov 15 10:28:32 2004 @@ -6,13 +6,15 @@ /* if, for whatever reason, you're unable to get the JPEG library to compile * on your machine, *COMMENT OUT* the following line @@ -65,28 +65,7 @@ INCLUDES = $(JPEGINCLUDE) $(TIFFINCLUDE) -@@ -254,10 +270,10 @@ - #endif - - --NormalProgramTarget(xv,$(OBJS1),$(DEPLIBS),$(LOCAL_LIBRARIES),) --NormalProgramTarget(bggen,$(OBJS2),$(DEPLIBS),$(LOCAL_LIBRARIES),) --NormalProgramTarget(xcmap,$(OBJS4),$(DEPLIBS),$(LOCAL_LIBRARIES),) --NormalProgramTarget(xvpictoppm,$(OBJS5),$(DEPLIBS),$(LOCAL_LIBRARIES),) -+NormalProgramTarget(xv,$(OBJS1),$(DEPLIBS),$(LOCAL_LIBRARIES),-lxpg4) -+NormalProgramTarget(bggen,$(OBJS2),$(DEPLIBS),$(LOCAL_LIBRARIES),-lxpg4) -+NormalProgramTarget(xcmap,$(OBJS4),$(DEPLIBS),$(LOCAL_LIBRARIES),-lxpg4) -+NormalProgramTarget(xvpictoppm,$(OBJS5),$(DEPLIBS),$(LOCAL_LIBRARIES),-lxpg4) - - - InstallProgram(xv,$(BINDIR)) -@@ -266,16 +282,16 @@ - InstallProgram(xvpictoppm,$(BINDIR)) - - #ifdef HavePDS --NormalProgramTarget(vdcomp,$(OBJS3),$(DEPLIBS),$(LOCAL_LIBRARIES),) -+NormalProgramTarget(vdcomp,$(OBJS3),$(DEPLIBS),$(LOCAL_LIBRARIES),-lxpg4) - InstallProgram(vdcomp,$(BINDIR)) +@@ -271,11 +287,11 @@ #endif 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 ! !'` diff --git a/korean/eterm/Makefile b/korean/eterm/Makefile index 83e5f61058f3..d2876415c2d6 100644 --- a/korean/eterm/Makefile +++ b/korean/eterm/Makefile @@ -24,7 +24,7 @@ USE_GNOME= imlib USE_INC_LIBTOOL_VER=13 USE_PERL5_BUILD=yes GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lxpg4" LOCALBASE="${LOCALBASE}" +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" LOCALBASE="${LOCALBASE}" MAN1= Eterm.1 pre-patch: diff --git a/korean/mozilla-klp/Makefile b/korean/mozilla-klp/Makefile index 734047be8abf..08909df7a7ab 100644 --- a/korean/mozilla-klp/Makefile +++ b/korean/mozilla-klp/Makefile @@ -37,7 +37,6 @@ LOCALENAME= ko_KR.eucKR LOCALENAME= ko_KR.EUC .else LOCALENAME= ko_KR.EUC -LIBXPG4= LD_PRELOAD=/usr/lib/libxpg4.so.2; export LD_PRELOAD .endif post-extract: @@ -47,7 +46,6 @@ post-extract: do-build: ${SED} -e "s^@PREFIX@^${PREFIX}^g" \ -e "s^@LOCALENAME@^${LOCALENAME}^g" \ - -e "s^@LIBXPG4@^${LIBXPG4}^g" \ ${FILESDIR}/mozilla.sh > ${WRKDIR}/mozilla do-install: diff --git a/korean/mozilla-klp/files/mozilla.sh b/korean/mozilla-klp/files/mozilla.sh index 7e183ce1f581..db52e301cd42 100644 --- a/korean/mozilla-klp/files/mozilla.sh +++ b/korean/mozilla-klp/files/mozilla.sh @@ -1,7 +1,6 @@ #!/bin/sh LANG=@LOCALENAME@; export LANG -@LIBXPG4@ cd @PREFIX@/lib/mozilla exec ./mozilla "$@" diff --git a/lang/librep/Makefile b/lang/librep/Makefile index 2ca71d564212..dc3b07ffde09 100644 --- a/lang/librep/Makefile +++ b/lang/librep/Makefile @@ -24,7 +24,7 @@ USE_GMAKE= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib -lxpg4 -lintl ${PTHREAD_LIBS}" + LIBS="-L${LOCALBASE}/lib -lintl ${PTHREAD_LIBS}" CONFIGURE_ARGS= --with-aclocaldir=${PREFIX}/share/aclocal CONFIGURE_TARGET= ${ARCH}-pc-freebsd${OSREL:C/\..*//} diff --git a/lang/python-devel/Makefile b/lang/python-devel/Makefile index e0294881393a..78b64bdd1552 100644 --- a/lang/python-devel/Makefile +++ b/lang/python-devel/Makefile @@ -88,13 +88,6 @@ CFLAGS+= -I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" .endif -.if ${OSVERSION} >= 500000 && ${OSVERSION} < 500005 -CONFIGURE_ARGS+= --with-libs='-lxpg4' -.endif -.if ${OSVERSION} < 400020 -CONFIGURE_ARGS+= --with-libs='-lxpg4' -.endif - .if !defined(WITHOUT_IPV6) && ${OSVERSION} >= 400014 CONFIGURE_ARGS+= --enable-ipv6 .else diff --git a/lang/python/Makefile b/lang/python/Makefile index 3579aaba9839..504bdc966737 100644 --- a/lang/python/Makefile +++ b/lang/python/Makefile @@ -90,13 +90,6 @@ CFLAGS+= -I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" .endif -.if ${OSVERSION} >= 500000 && ${OSVERSION} < 500005 -CONFIGURE_ARGS+= --with-libs='-lxpg4' -.endif -.if ${OSVERSION} < 400020 -CONFIGURE_ARGS+= --with-libs='-lxpg4' -.endif - .if !defined(WITHOUT_IPV6) && ${OSVERSION} >= 400014 CONFIGURE_ARGS+= --enable-ipv6 .else diff --git a/lang/python21/Makefile b/lang/python21/Makefile index 8ab23120d5dc..8a0876937041 100644 --- a/lang/python21/Makefile +++ b/lang/python21/Makefile @@ -52,13 +52,6 @@ CFLAGS+= -I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" .endif -.if ${OSVERSION} >= 500000 && ${OSVERSION} < 500005 -CONFIGURE_ARGS+= --with-libs='-lxpg4' -.endif -.if ${OSVERSION} < 400020 -CONFIGURE_ARGS+= --with-libs='-lxpg4' -.endif - .if ${OSVERSION} >= 500000 PLATFORMS=plat-freebsd2 plat-freebsd3 plat-freebsd4 .elif ${OSVERSION} >= 400000 diff --git a/lang/python22/Makefile b/lang/python22/Makefile index 6f05510c6e61..3eda730b8c0b 100644 --- a/lang/python22/Makefile +++ b/lang/python22/Makefile @@ -60,13 +60,6 @@ CFLAGS+= -I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" .endif -.if ${OSVERSION} >= 500000 && ${OSVERSION} < 500005 -CONFIGURE_ARGS+= --with-libs='-lxpg4' -.endif -.if ${OSVERSION} < 400020 -CONFIGURE_ARGS+= --with-libs='-lxpg4' -.endif - .if ${OSVERSION} >= 400014 CONFIGURE_ARGS+= --enable-ipv6 .else diff --git a/lang/python23/Makefile b/lang/python23/Makefile index 3579aaba9839..504bdc966737 100644 --- a/lang/python23/Makefile +++ b/lang/python23/Makefile @@ -90,13 +90,6 @@ CFLAGS+= -I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" .endif -.if ${OSVERSION} >= 500000 && ${OSVERSION} < 500005 -CONFIGURE_ARGS+= --with-libs='-lxpg4' -.endif -.if ${OSVERSION} < 400020 -CONFIGURE_ARGS+= --with-libs='-lxpg4' -.endif - .if !defined(WITHOUT_IPV6) && ${OSVERSION} >= 400014 CONFIGURE_ARGS+= --enable-ipv6 .else diff --git a/lang/python24/Makefile b/lang/python24/Makefile index 3579aaba9839..504bdc966737 100644 --- a/lang/python24/Makefile +++ b/lang/python24/Makefile @@ -90,13 +90,6 @@ CFLAGS+= -I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" .endif -.if ${OSVERSION} >= 500000 && ${OSVERSION} < 500005 -CONFIGURE_ARGS+= --with-libs='-lxpg4' -.endif -.if ${OSVERSION} < 400020 -CONFIGURE_ARGS+= --with-libs='-lxpg4' -.endif - .if !defined(WITHOUT_IPV6) && ${OSVERSION} >= 400014 CONFIGURE_ARGS+= --enable-ipv6 .else diff --git a/lang/python25/Makefile b/lang/python25/Makefile index e0294881393a..78b64bdd1552 100644 --- a/lang/python25/Makefile +++ b/lang/python25/Makefile @@ -88,13 +88,6 @@ CFLAGS+= -I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" .endif -.if ${OSVERSION} >= 500000 && ${OSVERSION} < 500005 -CONFIGURE_ARGS+= --with-libs='-lxpg4' -.endif -.if ${OSVERSION} < 400020 -CONFIGURE_ARGS+= --with-libs='-lxpg4' -.endif - .if !defined(WITHOUT_IPV6) && ${OSVERSION} >= 400014 CONFIGURE_ARGS+= --enable-ipv6 .else diff --git a/lang/python26/Makefile b/lang/python26/Makefile index e0294881393a..78b64bdd1552 100644 --- a/lang/python26/Makefile +++ b/lang/python26/Makefile @@ -88,13 +88,6 @@ CFLAGS+= -I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" .endif -.if ${OSVERSION} >= 500000 && ${OSVERSION} < 500005 -CONFIGURE_ARGS+= --with-libs='-lxpg4' -.endif -.if ${OSVERSION} < 400020 -CONFIGURE_ARGS+= --with-libs='-lxpg4' -.endif - .if !defined(WITHOUT_IPV6) && ${OSVERSION} >= 400014 CONFIGURE_ARGS+= --enable-ipv6 .else diff --git a/lang/python27/Makefile b/lang/python27/Makefile index e0294881393a..78b64bdd1552 100644 --- a/lang/python27/Makefile +++ b/lang/python27/Makefile @@ -88,13 +88,6 @@ CFLAGS+= -I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" .endif -.if ${OSVERSION} >= 500000 && ${OSVERSION} < 500005 -CONFIGURE_ARGS+= --with-libs='-lxpg4' -.endif -.if ${OSVERSION} < 400020 -CONFIGURE_ARGS+= --with-libs='-lxpg4' -.endif - .if !defined(WITHOUT_IPV6) && ${OSVERSION} >= 400014 CONFIGURE_ARGS+= --enable-ipv6 .else diff --git a/lang/python30/Makefile b/lang/python30/Makefile index e0294881393a..78b64bdd1552 100644 --- a/lang/python30/Makefile +++ b/lang/python30/Makefile @@ -88,13 +88,6 @@ CFLAGS+= -I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" .endif -.if ${OSVERSION} >= 500000 && ${OSVERSION} < 500005 -CONFIGURE_ARGS+= --with-libs='-lxpg4' -.endif -.if ${OSVERSION} < 400020 -CONFIGURE_ARGS+= --with-libs='-lxpg4' -.endif - .if !defined(WITHOUT_IPV6) && ${OSVERSION} >= 400014 CONFIGURE_ARGS+= --enable-ipv6 .else diff --git a/lang/python31/Makefile b/lang/python31/Makefile index e0294881393a..78b64bdd1552 100644 --- a/lang/python31/Makefile +++ b/lang/python31/Makefile @@ -88,13 +88,6 @@ CFLAGS+= -I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" .endif -.if ${OSVERSION} >= 500000 && ${OSVERSION} < 500005 -CONFIGURE_ARGS+= --with-libs='-lxpg4' -.endif -.if ${OSVERSION} < 400020 -CONFIGURE_ARGS+= --with-libs='-lxpg4' -.endif - .if !defined(WITHOUT_IPV6) && ${OSVERSION} >= 400014 CONFIGURE_ARGS+= --enable-ipv6 .else diff --git a/lang/python32/Makefile b/lang/python32/Makefile index e0294881393a..78b64bdd1552 100644 --- a/lang/python32/Makefile +++ b/lang/python32/Makefile @@ -88,13 +88,6 @@ CFLAGS+= -I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" .endif -.if ${OSVERSION} >= 500000 && ${OSVERSION} < 500005 -CONFIGURE_ARGS+= --with-libs='-lxpg4' -.endif -.if ${OSVERSION} < 400020 -CONFIGURE_ARGS+= --with-libs='-lxpg4' -.endif - .if !defined(WITHOUT_IPV6) && ${OSVERSION} >= 400014 CONFIGURE_ARGS+= --enable-ipv6 .else diff --git a/mail/mutt-devel/files/patch-04 b/mail/mutt-devel/files/patch-04 deleted file mode 100644 index 0ba38f64ed8d..000000000000 --- a/mail/mutt-devel/files/patch-04 +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig Tue Jan 18 14:19:14 2000 -+++ configure Tue Feb 29 01:47:49 2000 -@@ -5710,7 +5710,7 @@ - s%@FFLAGS@%$FFLAGS%g - s%@DEFS@%$DEFS%g - s%@LDFLAGS@%$LDFLAGS%g --s%@LIBS@%$LIBS%g -+s%@LIBS@%$LIBS -lxpg4%g - s%@exec_prefix@%$exec_prefix%g - s%@prefix@%$prefix%g - s%@program_transform_name@%$program_transform_name%g diff --git a/mail/xpbiff/Makefile b/mail/xpbiff/Makefile index c6ae1dc63027..b57d9252503e 100644 --- a/mail/xpbiff/Makefile +++ b/mail/xpbiff/Makefile @@ -49,13 +49,6 @@ pre-patch: ${CP} ${FILESDIR}/LocPixmap.c ${WRKSRC} ); post-patch: - @(for libfile in /usr/lib/libxpg4*; do \ - if [ ! "$$libfile" = "" ]; then \ - ${ECHO_MSG} "===> Finding the xpg4 library in /usr/lib"; \ - (cd ${WRKSRC}; ${PATCH} -s < ${FILESDIR}/Imakefile.xpg4.diff );\ - break 1; \ - fi; \ - done) .if defined(YOUBIN) @(cd ${WRKSRC}; ${PATCH} -s < ${FILESDIR}/xpbiff.youbin.diff ); .endif diff --git a/mail/xpbiff/files/Imakefile.xpg4.diff b/mail/xpbiff/files/Imakefile.xpg4.diff deleted file mode 100644 index ed5501306b3e..000000000000 --- a/mail/xpbiff/files/Imakefile.xpg4.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- Imakefile.org Thu Apr 10 23:39:59 1997 -+++ Imakefile Thu Apr 10 23:40:16 1997 -@@ -58,7 +58,7 @@ - LOCAL_LDFLAGS = $(XI18NLIBDIR) $(UCBLIBDIR) - DEPLIBS = $(DEPXPMLIB) XawClientDepLibs $(DEPXWCHARLIB) - LOCAL_LIBRARIES = $(XPMLIB) XawClientLibs $(XWCHARLIB) --EXTRA_LIBRARIES = $(UCBLIB) -lm ExtraLibraries -+EXTRA_LIBRARIES = $(UCBLIB) -lm -lxpg4 ExtraLibraries - SRCS = xpbiff.c $(CONVSRC) - OBJS = xpbiff.o $(CONVOBJ) - diff --git a/math/ngraph/files/patch-aa b/math/ngraph/files/patch-aa index 92008d4fa064..7287ee407600 100644 --- a/math/ngraph/files/patch-aa +++ b/math/ngraph/files/patch-aa @@ -67,7 +67,7 @@ +PLATFORM = '"for X11 [FreeBSD+Motif2.1]"' +X11INCLUDE = -I${X11BASE}/include -I/usr/dt/include +STATICLINK = -+X11LIB = ${MOTIFLIB} -lm -L${X11BASE}/lib -lXext -lXt -lXp -lX11 -lICE -lSM -lxpg4 ++X11LIB = ${MOTIFLIB} -lm -L${X11BASE}/lib -lXext -lXt -lXp -lX11 -lICE -lSM # ############################################################################### diff --git a/textproc/coco/files/patch-src_s_freebsd.h b/textproc/coco/files/patch-src_s_freebsd.h index 335ddbe7220b..204bcdd335e8 100644 --- a/textproc/coco/files/patch-src_s_freebsd.h +++ b/textproc/coco/files/patch-src_s_freebsd.h @@ -34,7 +34,7 @@ diff -rBbc src/s/freebsd.h src/s/freebsd.h #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base) #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/x11-clocks/emiclock/files/patch-ab b/x11-clocks/emiclock/files/patch-ab deleted file mode 100644 index dd056ab6f46a..000000000000 --- a/x11-clocks/emiclock/files/patch-ab +++ /dev/null @@ -1,10 +0,0 @@ ---- Imakefile- Thu Sep 2 23:33:47 1999 -+++ Imakefile Thu Sep 30 11:25:00 1999 -@@ -104,6 +104,7 @@ - /* FreeBSD */ - #if defined(i386BsdArchitecture) && (defined(i386FreeBsd) || defined(FreeBSDArchitecture)) - #define StartupSound myu.au -+EXTRA_LIBRARIES = -lxpg4 - #endif /* i386BsdArchitecture && (i386FreeBsd || FreeBSDArchitecture) */ - - #else /* USE_NETAUDIO */ diff --git a/x11-fonts/xmbdfed/files/patch-aa b/x11-fonts/xmbdfed/files/patch-aa index d709efed2e2a..1ab5342c4422 100644 --- a/x11-fonts/xmbdfed/files/patch-aa +++ b/x11-fonts/xmbdfed/files/patch-aa @@ -66,7 +66,7 @@ $FreeBSD$ +INCS = -I${X11BASE}/include ${FTYPE_INCS} +LIBS = -L${X11BASE}/lib ${MOTIFLIB} \ -+ -lXpm -lXmu -lXt -lX11 -lSM -lICE -lXext -lxpg4 ${FTYPE_LIBS} ++ -lXpm -lXmu -lXt -lX11 -lSM -lICE -lXext ${FTYPE_LIBS} + all: xmbdfed + diff --git a/x11-toolkits/qt145/files/patch-aa b/x11-toolkits/qt145/files/patch-aa index c09663b2a880..999e2d80af94 100644 --- a/x11-toolkits/qt145/files/patch-aa +++ b/x11-toolkits/qt145/files/patch-aa @@ -1,14 +1,16 @@ ---- configs/freebsd-g++-shared.orig Tue Oct 10 00:37:00 2000 -+++ configs/freebsd-g++-shared Tue Oct 10 00:37:24 2000 -@@ -25,7 +25,7 @@ +--- configs/freebsd-g++-shared.orig Mon Nov 15 10:50:49 2004 ++++ configs/freebsd-g++-shared Mon Nov 15 10:52:33 2004 +@@ -25,8 +25,8 @@ # Linking applications SYSCONF_LINK = g++ -SYSCONF_LFLAGS = +-SYSCONF_LIBS = -lxpg4 +SYSCONF_LFLAGS = %%CXXFLAGS%% - SYSCONF_LIBS = -lxpg4 ++SYSCONF_LIBS = # Link flags shared objects + SYSCONF_LFLAGS_SHOBJ = -shared @@ -40,15 +40,13 @@ # - Usually needs to incorporate $(VER_MAJ) and $(VER_MIN) # |