rendered paste bodydiff -ruN ./5.6/c++/Makefile ../../../FOSSncurses-5.6.clean/amd64/NCURSES/5.6/c++/Makefile
--- ./5.6/c++/Makefile 2008-05-18 13:51:24.809354000 -0400
+++ ../../../FOSSncurses-5.6.clean/amd64/NCURSES/5.6/c++/Makefile 2008-05-18 11:39:01.000000000 -0400
@@ -39,7 +39,7 @@
CF_MFLAGS =
x =
-o = .o
+o = .lo
MODEL = ../obj_lo
DESTDIR = /var/tmp/pkgbuild-bent/FOSSncurses-5.6-build
@@ -62,14 +62,14 @@
AR = ar
AR_OPTS = rv
-CXX_AR = $(CXX)
+CXX_AR = $(CXX) $(CXXFLAGS)
CXX_AR_OPTS = -xar -o
RANLIB = :
CXX = /opt/studio/SOS12/SUNWspro/bin/CC
CPP = /opt/studio/SOS12/SUNWspro/bin/CC -E
CXXFLAGS = -D_REENTRANT -D__EXTENSIONS__ -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_POSIX_PTHREAD_SEMANTICS -DSOLARIS -DSOLARIS10 -DNDEBUG -DNO_DEBUG -D_UNICODE -DUNICODE -D_RWSTD_REENTRANT -D_XOPEN_SOURCE=500 -D_XPG5 -I/opt/foss/include -I/opt/foss/include/ansi -library=no%Cstd -features=anachronisms,except,rtti,export,extensions,nestedaccess,tmplife,tmplrefstatic -instances=global -template=geninlinefuncs -s -xlang=c99 -xustr=ascii_utf16_ushort -Qoption ccfe -features=gcc -Qoption ccfe ++boolflag:sunwcch=false -xF=%none -xbuiltin=%all -xinline=%auto -xprefetch=auto -xprefetch_auto_type=indirect_array_access -xprefetch_level=3 -xalias_level=compatible -xO3 -xregs=no%frameptr -xjobs=2 -Kpic -xrestrict=%all -xthreadvar=%all -z combreloc -z redlocsym -z nodefaultlib -z ignore -z now -z rescan -z absexec -xipo=0 -xldscope=symbolic -xlibmil -s -xtarget=generic -m64 -lm -ldl -lc -lpthread -lposix4 -lrt -mt -L/opt/foss/lib/amd64 -L/usr/lib/amd64 -R/opt/foss/lib/amd64 -R/usr/lib/amd64 -Y P,/opt/foss/lib/amd64:/usr/lib/amd64 -i -L/usr/lib/amd64 -R/usr/lib/amd64 -Bdynamic -lCrun -lstdcxx -Y P,/opt/foss/lib/amd64:/usr/lib/amd64 -i -L/usr/lib/amd64 -R/usr/lib/amd64 -Bdynamic -lCrun -lstdcxx -DNCURSES_EXT_COLORS -D_XOPEN_SOURCE_EXTENDED
-CXXLIBS =
+CXXLIBS = -lc -lCrun -lstdcxx
INCDIR = ../include
CPPFLAGS = -I../c++ -I$(INCDIR) -I$(srcdir) -DHAVE_CONFIG_H -I. -I../include -DNCURSES_EXT_COLORS -D_XOPEN_SOURCE_EXTENDED -D__EXTENSIONS__ -I${includedir}
@@ -91,19 +91,19 @@
LOCAL_LIBDIR = /export/home/bent/packages/BUILD/FOSSncurses-5.6/amd64/NCURSES/5.6/lib
-LINK = $(LIBTOOL_LINK) $(CXX)
+LINK = $(LIBTOOL_LINK) --tag=CXX $(CXX) $(CXXFLAGS) $(LDFLAGS)
SHLIB_DIRS = -L../lib
-SHLIB_LIST = $(SHLIB_DIRS) -lncursesw
+SHLIB_LIST = $(SHLIB_DIRS) -lncursesw -ltinfow -lmenuw -lpanelw -lformw
-LIBROOT = ncurses++
+LIBROOT = ncursesw++
-LIBNAME_LIBTOOL = lib$(LIBROOT)w.la
-LIBNAME_NORMAL = lib$(LIBROOT)w.a
-LIBNAME = lib$(LIBROOT)w.la
+LIBNAME_LIBTOOL = lib$(LIBROOT).la
+LIBNAME_NORMAL = lib$(LIBROOT).a
+LIBNAME = lib$(LIBROOT).so
-LINK_FLAGS = -L../lib -l$(LIBROOT)w
+LINK_FLAGS = -L../lib -l$(LIBROOT)
-LINK_LIBTOOL = -L../lib ../lib/$(LIBNAME)
+LINK_LIBTOOL = -L../lib ../lib/.libs/$(LIBNAME)
LINK_NORMAL = $(LINK_FLAGS)
LINK_DEBUG = $(LINK_FLAGS)
LINK_PROFILE = $(LINK_FLAGS)
@@ -124,7 +124,7 @@
etip.h
all \
-libs :: $(AUTO_SRC) ../lib/$(LIBNAME)
+libs :: $(AUTO_SRC) ../lib/.libs/$(LIBNAME)
all :: demo$x
@@ -152,21 +152,24 @@
$(CXX_AR) $(CXX_AR_OPTS) $@ $?
$(RANLIB) $@
-../lib/$(LIBNAME_LIBTOOL) : $(LIB_OBJS)
- cd ../lib && $(LIBTOOL_LINK) $(CXX) $(CXXFLAGS) \
- -o $(LIBNAME) $(LIB_OBJS:$o=.lo) \
- -rpath $(INSTALL_PREFIX)$(libdir) \
+../lib/.libs/$(LIBNAME): ../lib/libncursesw++.la
+
+../lib/libncursesw++.la : $(LIB_OBJS)
+ @echo linking libncursesw++.la
+ cd ../lib && $(LIBTOOL_LINK) $(CXX) $(CXXFLAGS) \
+ -o libncursesw++.la $(LIB_OBJS:$o=.lo) \
+ -rpath $(DESTDIR)$(libdir) \
-version-info $(NCURSES_MAJOR):$(NCURSES_MINOR) $(SHLIB_LIST)
-OBJS_DEMO = $(MODEL)/demo$o
+OBJS_DEMO = $(MODEL)/demo.lo
-$(MODEL)/demo$o : $(srcdir)/demo.cc \
+$(MODEL)/demo.lo : $(srcdir)/demo.cc \
$(cursesf_h) $(cursesm_h) $(cursesapp_h)
demo$x: $(OBJS_DEMO) \
- ../lib/$(LIBNAME) \
+ ../lib/.libs/$(LIBNAME) \
../lib/libformw.la ../lib/libmenuw.la ../lib/libpanelw.la ../lib/libncursesw.la ../lib/libtinfow.la
- $(LINK) -o $@ $(OBJS_DEMO) $(LDFLAGS_DEFAULT)
+ $(LINK) -o $@ ../lib/.libs/libncursesw++.so $(OBJS_DEMO) $(LDFLAGS_DEFAULT)
etip.h: $(srcdir)/etip.h.in $(srcdir)/edit_cfg.sh
cp $(srcdir)/etip.h.in $@
@@ -176,8 +179,8 @@
sh $(srcdir)/../mkinstalldirs $@
install \
-install.libs:: ../lib/$(LIBNAME) $(DESTDIR)$(libdir)
- $(LIBTOOL_INSTALL) $(INSTALL) ../lib/$(LIBNAME) $(DESTDIR)$(libdir)/$(LIBNAME)
+install.libs:: ../lib/.libs/$(LIBNAME) $(DESTDIR)$(libdir)
+ $(LIBTOOL_INSTALL) $(INSTALL) ../lib/.libs/$(LIBNAME) $(DESTDIR)$(libdir)/$(LIBNAME)
uninstall \
uninstall.libs::
@@ -189,7 +192,7 @@
clean :: mostlyclean
-sh -c "if test -n '$x' ; then $(MAKE) clean x=''; fi"
-rm -rf $(MODEL)/SunWS_cache
- -$(LIBTOOL_CLEAN) rm -f demo$x $(AUTO_SRC) ../lib/$(LIBNAME) $(LIB_OBJS) $(OBJS_DEMO)
+ -$(LIBTOOL_CLEAN) rm -f demo$x $(AUTO_SRC) ../lib/.libs/$(LIBNAME) $(LIB_OBJS) $(OBJS_DEMO)
-rm -rf .libs
distclean :: clean
diff -ruN ./5.6/c++/Makefile.in ../../../FOSSncurses-5.6.clean/amd64/NCURSES/5.6/c++/Makefile.in
--- ./5.6/c++/Makefile.in 2008-05-16 09:18:31.000000000 -0400
+++ ../../../FOSSncurses-5.6.clean/amd64/NCURSES/5.6/c++/Makefile.in 2008-05-18 11:17:48.000000000 -0400
@@ -39,7 +39,7 @@
CF_MFLAGS = @cf_cv_makeflags@
@SET_MAKE@
x = @EXEEXT@
-o = .@OBJEXT@
+o = .lo
MODEL = ../@DFT_OBJ_SUBDIR@
DESTDIR = @DESTDIR@
@@ -62,14 +62,14 @@
AR = @AR@
AR_OPTS = @AR_OPTS@
-CXX_AR = @CXX_AR@
+CXX_AR = @CXX_AR@ $(CXXFLAGS)
CXX_AR_OPTS = @CXX_AR_OPTS@
RANLIB = @LIB_PREP@
CXX = @CXX@
CPP = @CXXCPP@
CXXFLAGS = @CXXFLAGS@ @EXTRA_CXXFLAGS@
-CXXLIBS = @CXXLIBS@
+CXXLIBS = @CXXLIBS@ -lc -lCrun -lstdcxx
INCDIR = ../include
CPPFLAGS = -I../c++ -I$(INCDIR) -I$(srcdir) -DHAVE_CONFIG_H @CPPFLAGS@
@@ -91,17 +91,17 @@
LOCAL_LIBDIR = @top_builddir@/lib
-LINK = @LINK_PROGS@ $(LIBTOOL_LINK) $(CXX) @CXXLDFLAGS@
+LINK = @LINK_PROGS@ $(LIBTOOL_LINK) --tag=CXX $(CXX) @CXXLDFLAGS@ $(CXXFLAGS) $(LDFLAGS)
SHLIB_DIRS = -L../lib
-SHLIB_LIST = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@
+SHLIB_LIST = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ -ltinfo@LIB_SUFFIX@ -lmenu@LIB_SUFFIX@ -lpanel@LIB_SUFFIX@ -lform@LIB_SUFFIX@ @SHLIB_LIST@
-LIBROOT = ncurses++
+LIBROOT = ncurses@LIB_SUFFIX@++
-LIBNAME_LIBTOOL = @LIB_PREFIX@$(LIBROOT)@LIB_SUFFIX@.la
-LIBNAME_NORMAL = @LIB_PREFIX@$(LIBROOT)@LIB_SUFFIX@.a
-LIBNAME = @LIB_PREFIX@$(LIBROOT)@CXX_LIB_SUFFIX@
+LIBNAME_LIBTOOL = @LIB_PREFIX@$(LIBROOT).la
+LIBNAME_NORMAL = @LIB_PREFIX@$(LIBROOT).a
+LIBNAME = @LIB_PREFIX@$(LIBROOT).so
-LINK_FLAGS = @EXTRA_LDFLAGS@ -L../lib -l$(LIBROOT)@LIB_SUFFIX@
+LINK_FLAGS = @EXTRA_LDFLAGS@ -L../lib -l$(LIBROOT)
LINK_LIBTOOL = @EXTRA_LDFLAGS@ -L../lib ../lib/$(LIBNAME)
LINK_NORMAL = $(LINK_FLAGS)
@@ -152,15 +152,15 @@
$(CXX_AR) $(CXX_AR_OPTS) $@ $?
$(RANLIB) $@
-../lib/$(LIBNAME_LIBTOOL) : $(LIB_OBJS)
+../lib/$(LIBNAME) : $(LIB_OBJS)
cd ../lib && $(LIBTOOL_LINK) $(CXX) $(CXXFLAGS) \
-o $(LIBNAME) $(LIB_OBJS:$o=.lo) \
-rpath $(INSTALL_PREFIX)$(libdir) \
-version-info $(NCURSES_MAJOR):$(NCURSES_MINOR) $(SHLIB_LIST)
-OBJS_DEMO = $(MODEL)/demo$o
+OBJS_DEMO = $(MODEL)/demo.lo
-$(MODEL)/demo$o : $(srcdir)/demo.cc \
+$(MODEL)/demo.lo : $(srcdir)/demo.cc \
$(cursesf_h) $(cursesm_h) $(cursesapp_h)
demo$x: $(OBJS_DEMO) \
diff -ruN ./5.6/c++/Makefile.in.rej ../../../FOSSncurses-5.6.clean/amd64/NCURSES/5.6/c++/Makefile.in.rej
--- ./5.6/c++/Makefile.in.rej 2008-05-18 13:51:07.203047000 -0400
+++ ../../../FOSSncurses-5.6.clean/amd64/NCURSES/5.6/c++/Makefile.in.rej 1969-12-31 19:00:00.000000000 -0500
@@ -1,118 +0,0 @@
-***************
-*** 39,45 ****
- CF_MFLAGS = @cf_cv_makeflags@
- @SET_MAKE@
- x = @EXEEXT@
-- o = .lo
-
- MODEL = ../@DFT_OBJ_SUBDIR@
- DESTDIR = @DESTDIR@
---- 39,45 ----
- CF_MFLAGS = @cf_cv_makeflags@
- @SET_MAKE@
- x = @EXEEXT@
-+ o = .@OBJEXT@
-
- MODEL = ../@DFT_OBJ_SUBDIR@
- DESTDIR = @DESTDIR@
-***************
-*** 62,75 ****
- AR = @AR@
- AR_OPTS = @AR_OPTS@
-
-- CXX_AR = @CXX_AR@ $(CXXFLAGS)
- CXX_AR_OPTS = @CXX_AR_OPTS@
- RANLIB = @LIB_PREP@
-
- CXX = @CXX@
- CPP = @CXXCPP@
- CXXFLAGS = @CXXFLAGS@ @EXTRA_CXXFLAGS@
-- CXXLIBS = @CXXLIBS@ -lc -lCrun -lstdcxx
-
- INCDIR = ../include
- CPPFLAGS = -I../c++ -I$(INCDIR) -I$(srcdir) -DHAVE_CONFIG_H @CPPFLAGS@
---- 62,75 ----
- AR = @AR@
- AR_OPTS = @AR_OPTS@
-
-+ CXX_AR = @CXX_AR@
- CXX_AR_OPTS = @CXX_AR_OPTS@
- RANLIB = @LIB_PREP@
-
- CXX = @CXX@
- CPP = @CXXCPP@
- CXXFLAGS = @CXXFLAGS@ @EXTRA_CXXFLAGS@
-+ CXXLIBS = @CXXLIBS@
-
- INCDIR = ../include
- CPPFLAGS = -I../c++ -I$(INCDIR) -I$(srcdir) -DHAVE_CONFIG_H @CPPFLAGS@
-***************
-*** 91,107 ****
-
- LOCAL_LIBDIR = @top_builddir@/lib
-
-- LINK = @LINK_PROGS@ $(LIBTOOL_LINK) --tag=CXX $(CXX) @CXXLDFLAGS@ $(CXXFLAGS) $(LDFLAGS)
- SHLIB_DIRS = -L../lib
-- SHLIB_LIST = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ -ltinfo@LIB_SUFFIX@ -lmenu@LIB_SUFFIX@ -lpanel@LIB_SUFFIX@ -lform@LIB_SUFFIX@ @SHLIB_LIST@
-
-- LIBROOT = ncurses@LIB_SUFFIX@++
-
-- LIBNAME_LIBTOOL = @LIB_PREFIX@$(LIBROOT).la
-- LIBNAME_NORMAL = @LIB_PREFIX@$(LIBROOT).a
-- LIBNAME = @LIB_PREFIX@$(LIBROOT).so
-
-- LINK_FLAGS = @EXTRA_LDFLAGS@ -L../lib -l$(LIBROOT)
-
- LINK_LIBTOOL = @EXTRA_LDFLAGS@ -L../lib ../lib/$(LIBNAME)
- LINK_NORMAL = $(LINK_FLAGS)
---- 91,107 ----
-
- LOCAL_LIBDIR = @top_builddir@/lib
-
-+ LINK = @LINK_PROGS@ $(LIBTOOL_LINK) $(CXX) @CXXLDFLAGS@
- SHLIB_DIRS = -L../lib
-+ SHLIB_LIST = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@
-
-+ LIBROOT = ncurses++
-
-+ LIBNAME_LIBTOOL = @LIB_PREFIX@$(LIBROOT)@LIB_SUFFIX@.la
-+ LIBNAME_NORMAL = @LIB_PREFIX@$(LIBROOT)@LIB_SUFFIX@.a
-+ LIBNAME = @LIB_PREFIX@$(LIBROOT)@CXX_LIB_SUFFIX@
-
-+ LINK_FLAGS = @EXTRA_LDFLAGS@ -L../lib -l$(LIBROOT)@LIB_SUFFIX@
-
- LINK_LIBTOOL = @EXTRA_LDFLAGS@ -L../lib ../lib/$(LIBNAME)
- LINK_NORMAL = $(LINK_FLAGS)
-***************
-*** 152,166 ****
- $(CXX_AR) $(CXX_AR_OPTS) $@ $?
- $(RANLIB) $@
-
-- ../lib/$(LIBNAME) : $(LIB_OBJS)
- cd ../lib && $(LIBTOOL_LINK) $(CXX) $(CXXFLAGS) \
- -o $(LIBNAME) $(LIB_OBJS:$o=.lo) \
- -rpath $(INSTALL_PREFIX)$(libdir) \
- -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR) $(SHLIB_LIST)
-
-- OBJS_DEMO = $(MODEL)/demo.lo
-
-- $(MODEL)/demo.lo : $(srcdir)/demo.cc \
- $(cursesf_h) $(cursesm_h) $(cursesapp_h)
-
- demo$x: $(OBJS_DEMO) \
---- 152,166 ----
- $(CXX_AR) $(CXX_AR_OPTS) $@ $?
- $(RANLIB) $@
-
-+ ../lib/$(LIBNAME_LIBTOOL) : $(LIB_OBJS)
- cd ../lib && $(LIBTOOL_LINK) $(CXX) $(CXXFLAGS) \
- -o $(LIBNAME) $(LIB_OBJS:$o=.lo) \
- -rpath $(INSTALL_PREFIX)$(libdir) \
- -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR) $(SHLIB_LIST)
-
-+ OBJS_DEMO = $(MODEL)/demo$o
-
-+ $(MODEL)/demo$o : $(srcdir)/demo.cc \
- $(cursesf_h) $(cursesm_h) $(cursesapp_h)
-
- demo$x: $(OBJS_DEMO) \
diff -ruN ./5.6/form/Makefile ../../../FOSSncurses-5.6.clean/amd64/NCURSES/5.6/form/Makefile
--- ./5.6/form/Makefile 2008-05-18 13:51:24.762918000 -0400
+++ ../../../FOSSncurses-5.6.clean/amd64/NCURSES/5.6/form/Makefile 2008-05-18 13:34:46.000000000 -0400
@@ -97,7 +97,7 @@
SHLIB_DIRS = -L../lib
SHLIB_LIST = $(SHLIB_DIRS) -lncursesw -ltinfow
-MK_SHARED_LIB = $(CC) $(CFLAGS) $(LDFLAGS) -G -h`basename $@.${REL_VERSION}` -o $@ -R${libdir}
+MK_SHARED_LIB = $(CC) -m64 $(CFLAGS) $(LDFLAGS) -G -h`basename $@.${REL_VERSION}` -o $@ -R${libdir}
NCURSES_MAJOR = 5
NCURSES_MINOR = 6
@@ -298,7 +298,7 @@
../lib/libformw.la : $(LIBTOOL_OBJS)
@echo linking libformw.la
- cd ../lib && $(LIBTOOL_LINK) $(CC) -o libformw.la $(LIBTOOL_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR) $(SHLIB_LIST)
+ cd ../lib && $(LIBTOOL_LINK) $(CC) -m64 -o libformw.la $(LIBTOOL_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR) $(SHLIB_LIST)
install \
install.libs \
diff -ruN ./5.6/menu/Makefile ../../../FOSSncurses-5.6.clean/amd64/NCURSES/5.6/menu/Makefile
--- ./5.6/menu/Makefile 2008-05-18 13:51:24.743063000 -0400
+++ ../../../FOSSncurses-5.6.clean/amd64/NCURSES/5.6/menu/Makefile 2008-05-18 13:17:56.000000000 -0400
@@ -274,7 +274,7 @@
../lib/libmenuw.la : $(LIBTOOL_OBJS)
@echo linking libmenuw.la
- cd ../lib && $(LIBTOOL_LINK) $(CC) -o libmenuw.la $(LIBTOOL_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR) $(SHLIB_LIST)
+ cd ../lib && $(LIBTOOL_LINK) $(CC) -o libmenuw.la $(LIBTOOL_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR) $(SHLIB_LIST) -m64
install \
install.libs \
diff -ruN ./5.6/panel/Makefile ../../../FOSSncurses-5.6.clean/amd64/NCURSES/5.6/panel/Makefile
--- ./5.6/panel/Makefile 2008-05-18 13:51:24.718617000 -0400
+++ ../../../FOSSncurses-5.6.clean/amd64/NCURSES/5.6/panel/Makefile 2008-05-18 13:13:54.000000000 -0400
@@ -92,7 +92,7 @@
CFLAGS_DEFAULT = $(CFLAGS_LIBTOOL)
-LINK = $(LIBTOOL_LINK) $(CC)
+LINK = $(LIBTOOL_LINK) $(CC) -m64
LDFLAGS = -L/opt/foss/lib/amd64 -L/usr/lib/amd64 -R/opt/foss/lib/amd64 -R/usr/lib/amd64 -z combreloc -z redlocsym -z nodefaultlib -z ignore -z now -z rescan -z absexec -xipo=0 -xldscope=symbolic -xlibmil -s -xtarget=generic -m64 -lm -ldl -lc -lpthread -lposix4 -lrt -mt
SHLIB_DIRS = -L../lib
@@ -243,7 +243,7 @@
../lib/libpanelw.la : $(LIBTOOL_OBJS)
@echo linking libpanelw.la
- cd ../lib && $(LIBTOOL_LINK) $(CC) -o libpanelw.la $(LIBTOOL_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR) $(SHLIB_LIST)
+ cd ../lib && $(LIBTOOL_LINK) $(CC) -m64 -o libpanelw.la $(LIBTOOL_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR) $(SHLIB_LIST)
install \
install.libs \