From d522ade7a89002a6d002a0c9c034d9d6d7ac2709 Mon Sep 17 00:00:00 2001 From: Jean-Yves Lefort Date: Wed, 31 Aug 2005 21:47:54 +0000 Subject: - Update to 1.1.1 [1] - Respect ${CXX}, ${CXXFLAGS}, ${PREFIX}, ${PTHREAD_CFLAGS}, ${PTHREAD_LIBS}, ${INSTALL_PROGRAM} and ${INSTALL_DATA} - Sort the packing list [1]: PR: ports/85286 Submitted by: maintainer --- lang/afnix/files/patch-cnf_bin_afnix-guess | 10 ---- lang/afnix/files/patch-cnf_mak_afnix-defs.mak | 14 ----- lang/afnix/files/patch-cnf_mak_afnix-freebsd.mak | 72 ++++++++++++++++++++++++ lang/afnix/files/patch-cnf_mak_afnix-gcc-3.mak | 20 ------- lang/afnix/files/patch-cnf_mak_afnix-rule.mak | 62 ++++++++++++-------- lang/afnix/files/patch-src_lib_plt_acf_Makefile | 11 ++++ lang/afnix/files/patch-src_plt_acf_ccnf.cpp | 37 ------------ lang/afnix/files/patch-src_plt_lib_cclk.cxx | 22 -------- lang/afnix/files/patch-src_plt_lib_cdir.cxx | 10 ---- 9 files changed, 122 insertions(+), 136 deletions(-) delete mode 100644 lang/afnix/files/patch-cnf_bin_afnix-guess delete mode 100644 lang/afnix/files/patch-cnf_mak_afnix-defs.mak create mode 100644 lang/afnix/files/patch-cnf_mak_afnix-freebsd.mak delete mode 100644 lang/afnix/files/patch-cnf_mak_afnix-gcc-3.mak create mode 100644 lang/afnix/files/patch-src_lib_plt_acf_Makefile delete mode 100644 lang/afnix/files/patch-src_plt_acf_ccnf.cpp delete mode 100644 lang/afnix/files/patch-src_plt_lib_cclk.cxx delete mode 100644 lang/afnix/files/patch-src_plt_lib_cdir.cxx (limited to 'lang/afnix/files') diff --git a/lang/afnix/files/patch-cnf_bin_afnix-guess b/lang/afnix/files/patch-cnf_bin_afnix-guess deleted file mode 100644 index e0b9521c4794..000000000000 --- a/lang/afnix/files/patch-cnf_bin_afnix-guess +++ /dev/null @@ -1,10 +0,0 @@ ---- cnf/bin/afnix-guess.orig Wed Jan 12 06:05:00 2005 -+++ cnf/bin/afnix-guess Wed Feb 16 19:18:04 2005 -@@ -113,6 +113,7 @@ - mips) proc_name=mips;; - mipsel) proc_name=mipsel;; - parisc*) proc_name=pa64;; -+ amd64) proc_name=amd64;; - ia64) proc_name=ia64;; - s390*) proc_name=s390;; - x86_64) proc_name=x64;; diff --git a/lang/afnix/files/patch-cnf_mak_afnix-defs.mak b/lang/afnix/files/patch-cnf_mak_afnix-defs.mak deleted file mode 100644 index 667e04179cac..000000000000 --- a/lang/afnix/files/patch-cnf_mak_afnix-defs.mak +++ /dev/null @@ -1,14 +0,0 @@ ---- cnf/mak/afnix-defs.mak.orig Wed Feb 16 19:35:18 2005 -+++ cnf/mak/afnix-defs.mak Wed Feb 16 19:37:55 2005 -@@ -58,9 +58,9 @@ - BINDIR = $(PREFIX)/bin - LIBDIR = $(PREFIX)/lib - HDRDIR = $(SHRDIR)/include/afnix --DOCDIR = $(SHRDIR)/doc/afnix -+DOCDIR = $(SHRDIR)/share/doc/afnix - MANDIR = $(SHRDIR)/man --ETCDIR = $(SHRDIR)/etc/afnix -+ETCDIR = $(SHRDIR)/share/doc/afnix - - # ---------------------------------------------------------------------------- - # - other shared commands and scripts - diff --git a/lang/afnix/files/patch-cnf_mak_afnix-freebsd.mak b/lang/afnix/files/patch-cnf_mak_afnix-freebsd.mak new file mode 100644 index 000000000000..feaf4b9234e6 --- /dev/null +++ b/lang/afnix/files/patch-cnf_mak_afnix-freebsd.mak @@ -0,0 +1,72 @@ +--- cnf/mak/afnix-freebsd.mak.orig Wed Aug 31 21:59:00 2005 ++++ cnf/mak/afnix-freebsd.mak Wed Aug 31 22:00:29 2005 +@@ -1,6 +1,6 @@ + # ---------------------------------------------------------------------------- +-# - afnix-gcc-3 - +-# - afnix compiler configuration - gcc configuration - ++# - afnix-freebsd - ++# - afnix compiler configuration - FreeBSD system compiler configuration - + # ---------------------------------------------------------------------------- + # - This program is free software; you can redistribute it and/or modify - + # - it provided that this copyright notice is kept intact. - +@@ -18,21 +18,21 @@ + # - compiler and linker section - + # ---------------------------------------------------------------------------- + +-CC = g++ +-LD = gcc +-LK = gcc ++CC = $(CXX) ++LD = $(CXX) ++LK = $(CXX) + AR = ar rc + STDCCFLAGS = -Wall -Werror -MMD -fno-builtin + STACCFLAGS = + DYNCCFLAGS = -fPIC + PLTCCFLAGS = + DEBUGFLAGS = -g +-OPTCCFLAGS = -O2 ++OPTCCFLAGS = + PFLCCFLAGS = -g -pg + COVCCFLAGS = -g -fprofile-arcs -ftest-coverage + CPPCCFLAGS = -nostdinc -nostdinc++ + CXXCCFLAGS = +-STDDEFINES = -D_REENTRANT ++STDDEFINES = $(PTHREAD_CFLAGS) + DBGDEFINES = -DDEBUG + OPTDEFINES = + STDINCLUDE = +@@ -68,8 +68,8 @@ + + # adjust for freebsd platform + ifeq ($(PLATNAME),freebsd) +-LD = g++ +-LK = g++ ++LD = $(CXX) ++LK = $(CXX) + LDFLAGS = -shared + AFXCPPLIBS = + ifeq ($(LKMODE),soname) +@@ -85,7 +85,7 @@ + + # adjust linker flags for freebsd + ifeq ($(PLATNAME),freebsd) +-LKFLAGS = -pthread ++LKFLAGS = $(PTHREAD_LIBS) + endif + + # ---------------------------------------------------------------------------- +@@ -102,13 +102,10 @@ + + # adjust intel processor + ifeq ($(PROCNAME)-$(PROCTYPE),ia-586) +-PLTCCFLAGS += -mcpu=i586 + endif + ifeq ($(PROCNAME)-$(PROCTYPE),ia-686) +-PLTCCFLAGS += -mcpu=i686 + endif + + # adjust sparc processor + ifeq ($(PROCNAME)-$(PROCTYPE),sparc-ultra) +-PLTCCFLAGS += -mcpu=ultrasparc -mtune=ultrasparc + endif diff --git a/lang/afnix/files/patch-cnf_mak_afnix-gcc-3.mak b/lang/afnix/files/patch-cnf_mak_afnix-gcc-3.mak deleted file mode 100644 index bc8fdbd82820..000000000000 --- a/lang/afnix/files/patch-cnf_mak_afnix-gcc-3.mak +++ /dev/null @@ -1,20 +0,0 @@ ---- cnf/mak/afnix-gcc-3.mak.orig Wed Jan 12 06:05:00 2005 -+++ cnf/mak/afnix-gcc-3.mak Wed Feb 16 19:18:04 2005 -@@ -22,7 +22,7 @@ - LD = gcc - LK = gcc - AR = ar rc --STDCCFLAGS = -Wall -Werror -MMD -fno-builtin -+STDCCFLAGS = -Wall -MMD -fno-builtin - STACCFLAGS = - DYNCCFLAGS = -fPIC - PLTCCFLAGS = -@@ -43,7 +43,7 @@ - # - compiler dependant libraries - - # ---------------------------------------------------------------------------- - --AFXCPPLIBS = -lsupc++ -+AFXCPPLIBS = -lstdc++ - - # ---------------------------------------------------------------------------- - # - platform dependant linking flags - diff --git a/lang/afnix/files/patch-cnf_mak_afnix-rule.mak b/lang/afnix/files/patch-cnf_mak_afnix-rule.mak index d93beadbac85..af6613c482fa 100644 --- a/lang/afnix/files/patch-cnf_mak_afnix-rule.mak +++ b/lang/afnix/files/patch-cnf_mak_afnix-rule.mak @@ -1,31 +1,47 @@ ---- cnf/mak/afnix-rule.mak.orig Wed Jan 12 06:05:00 2005 -+++ cnf/mak/afnix-rule.mak Wed Feb 16 19:18:04 2005 -@@ -62,8 +62,8 @@ +--- cnf/mak/afnix-rule.mak.orig Thu Aug 25 07:13:37 2005 ++++ cnf/mak/afnix-rule.mak Wed Aug 31 22:43:14 2005 +@@ -22,7 +22,7 @@ + + ifeq ($(CCMODE),optimized) + CPPFLAGS = $(STDCCFLAGS) $(PLTCCFLAGS) $(CPPCCFLAGS) $(OPTCCFLAGS) +- CXXFLAGS = $(STDCCFLAGS) $(PLTCCFLAGS) $(CXXCCFLAGS) $(OPTCCFLAGS) ++ CXXFLAGS += $(STDCCFLAGS) $(PLTCCFLAGS) $(CXXCCFLAGS) $(OPTCCFLAGS) + CCDEFINE = $(STDDEFINES) $(PLTDEFINES) $(OPTDEFINES) endif - ifeq ($(LKMODE),soname) --SONAME = $(SOLIB).$(MAJOR).$(MINOR) --SOVERS = $(SOLIB).$(MAJOR).$(MINOR).$(PATCH) -+SONAME = $(SOLIB).$(MAJOR) -+SOVERS = $(SOLIB).$(MAJOR) +@@ -78,7 +78,7 @@ + -include *.d + + %.o : %.cpp +- $(CC) $(PPFLAGS) $(DEFINES) $(PPINCLS) -o $@ -c $< ++ $(CC) $(CXXFLAGS) $(PPFLAGS) $(DEFINES) $(PPINCLS) -o $@ -c $< + + %.o : %.cxx + $(CC) $(XXFLAGS) $(DEFINES) $(XXINCLS) -o $@ -c $< +@@ -95,7 +95,7 @@ + + install-arlib: $(ARLIB) + @$(MKDIR) $(LIBDIR) +- @$(CP) $(ARLIB) $(LIBDIR) ++ @$(BSD_INSTALL_DATA) $(ARLIB) $(LIBDIR) + .PHONY: install-arlib + else + install-arlib: $(ARLIB) +@@ -117,7 +117,7 @@ + + install-solib : $(SOLIB) + @$(MKDIR) $(LIBDIR) +- @$(CP) $(SOLIB) $(LIBDIR) ++ @$(BSD_INSTALL_PROGRAM) $(SOLIB) $(LIBDIR) + .PHONY: install-solib endif - # ---------------------------------------------------------------------------- -@@ -124,17 +124,13 @@ - $(SOLIB) : $(SOVERS) - @$(MKDIR) $(BLDLIB) - @$(CP) $(SOVERS) $(BLDLIB) -- @$(RM) $(BLDLIB)/$(SOLIB) - @$(RM) $(BLDLIB)/$(SONAME) -- @$(LN) $(SOVERS) $(BLDLIB)/$(SONAME) - @$(LN) $(SONAME) $(BLDLIB)/$(SOLIB) +@@ -136,7 +136,7 @@ install-solib : $(SOVERS) @$(MKDIR) $(LIBDIR) - @$(CP) $(SOVERS) $(LIBDIR) -- @$(RM) $(LIBDIR)/$(SONAME) +- @$(CP) $(SOVERS) $(LIBDIR) ++ @$(BSD_INSTALL_PROGRAM) $(SOVERS) $(LIBDIR) + @$(RM) $(LIBDIR)/$(SONAME) @$(RM) $(LIBDIR)/$(SOLIB) -- @$(LN) $(SOVERS) $(LIBDIR)/$(SONAME) - @$(LN) $(SONAME) $(LIBDIR)/$(SOLIB) - .PHONY: install-solib - endif + @$(LN) $(SOVERS) $(LIBDIR)/$(SONAME) diff --git a/lang/afnix/files/patch-src_lib_plt_acf_Makefile b/lang/afnix/files/patch-src_lib_plt_acf_Makefile new file mode 100644 index 000000000000..4ef939e84ae3 --- /dev/null +++ b/lang/afnix/files/patch-src_lib_plt_acf_Makefile @@ -0,0 +1,11 @@ +--- src/lib/plt/acf/Makefile.orig Wed Aug 31 22:36:40 2005 ++++ src/lib/plt/acf/Makefile Wed Aug 31 22:36:40 2005 +@@ -48,7 +48,7 @@ + # build the ccnf generator + + ccnf: ccnf.cpp +- @$(CC) $(CNFDEFINES) -o ccnf ccnf.cpp ++ @$(CC) $(CXXFLAGS) $(CNFDEFINES) -o ccnf ccnf.cpp + + # rule: distri + # this rule install the acf directory in the distribution diff --git a/lang/afnix/files/patch-src_plt_acf_ccnf.cpp b/lang/afnix/files/patch-src_plt_acf_ccnf.cpp deleted file mode 100644 index 162375105ba8..000000000000 --- a/lang/afnix/files/patch-src_plt_acf_ccnf.cpp +++ /dev/null @@ -1,37 +0,0 @@ ---- src/plt/acf/ccnf.cpp.orig Wed Jan 12 06:05:00 2005 -+++ src/plt/acf/ccnf.cpp Wed Feb 16 19:18:04 2005 -@@ -42,6 +42,7 @@ - #define AFNIX_PROCTYPE_IA64 10 - #define AFNIX_PROCTYPE_S390 11 - #define AFNIX_PROCTYPE_X64 12 -+#define AFNIX_PROCTYPE_AMD64 12 - - // recognized processor name - #define AFNIX_PROCNAME_UNKNOWN "unknown" -@@ -57,6 +58,7 @@ - #define AFNIX_PROCNAME_IA64 "ia64" - #define AFNIX_PROCNAME_S390 "s390" - #define AFNIX_PROCNAME_X64 "x64" -+#define AFNIX_PROCNAME_AMD64 "amd64" - - // force size type with S390 - #if defined(__s390__) -@@ -117,6 +119,9 @@ - // s390 - if (strcmp (proc, AFNIX_PROCNAME_S390) == 0) - return AFNIX_PROCTYPE_S390; -+ // amd64 -+ if (strcmp (proc, AFNIX_PROCNAME_AMD64) == 0) -+ return AFNIX_PROCTYPE_AMD64; - // x86-64 - if (strcmp (proc, AFNIX_PROCNAME_X64) == 0) { - switch (sizeof(void*)) { -@@ -260,6 +265,8 @@ - AFNIX_PROCTYPE_IA64); - fprintf (stdout, "#define AFNIX_PROCTYPE_S390 %d\n", - AFNIX_PROCTYPE_S390); -+ fprintf (stdout, "#define AFNIX_PROCTYPE_AMD64 %d\n", -+ AFNIX_PROCTYPE_AMD64); - fprintf (stdout, "#define AFNIX_PROCTYPE_X64 %d\n", - AFNIX_PROCTYPE_X64); - fprintf (stdout, "\n"); diff --git a/lang/afnix/files/patch-src_plt_lib_cclk.cxx b/lang/afnix/files/patch-src_plt_lib_cclk.cxx deleted file mode 100644 index eeb4caa1971f..000000000000 --- a/lang/afnix/files/patch-src_plt_lib_cclk.cxx +++ /dev/null @@ -1,22 +0,0 @@ ---- src/plt/lib/cclk.cxx.orig Wed Jan 12 06:05:00 2005 -+++ src/plt/lib/cclk.cxx Wed Feb 16 19:18:04 2005 -@@ -53,7 +53,8 @@ - s_tinfo* c_getlocal (const long tclk) { - // extract time info - struct tm* tval; -- if ((tval = localtime (&tclk)) == NULL) return 0; -+ time_t t = tclk; -+ if (t != tclk || (tval = localtime (&t)) == NULL) return 0; - // fill in the data structure - s_tinfo* tinfo = new s_tinfo; - tinfo->d_secs = tval->tm_sec; -@@ -72,7 +73,8 @@ - s_tinfo* c_getutc (const long tclk) { - // extract time info - struct tm* tval; -- if ((tval = gmtime (&tclk)) == NULL) return 0; -+ time_t t = tclk; -+ if (t != tclk || (tval = gmtime (&t)) == NULL) return 0; - // fill in the data structure - s_tinfo* tinfo = new s_tinfo; - tinfo->d_secs = tval->tm_sec; diff --git a/lang/afnix/files/patch-src_plt_lib_cdir.cxx b/lang/afnix/files/patch-src_plt_lib_cdir.cxx deleted file mode 100644 index 8bcc8b3ea3fd..000000000000 --- a/lang/afnix/files/patch-src_plt_lib_cdir.cxx +++ /dev/null @@ -1,10 +0,0 @@ ---- src/plt/lib/cdir.cxx.orig Wed Jan 12 06:05:00 2005 -+++ src/plt/lib/cdir.cxx Wed Feb 16 19:05:03 2005 -@@ -14,6 +14,7 @@ - // - copyright (c) 1999-2005 amaury darsch - - // --------------------------------------------------------------------------- - -+#include - #include "cdir.hpp" - #include "cstr.hpp" - #include "cdir.hxx" -- cgit v1.2.3