diff options
author | jlam <jlam> | 2008-02-24 04:57:07 +0000 |
---|---|---|
committer | jlam <jlam> | 2008-02-24 04:57:07 +0000 |
commit | 11b9d61a5e68212ac288ad83b73588f1517d7d8c (patch) | |
tree | 066af0bec07f43db81470b4d8a6f7fd72e692349 /devel/pdcurses/patches | |
parent | 2cd529108af1a26cf917fec3b6c1827b3257e62c (diff) | |
download | pkgsrc-11b9d61a5e68212ac288ad83b73588f1517d7d8c.tar.gz |
Import pdcurses-3.3 as devel/pdcurses.
PDCurses is a public domain curses library that implements most of
the functions available in X/Open and System V R4 curses. This X11
port allows for recompiling programs using text-mode curses to produce
native X11 applications.
This package was originally created by <bjs> in pkgsrc-wip and with
several modifications by me to update to the latest version of PDCurses
and to be more buildlink-correct.
Diffstat (limited to 'devel/pdcurses/patches')
-rw-r--r-- | devel/pdcurses/patches/patch-aa | 58 | ||||
-rw-r--r-- | devel/pdcurses/patches/patch-ab | 129 | ||||
-rw-r--r-- | devel/pdcurses/patches/patch-ac | 49 |
3 files changed, 236 insertions, 0 deletions
diff --git a/devel/pdcurses/patches/patch-aa b/devel/pdcurses/patches/patch-aa new file mode 100644 index 00000000000..59f072add26 --- /dev/null +++ b/devel/pdcurses/patches/patch-aa @@ -0,0 +1,58 @@ +$NetBSD: patch-aa,v 1.1.1.1 2008/02/24 04:57:07 jlam Exp $ + +--- configure.orig 2007-06-23 18:53:15.000000000 -0400 ++++ configure +@@ -4685,6 +4685,7 @@ for ac_dir in $mh_inc_dirs ; do + break + fi + done ++mh_x11_dir="${PREFIX}/include/X11" + + + if test "$with_xaw3d" = yes; then +@@ -4706,6 +4707,7 @@ for ac_dir in $mh_inc_dirs ; do + break + fi + done ++mh_x11_xaw_dir="${PREFIX}/include/X11" + + if test "x$mh_x11_dir" != "x" ; then + mh_x11_dir_no_x11=`echo $mh_x11_dir | sed 's/\/X11$//'` +@@ -4770,6 +4772,7 @@ else + MH_X11_LIBS="Xaw Xmu Xt X11" + fi + fi ++MH_X11_LIBS="${PDCURSES_XAW} Xmu Xt X11" + MH_X11R6_LIBS="SM ICE Xext" + mh_x11r6=no + +@@ -4797,27 +4800,8 @@ mh_where_found="" + mh_where_found_dirs="" + mh_solaris_path="" + for mh_lib in $mh_libs; do +- mh_lib_found=no +- for ac_dir in $mh_lib_dirs ; do +- for mh_ext in a so sl dll.a; do +- if test -r $ac_dir/lib$mh_lib.$mh_ext; then +- if test "x$mh_prev_dir" != "x$ac_dir" ; then +- if test "x$mh_prev_dir" = "x" ; then +- mh_where_found="$mh_where_found found in $ac_dir" +- else +- mh_where_found="$mh_where_found and in $ac_dir" +- fi +- mh_prev_dir=$ac_dir +- mh_where_found_dirs="$mh_where_found_dirs $ac_dir" +- MH_XLIBS="$MH_XLIBS -L$ac_dir" +- mh_solaris_path="${mh_solaris_path}:$ac_dir" +- fi +- MH_XLIBS="$MH_XLIBS -l$mh_lib" +- mh_lib_found=yes +- break 2 +- fi +- done +- done ++ mh_lib_found=yes ++ MH_XLIBS="$MH_XLIBS -l$mh_lib" + if test "$mh_lib_found" = no; then + { { echo "$as_me:$LINENO: error: Cannot find required X library; lib$mh_lib. PDCurses cannot be configured" >&5 + echo "$as_me: error: Cannot find required X library; lib$mh_lib. PDCurses cannot be configured" >&2;} diff --git a/devel/pdcurses/patches/patch-ab b/devel/pdcurses/patches/patch-ab new file mode 100644 index 00000000000..756c9694bac --- /dev/null +++ b/devel/pdcurses/patches/patch-ab @@ -0,0 +1,129 @@ +$NetBSD: patch-ab,v 1.1.1.1 2008/02/24 04:57:07 jlam Exp $ + +--- x11/Makefile.in.orig 2007-07-08 22:24:24.000000000 -0400 ++++ x11/Makefile.in +@@ -5,6 +5,10 @@ THIS = Makefile + + @SET_MAKE@ + ++prefix =@prefix@ ++exec_prefix =$(DESTDIR)@exec_prefix@ ++libdir =$(exec_prefix)/lib ++ + PDCURSES_SRCDIR = .. + + osdir = . +@@ -27,16 +31,18 @@ CFLAGS = @CFLAGS@ + + CPPFLAGS = @DEFS@ -DXCURSES @SYS_DEFS@ -I$(PDCURSES_SRCDIR) + +-BUILD = @CC@ -c $(CFLAGS) $(CPPFLAGS) @MH_XINC_DIR@ ++BUILD = $(LIBTOOL) --mode=compile $(O_BUILD) ++O_BUILD = @CC@ -c $(CFLAGS) $(CPPFLAGS) @MH_XINC_DIR@ + DYN_BUILD = @O2SAVE@ $(BUILD) @DYN_COMP@ @CC2O@ + +-LINK = @PURIFY@ @CC@ ++LINK = $(LIBTOOL) --mode=link @CC@ + #LDFLAGS = $(LIB_DEPS) @LDFLAGS@ @LIBS@ @MH_XLIBS@ @MH_EXTRA_LIBS@ +-LDFLAGS = $(LIBCURSES) @LDFLAGS@ @LIBS@ @MH_XLIBS@ @MH_EXTRA_LIBS@ ++LTLDFLAGS = @LDFLAGS@ @LIBS@ @MH_XLIBS@ @MH_EXTRA_LIBS@ ++LDFLAGS = $(LIBCURSES) $(LTLDFLAGS) + + RANLIB = @RANLIB@ + +-LIBCURSES = libXCurses.a ++LIBCURSES = libXCurses.la + + LIB_DEPS = -L$(PDCURSES_SRCDIR)/x11 -lXCurses + +@@ -49,7 +55,7 @@ tuidemo.o worm.o xmas.o + SHLFILE = XCurses + + ######################################################################### +-all: $(PDCLIBS) $(DEMOS) ++all: $(LIBCURSES) $(DEMOS) + + install: + echo Does nothing at the moment +@@ -84,8 +90,8 @@ PDCSHOBJS = $(PDCOBJS:.o=.sho) + SHOFILES = $(LIBSHOBJS) $(PDCSHOBJS) + + $(LIBCURSES) : $(LIBOBJS) $(PDCOBJS) +- ar rv $@ $? +- -$(RANLIB) $@ ++ $(LIBTOOL) --mode=link $(CC) -o $@ -rpath $(libdir) $(LTLDFLAGS) \ ++ $(LIBOBJS:.o=.lo) $(PDCOBJS:.o=.lo) + + $(SHLPRE)$(SHLFILE)$(SHLPST) : $(SHOFILES) + $(LD_RXLIB1) -o $@ $(SHOFILES) $(LD_RXLIB2) +@@ -499,31 +505,31 @@ xmas: xmas.o + + + firework.o: $(demodir)/firework.c +- $(BUILD) $(demodir)/firework.c ++ $(O_BUILD) $(demodir)/firework.c + + newdemo.o: $(demodir)/newdemo.c +- $(BUILD) $(demodir)/newdemo.c ++ $(O_BUILD) $(demodir)/newdemo.c + + ptest.o: $(demodir)/ptest.c $(PDCURSES_SRCDIR)/panel.h +- $(BUILD) $(demodir)/ptest.c ++ $(O_BUILD) $(demodir)/ptest.c + + rain.o: $(demodir)/rain.c +- $(BUILD) $(demodir)/rain.c ++ $(O_BUILD) $(demodir)/rain.c + + testcurs.o: $(demodir)/testcurs.c +- $(BUILD) $(demodir)/testcurs.c ++ $(O_BUILD) $(demodir)/testcurs.c + + tui.o: $(demodir)/tui.c $(demodir)/tui.h +- $(BUILD) $(demodir)/tui.c ++ $(O_BUILD) $(demodir)/tui.c + + tuidemo.o: $(demodir)/tuidemo.c +- $(BUILD) $(demodir)/tuidemo.c ++ $(O_BUILD) $(demodir)/tuidemo.c + + worm.o: $(demodir)/worm.c +- $(BUILD) $(demodir)/worm.c ++ $(O_BUILD) $(demodir)/worm.c + + xmas.o: $(demodir)/xmas.c +- $(BUILD) $(demodir)/xmas.c ++ $(O_BUILD) $(demodir)/xmas.c + + # + # This section provides for compiling and linking the +@@ -562,22 +568,22 @@ ncurses: ncurses.o $(LIBCURSES) + $(LINK) ncurses.o -o $@ $(LDFLAGS) + + bs.o: $(ncurses_testdir)/bs.c $(PDCURSES_CURSES_H) +- $(BUILD) $(NCFLAGS) $(ncurses_testdir)/bs.c ++ $(O_BUILD) $(NCFLAGS) $(ncurses_testdir)/bs.c + + gdc.o: $(ncurses_testdir)/gdc.c $(PDCURSES_CURSES_H) +- $(BUILD) $(NCFLAGS) $(ncurses_testdir)/gdc.c ++ $(O_BUILD) $(NCFLAGS) $(ncurses_testdir)/gdc.c + + hanoi.o: $(ncurses_testdir)/hanoi.c $(PDCURSES_CURSES_H) +- $(BUILD) $(NCFLAGS) $(ncurses_testdir)/hanoi.c ++ $(O_BUILD) $(NCFLAGS) $(ncurses_testdir)/hanoi.c + + knight.o: $(ncurses_testdir)/knight.c $(PDCURSES_CURSES_H) +- $(BUILD) $(NCFLAGS) $(ncurses_testdir)/knight.c ++ $(O_BUILD) $(NCFLAGS) $(ncurses_testdir)/knight.c + + tclock.o: $(ncurses_testdir)/tclock.c $(PDCURSES_CURSES_H) +- $(BUILD) $(NCFLAGS) $(ncurses_testdir)/tclock.c ++ $(O_BUILD) $(NCFLAGS) $(ncurses_testdir)/tclock.c + + view.o: $(ncurses_testdir)/view.c $(PDCURSES_CURSES_H) +- $(BUILD) $(NCFLAGS) $(ncurses_testdir)/view.c ++ $(O_BUILD) $(NCFLAGS) $(ncurses_testdir)/view.c + + ncurses.o: $(ncurses_testdir)/ncurses.c $(PDCURSES_CURSES_H) +- $(BUILD) $(NCFLAGS) $(ncurses_testdir)/ncurses.c ++ $(O_BUILD) $(NCFLAGS) $(ncurses_testdir)/ncurses.c diff --git a/devel/pdcurses/patches/patch-ac b/devel/pdcurses/patches/patch-ac new file mode 100644 index 00000000000..6aec56674a4 --- /dev/null +++ b/devel/pdcurses/patches/patch-ac @@ -0,0 +1,49 @@ +$NetBSD: patch-ac,v 1.1.1.1 2008/02/24 04:57:07 jlam Exp $ + +--- Makefile.in.orig 2007-06-13 19:15:00.000000000 -0400 ++++ Makefile.in +@@ -34,31 +34,25 @@ realclean :: + cd x11; $(MAKE) $(MFLAGS) $@ + cd doc; $(MAKE) $(MFLAGS) $@ + ++# For pkgsrc, replace the INSTALL_* macros with the BSD_INSTALL_* macros. + install :: +- $(INSTALL) -d -m 755 $(libdir) +- $(INSTALL) -d -m 755 $(bindir) +- $(INSTALL) -d -m 755 $(includedir) +- $(INSTALL) -d -m 755 $(includedir)/xcurses +- $(INSTALL) -c -m 644 $(srcdir)/curses.h $(includedir)/xcurses.h +- $(INSTALL) -c -m 644 $(srcdir)/curses.h $(includedir)/xcurses/curses.h ++ $(BSD_INSTALL_LIB_DIR) $(libdir) ++ $(BSD_INSTALL_PROGRAM_DIR) $(bindir) ++ $(BSD_INSTALL_DATA_DIR) $(includedir) ++ $(BSD_INSTALL_DATA_DIR) $(includedir)/xcurses ++ $(BSD_INSTALL_DATA) $(srcdir)/curses.h $(includedir)/xcurses.h ++ $(BSD_INSTALL_DATA) -c -m 644 $(srcdir)/curses.h $(includedir)/xcurses/curses.h + sed -e 's/#include <curses.h>/#include <xcurses.h>/' \ + < $(srcdir)/panel.h > ./xpanel.h +- $(INSTALL) -m 644 ./xpanel.h $(includedir)/xpanel.h +- $(INSTALL) -c -m 644 $(srcdir)/panel.h \ ++ $(BSD_INSTALL_DATA) ./xpanel.h $(includedir)/xpanel.h ++ $(BSD_INSTALL_DATA) $(srcdir)/panel.h \ + $(includedir)/xcurses/panel.h +- $(INSTALL) -c -m 644 $(srcdir)/term.h \ ++ $(BSD_INSTALL_DATA) $(srcdir)/term.h \ + $(includedir)/xcurses/term.h +- $(INSTALL) -c -m 644 $(srcdir)/curspriv.h \ ++ $(BSD_INSTALL_DATA) $(srcdir)/curspriv.h \ + $(includedir)/xcurses/curspriv.h +- $(INSTALL) -c -m 644 $(pdcursesdir)/libXCurses.a $(libdir)/libXCurses.a +- -$(RANLIB) $(libdir)/libXCurses.a +- -$(INSTALL) -c -m 755 $(pdcursesdir)/$(SHLPRE)$(SHLFILE)$(SHLPST) \ +- $(libdir)/$(SHLPRE)$(SHLFILE)$(SHLPST) +- ln -f -s $(libdir)/$(SHLPRE)$(SHLFILE)$(SHLPST) \ +- $(libdir)/$(SHLPRE)Xpanel$(SHLPST) +- ln -f -s $(libdir)/libXCurses.a $(libdir)/libXpanel.a +- -$(RANLIB) $(libdir)/libXpanel.a +- $(INSTALL) -c -m 755 x11/xcurses-config $(bindir)/xcurses-config ++ $(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) $(pdcursesdir)/libXCurses.la $(libdir)/libXCurses.la ++ $(BSD_INSTALL_SCRIPT) x11/xcurses-config $(bindir)/xcurses-config + + clean :: + rm -f config.log config.cache config.status |