From 0a6df06b3d01f65da5160f085fd818bd2708e984 Mon Sep 17 00:00:00 2001 From: obrien Date: Sat, 29 Apr 2000 07:17:06 +0000 Subject: Upgrade to version 4.9.9. Submitted by: KATO Tsuguru --- devel/cdk/Makefile | 36 ++++++++----- devel/cdk/distinfo | 2 +- devel/cdk/files/patch-aa | 111 +++++++++++++++++++++++----------------- devel/cdk/files/patch-ab | 28 +++++++--- devel/cdk/files/patch-curdefs.h | 10 ++++ devel/cdk/pkg-descr | 2 + devel/cdk/pkg-plist | 65 ++++------------------- 7 files changed, 130 insertions(+), 124 deletions(-) create mode 100644 devel/cdk/files/patch-curdefs.h (limited to 'devel/cdk') diff --git a/devel/cdk/Makefile b/devel/cdk/Makefile index ab98155..5f9f31e 100644 --- a/devel/cdk/Makefile +++ b/devel/cdk/Makefile @@ -1,3 +1,4 @@ +# ex:ts=8 # New ports collection makefile for: cdk # Date created: 6 May 1999 # Whom: Andrey Zakhvatov @@ -6,19 +7,24 @@ # PORTNAME= cdk -PORTVERSION= 4.9.1 +PORTVERSION= 4.9.9 CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_SUNSITE} -MASTER_SITE_SUBDIR= libs/ui +MASTER_SITES= http://www.vexus.ca/release/ +DISTNAME= latestCDK +EXTRACT_SUFX= .tgz -MAINTAINER= obrien@FreeBSD.org +MAINTAINER= obrien@FreeBSD.org -ALL_TARGET= SRCDIR=${WRKSRC} libcdk.so.1 +WRKSRC= ${WRKDIR}/${PKGNAME} +GNU_CONFIGURE= yes +ALL_TARGET= default -MAN3= alphalist.3 binding.3 buttonbox.3 calendar.3 cdk.3 dialog.3 \ - display.3 entry.3 fselect.3 graph.3 histogram.3 itemlist.3 label.3 \ - marquee.3 matrix.3 mentry.3 menu.3 misc.3 radio.3 scale.3 screen.3 \ - scroll.3 selection.3 slider.3 swindow.3 template.3 viewer.3 +MAN3= cdk_alphalist.3 cdk_binding.3 cdk_buttonbox.3 cdk_calendar.3 cdk_cdk.3 \ + cdk_dialog.3 cdk_display.3 cdk_entry.3 cdk_fselect.3 cdk_graph.3 \ + cdk_histogram.3 cdk_itemlist.3 cdk_label.3 cdk_marquee.3 cdk_matrix.3 \ + cdk_mentry.3 cdk_menu.3 cdk_misc.3 cdk_radio.3 cdk_scale.3 \ + cdk_screen.3 cdk_scroll.3 cdk_selection.3 cdk_slider.3 cdk_swindow.3 \ + cdk_template.3 cdk_viewer.3 do-install: @ ${INSTALL_DATA} ${WRKSRC}/libcdk.so.1 ${PREFIX}/lib @@ -45,12 +51,16 @@ do-install: @ ${INSTALL_DATA} ${WRKSRC}/cli/utils/* ${PREFIX}/share/examples/cdk/cli/utils @ ${LDCONFIG} -m ${PREFIX}/lib -post-install: + post-install: + @${MKDIR} ${PREFIX}/share/examples/cdk + ${INSTALL_DATA} ${WRKSRC}/examples/Makefile ${PREFIX}/share/examples/cdk + ${INSTALL_DATA} ${WRKSRC}/examples/*.c ${PREFIX}/share/examples/cdk .if !defined(NOPORTDOCS) - @ ${MKDIR} ${PREFIX}/share/doc/cdk -.for file in BUGS COPYING EXPANDING NOTES README TODO - @ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/cdk + @${MKDIR} ${PREFIX}/share/doc/cdk +.for file in BUGS EXPANDING INSTALL NOTES README TODO + @${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/cdk .endfor + ${LDCONFIG} -m ${PREFIX}/lib .endif .include diff --git a/devel/cdk/distinfo b/devel/cdk/distinfo index da6550b..9847699 100644 --- a/devel/cdk/distinfo +++ b/devel/cdk/distinfo @@ -1 +1 @@ -MD5 (cdk-4.9.1.tar.gz) = dfacdacc2834154659ddedbe66502bb2 +MD5 (latestCDK.tgz) = 51b00c111424a4431b2295df5a69a620 diff --git a/devel/cdk/files/patch-aa b/devel/cdk/files/patch-aa index 37c5840..660a147 100644 --- a/devel/cdk/files/patch-aa +++ b/devel/cdk/files/patch-aa @@ -1,60 +1,75 @@ ---- Makefile Fri May 23 19:44:35 1997 -+++ /home/andy/tmp/wrk/Makefile Wed May 5 18:17:13 1999 -@@ -9,14 +9,14 @@ - # AIX, Alpha, FreeBSD, HPUX, Linux, Linux-xcurses, - # Solaris, Sun, and Irix (SGI) - # --OS = Dev -+OS = FreeBSD - - # - # These reflect where CDK will be installed from and to - # on your system. - # --SRCDIR = /home/glovem/cdk-$(VERSION) --INST_ROOTDIR = /export/local -+SRCDIR = $(WRKSRC) -+INST_ROOTDIR = $(PREFIX) - - # - # Set some informational variables. -@@ -80,7 +80,7 @@ - # NOSTRERR Your library does not have Sun - # the library function strerr. +--- Makefile.in.orig Fri Jul 9 14:24:13 1999 ++++ Makefile.in Fri Mar 31 02:31:17 2000 +@@ -32,19 +32,20 @@ # --EXTRA_CFLAGS = -g -Wall -+CFLAGS+= -I${SRCDIR} -DCOLOR -DNCURSES - ############################################################### - # Do Not Change Anything Below This Line -@@ -135,7 +135,7 @@ - include $(MAKEDIR)/Makefile.$(OS) + CDKLIB = libcdk.a ++CDKSLIB = libcdk.so.1 + VERSION = 4.9.9 + CFLAGS = -Iinclude @CFLAGS@ @DEFS@ + CC = @CC@ + LDFLAGS = @LDFLAGS@ + LIBS = @LIBS@ + RANLIB = @RANLIB@ +-INSTALL = @INSTALL@ ++INSTALL = @INSTALL_DATA@ + INSTALL_DIR = @prefix@ + INCLUDE_DIR = $(INSTALL_DIR)/include/cdk + LIB_DIR = $(INSTALL_DIR)/lib + MAN_DIR = $(INSTALL_DIR)/man/man3 + +-default:: cdklib ++default:: cdklib cdkslib - #CC = purify cc --CC = gcc -+CC = cc + # + # Create the file lists. +@@ -71,6 +72,7 @@ + cdk_template.3 cdk_viewer.3 + CDKREADME = BUGS EXPANDING NOTES TODO COPYING INSTALL README + CDKOBJS = $(CDKSRC:.c=.o) ++CDKSOBJS = $(CDKSRC:.c=.so) # # Standard library directive. -@@ -148,8 +148,9 @@ - # Shared library directive. +@@ -79,6 +81,9 @@ + $(AR) -cr $(CDKLIB) $(CDKOBJS) + $(RANLIB) $(CDKLIB) + ++cdkslib $(CDKSLIB): $(CDKSOBJS) ++ $(CC) -shared -Wl,-x -Wl,-soname,$(CDKSLIB) -o $(CDKSLIB) $(CDKSOBJS) ++ # - cdkslib $(CDKSLIB): -- $(CC) $(CFLAGS) $(SFLAGS) -c $(CDKSRC) $(LIBPATH) $(LINKLIB) -- $(CC) $(SLINK) -o $(CDKSLIB).0 $(CDKOBJS) $(LIBPATH) $(LINKLIB) -+# $(CC) $(CFLAGS) $(SFLAGS) -c $(CDKSRC) $(LIBPATH) $(LINKLIB) -+# $(CC) $(SLINK) -o $(CDKSLIB).0 $(CDKOBJS) $(LIBPATH) $(LINKLIB) -+ + # Make the examples directory. + # +@@ -94,7 +99,7 @@ + # + # This installs all of the CDK library release. + # +-install:: installCDKHeaderFiles installCDKReadme installCDKLibrary installCDKManPages ++install:: installCDKHeaderFiles installCDKLibrary installCDKManPages # - # This builds the examples in the examples directory. -@@ -377,4 +378,8 @@ + # This installs the header files. +@@ -129,6 +134,9 @@ + fi + @echo " $(INSTALL) $(CDKLIB) $(LIB_DIR)" + @$(INSTALL) $(CDKLIB) $(LIB_DIR) ++ @echo " $(INSTALL) $(CDKSLIB) $(LIB_DIR)" ++ @$(INSTALL) $(CDKSLIB) $(LIB_DIR) ++ ln -sf $(CDKSLIB) $(LIB_DIR)/libcdk.so - ############################################################ - .c.o: + # + # This installs the CDK man pages. +@@ -165,8 +173,10 @@ + # + # Standard .c to .o compile line. + # +-.c.o: - $(CC) $(CFLAGS) -c $< -+ $(CC) $(CFLAGS) -fPIC -c $< -+ -+libcdk.so.1: $(CDKOBJS) -+ $(CC) $(CFLAGS) -shared -Wl,-soname,libcdk.so.1 -o libcdk.so.1 $(CDKOBJS) ++.SUFFIXES: .c .so .o + ++.c.so: ++ $(CC) $(CFLAGS) -fpic -DPIC -o $@ -c $< + + # + # Set up our PHONY tags. diff --git a/devel/cdk/files/patch-ab b/devel/cdk/files/patch-ab index c03cd7a..9c55d93 100644 --- a/devel/cdk/files/patch-ab +++ b/devel/cdk/files/patch-ab @@ -1,11 +1,27 @@ ---- cdk.h Fri May 23 19:44:28 1997 -+++ /home/andy/tmp/wrk/cdk.h Wed May 5 18:22:39 1999 -@@ -34,7 +34,7 @@ - * SUCH DAMAGE. - */ +--- include/cdk.h.orig Thu Dec 10 02:13:17 1998 ++++ include/cdk.h Thu Mar 30 22:04:04 2000 +@@ -38,7 +38,15 @@ + #undef instr + #endif --#include ++#include ++#include ++#include ++ ++#if (defined(BSD) && BSD >= 199306) +#include ++#else + #include ++#endif #include #include +@@ -49,8 +57,6 @@ + #include + #include + #include +-#include +-#include + #include + + /* diff --git a/devel/cdk/files/patch-curdefs.h b/devel/cdk/files/patch-curdefs.h new file mode 100644 index 0000000..aa81f35 --- /dev/null +++ b/devel/cdk/files/patch-curdefs.h @@ -0,0 +1,10 @@ +--- include/curdefs.h.orig Fri Dec 11 13:24:06 1998 ++++ include/curdefs.h Thu Mar 30 22:02:22 2000 +@@ -518,4 +518,7 @@ + #ifndef ACS_S2 + #define ACS_S2 '2' + #endif ++#ifndef ACS_S9 ++#define ACS_S9 '9' ++#endif + #endif /* CURDEF_H */ diff --git a/devel/cdk/pkg-descr b/devel/cdk/pkg-descr index 8fff335..fc7e6ea 100644 --- a/devel/cdk/pkg-descr +++ b/devel/cdk/pkg-descr @@ -5,3 +5,5 @@ curses programs. Each widget has the ability to display color, or other character attributes. Cdk comes with a attribute/color format command set which allows a programmer to add colors and characters attributes simply. + +WWW: http://www.vexus.ca/CDK.html diff --git a/devel/cdk/pkg-plist b/devel/cdk/pkg-plist index 9f9bfe3..a1410e6 100644 --- a/devel/cdk/pkg-plist +++ b/devel/cdk/pkg-plist @@ -1,8 +1,8 @@ -include/cdk.h include/cdk/alphalist.h include/cdk/binding.h include/cdk/buttonbox.h include/cdk/calendar.h +include/cdk/cdk.h include/cdk/cdk_util.h include/cdk/cdkscreen.h include/cdk/curdefs.h @@ -26,13 +26,14 @@ include/cdk/slider.h include/cdk/swindow.h include/cdk/template.h include/cdk/viewer.h +lib/libcdk.a lib/libcdk.so lib/libcdk.so.1 -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R +@exec /sbin/ldconfig -m %B +@unexec /sbin/ldconfig -R share/doc/cdk/BUGS -share/doc/cdk/COPYING share/doc/cdk/EXPANDING +share/doc/cdk/INSTALL share/doc/cdk/NOTES share/doc/cdk/README share/doc/cdk/TODO @@ -64,57 +65,9 @@ share/examples/cdk/slider_ex.c share/examples/cdk/subwindow_ex.c share/examples/cdk/swindow_ex.c share/examples/cdk/template_ex.c +share/examples/cdk/tst.c share/examples/cdk/viewer_ex.c -share/examples/cdk/cli/Makefile -share/examples/cdk/cli/cdkalphalist.c -share/examples/cdk/cli/cdkcalendar.c -share/examples/cdk/cli/cdkdialog.c -share/examples/cdk/cli/cdkentry.c -share/examples/cdk/cli/cdkfselect.c -share/examples/cdk/cli/cdkitemlist.c -share/examples/cdk/cli/cdklabel.c -share/examples/cdk/cli/cdkmatrix.c -share/examples/cdk/cli/cdkmentry.c -share/examples/cdk/cli/cdkradio.c -share/examples/cdk/cli/cdkscale.c -share/examples/cdk/cli/cdkscroll.c -share/examples/cdk/cli/cdkselection.c -share/examples/cdk/cli/cdkslider.c -share/examples/cdk/cli/cdktemplate.c -share/examples/cdk/cli/cdkviewer.c -share/examples/cdk/cli/samples/alphalist.sh -share/examples/cdk/cli/samples/calendar.sh -share/examples/cdk/cli/samples/dialog.sh -share/examples/cdk/cli/samples/entry.sh -share/examples/cdk/cli/samples/fselect.sh -share/examples/cdk/cli/samples/itemlist.sh -share/examples/cdk/cli/samples/label.sh -share/examples/cdk/cli/samples/matrix.sh -share/examples/cdk/cli/samples/mentry.sh -share/examples/cdk/cli/samples/radio.sh -share/examples/cdk/cli/samples/scale.sh -share/examples/cdk/cli/samples/scroll.sh -share/examples/cdk/cli/samples/selection.sh -share/examples/cdk/cli/samples/slider.sh -share/examples/cdk/cli/samples/template.sh -share/examples/cdk/cli/samples/viewer.sh -share/examples/cdk/cli/utils/adduser -share/examples/cdk/cli/utils/netconfig -share/examples/cdk/demo/Makefile -share/examples/cdk/demo/appointment.c -share/examples/cdk/demo/clock.c -share/examples/cdk/demo/command.c -share/examples/cdk/demo/fileview.c -share/examples/cdk/demo/rolodex.c -share/examples/cdk/demo/rolodex.h -share/examples/cdk/demo/serial.c -share/examples/cdk/demo/stopSign.c -share/examples/cdk/demo/syb.c -share/examples/cdk/demo/vinstall.c -@dirrm include/cdk -@dirrm share/doc/cdk -@dirrm share/examples/cdk/cli/samples -@dirrm share/examples/cdk/cli/utils -@dirrm share/examples/cdk/cli -@dirrm share/examples/cdk/demo +share/examples/cdk/vinstall.c @dirrm share/examples/cdk +@dirrm share/doc/cdk +@dirrm include/cdk -- cgit v1.1