diff options
author | Greg Lewis <glewis@FreeBSD.org> | 2002-09-27 18:19:57 +0000 |
---|---|---|
committer | Greg Lewis <glewis@FreeBSD.org> | 2002-09-27 18:19:57 +0000 |
commit | 1e88d98dd3bd3a779f851aff992ad9a63f6583a8 (patch) | |
tree | aff6ee1c704869a510a6d37dcb524ede5bd72b87 /databases | |
parent | fix install-doc error (diff) |
Hopefully unbreak this port:
. Add many missing dependencies.
. Add patches to get some of the optional components compiling.
. Update packing list to match files in fixed build.
After the port freeze we need to:
. Update to 0.99-4.
. Add make knobs for the optional components.
. Get the remaining optional components compiling.
Approved by: bento
Notes
Notes:
svn path=/head/; revision=67170
Diffstat (limited to 'databases')
-rw-r--r-- | databases/clip/Makefile | 16 | ||||
-rw-r--r-- | databases/clip/files/patch-clip-gtk::configure | 78 | ||||
-rw-r--r-- | databases/clip/files/patch-clip-gtkextra::configure | 74 | ||||
-rw-r--r-- | databases/clip/files/patch-gd::configure | 83 | ||||
-rw-r--r-- | databases/clip/pkg-plist | 102 |
5 files changed, 352 insertions, 1 deletions
diff --git a/databases/clip/Makefile b/databases/clip/Makefile index d5273d2a69bc..ee3c25e3e287 100644 --- a/databases/clip/Makefile +++ b/databases/clip/Makefile @@ -16,13 +16,27 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org -BROKEN= "Incorrect pkg-plist" +LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ + png.5:${PORTSDIR}/graphics/png \ + freetype.9:${PORTSDIR}/print/freetype2 \ + gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ + gtkextra.17:${PORTSDIR}/x11-toolkits/gtkextra \ + gd.2:${PORTSDIR}/graphics/gd \ + intl.4:${PORTSDIR}/devel/gettext USE_BISON= yes USE_GMAKE= yes +USE_REINPLACE= yes +USE_XLIB= yes +USE_XPM= yes ALL_TARGET= local MAKE_ENV= HOME=${WRKDIR} +post-patch: + @${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \ + -e "s|%%X11BASE%%|${X11BASE}|g" \ + ${WRKSRC}/cliplibs/clip-gd/gd/configure + do-install: ${CP} -R ${WRKDIR}/cliproot ${LOCALBASE}/clip diff --git a/databases/clip/files/patch-clip-gtk::configure b/databases/clip/files/patch-clip-gtk::configure new file mode 100644 index 000000000000..310344e0bd59 --- /dev/null +++ b/databases/clip/files/patch-clip-gtk::configure @@ -0,0 +1,78 @@ +$FreeBSD$ + +--- cliplibs/clip-gtk/configure.orig Fri Sep 27 15:38:08 2002 ++++ cliplibs/clip-gtk/configure Fri Sep 27 16:48:07 2002 +@@ -3,6 +3,8 @@ + uname=`uname -s` + uver=`uname -r` + hname=`hostname -f 2>/dev/null` ++gtkconfig=gtk-config ++gtkpath= + + [ -z "$CLIPROOT" ] && CLIPROOT=/usr/local/clip + DLLSUFF='.so' +@@ -33,6 +35,8 @@ + ;; + FreeBSD*) + osname=FREEBSD ++ gtkconfig=gtk12-config ++ gtkpath=/gtk12 + STATICLINK=-static + ;; + NetBSD*) +@@ -65,7 +69,7 @@ + echo '#define SYSTEM "'$uname'"' >&3 + echo '' >&3 + +-gtkprefix=`gtk-config --prefix 2>/dev/null` ++gtkprefix=`${gtkconfig} --prefix 2>/dev/null` + + if [ $? -ne 0 ] + then +@@ -76,7 +80,7 @@ + USE_GTK=no + else + # LIBS='-lgtk -lgdk' +- LIBS=`gtk-config --libs` ++ LIBS=`${gtkconfig} --libs` + + if [ "$osname" = "CYGWIN" ] + then +@@ -85,7 +89,7 @@ + EXTRACFLAGS='-fnative-struct' + # LIBS='-lgtk-1.3 -lgdk-1.3 -lglib-1.3' + fi +- if [ -f $gtkprefix/include/gtk/gtk.h -o -f $gtkprefix/include/gtk+/gtk/gtk.h ] ++ if [ -f $gtkprefix/include$gtkpath/gtk/gtk.h -o -f $gtkprefix/include/gtk+/gtk/gtk.h ] + then + USE_GTK=yes + echo '#define HAVE_GTK' >&3 +@@ -93,8 +97,8 @@ + echo + echo 'Warning: system do not have installed GTK+ development' + fi +- GTK_MAJOR=`gtk-config --version|cut -d. -f1` +- GTK_MINOR=`gtk-config --version|cut -d. -f2` ++ GTK_MAJOR=`${gtkconfig} --version|cut -d. -f1` ++ GTK_MINOR=`${gtkconfig} --version|cut -d. -f2` + if [ ! \( "$GTK_MAJOR" -ge 1 -o "$GTK_MINOR" -ge 2 -o "$GTK_MAJOR" -gt 1 \) ] + then + echo +@@ -147,7 +151,7 @@ + echo "DLLSUFF='$DLLSUFF'" >&3 + echo "DLLREALSUFF='$DLLREALSUFF'" >&3 + echo "CLIPROOT=$CLIPROOT" >&3 +-echo 'INCLUDEDIRS=-I. -I$(CLIPROOT)/include -I'$gtkprefix'/include' >&3 ++echo 'INCLUDEDIRS=-I. -I$(CLIPROOT)/include -I'$gtkprefix'/include'${gtkpath} >&3 + echo "XTARGETS='"'$(XLIB) $(XSLIB)'"'" >&3 + echo "C_FLAGS=-Wall '"'$(INCLUDEDIRS)'"' '$EXTRACFLAGS'" >&3 + echo "LIBS='$LIBS'" >&3 +@@ -160,7 +164,7 @@ + # else + # XCFLAGS=`gtk-config --cflags` + # fi +- XCFLAGS=`gtk-config --cflags` ++ XCFLAGS=`${gtkconfig} --cflags` + echo "XCFLAGS='$XCFLAGS'" >&3 + fi + diff --git a/databases/clip/files/patch-clip-gtkextra::configure b/databases/clip/files/patch-clip-gtkextra::configure new file mode 100644 index 000000000000..569acc8fca67 --- /dev/null +++ b/databases/clip/files/patch-clip-gtkextra::configure @@ -0,0 +1,74 @@ +$FreeBSD$ + +--- cliplibs/clip-gtkextra/configure.orig Sat Sep 28 02:21:40 2002 ++++ cliplibs/clip-gtkextra/configure Sat Sep 28 02:57:37 2002 +@@ -3,6 +3,10 @@ + uname=`uname -s` + uver=`uname -r` + hname=`hostname -f 2>/dev/null` ++gtkconfig=gtk-config ++gtkpath= ++glibconfig=glib-config ++glibpath= + + [ -z "$CLIPROOT" ] && CLIPROOT=/usr/local/clip + DLLSUFF='.so' +@@ -33,6 +37,10 @@ + ;; + FreeBSD*) + osname=FREEBSD ++ gtkconfig=gtk12-config ++ gtkpath=/gtk12 ++ glibconfig=glib12-config ++ glibpath=/glib12 + STATICLINK=-static + ;; + NetBSD*) +@@ -69,7 +77,8 @@ + #gtkextraincpath=/usr/local/include/gtkextra/ + LIBS='-lgtk -lgdk -lgtkextra' + +-gtkprefix=`gtk-config --prefix 2>/dev/null` ++glibprefix=`${glibconfig} --prefix 2>/dev/null` ++gtkprefix=`${gtkconfig} --prefix 2>/dev/null` + if [ $? -ne 0 ] + then + echo +@@ -79,7 +88,7 @@ + USE_GTK=no + else + # LIBS='-lgtk -lgdk' +- LIBS=`gtk-config --libs` ++ LIBS=`${gtkconfig} --libs` + + if [ "$osname" = "CYGWIN" ] + then +@@ -87,7 +96,7 @@ + LIBS=$LIBS" -L"$CLIPROOT"/lib -llibclip-gtk" + # LIBS='-lgtk-1.3 -lgdk-1.3 -lglib-1.3' + fi +- if [ -f $gtkprefix/include/gtk/gtk.h -o -f $gtkprefix/include/gtk+/gtk/gtk.h ] ++ if [ -f $gtkprefix/include$gtkpath/gtk/gtk.h -o -f $gtkprefix/include/gtk+/gtk/gtk.h ] + then + USE_GTK=yes + echo '#define HAVE_GTK' >&3 +@@ -95,8 +104,8 @@ + echo + echo 'Warning: system do not have installed GTK+ development' + fi +- GTK_MAJOR=`gtk-config --version|cut -d. -f1` +- GTK_MINOR=`gtk-config --version|cut -d. -f2` ++ GTK_MAJOR=`${gtkconfig} --version|cut -d. -f1` ++ GTK_MINOR=`${gtkconfig} --version|cut -d. -f2` + if [ ! \( "$GTK_MAJOR" -ge 1 -o "$GTK_MINOR" -ge 2 -o "$GTK_MAJOR" -gt 1 \) ] + then + echo +@@ -177,7 +186,7 @@ + echo "DLLSUFF='$DLLSUFF'" >&3 + echo "DLLREALSUFF='$DLLREALSUFF'" >&3 + echo "CLIPROOT=$CLIPROOT" >&3 +-echo 'INCLUDEDIRS=-I. -I$(CLIPROOT)/include -I'$gtkprefix'/include -I'$gtkextraprefix'/include' >&3 ++echo 'INCLUDEDIRS=-I. -I$(CLIPROOT)/include -I'$gtkprefix'/include'${gtkpath}' -I'$glibprefix'/include'${glibpath}' -I'$gtkextraprefix'/include' >&3 + echo "XTARGETS='"'$(XLIB) $(XSLIB)'"'" >&3 + echo "C_FLAGS=-Wall '"'$(INCLUDEDIRS)'"' '$EXTRACFLAGS'" >&3 + echo "LIBS='$LIBS'" >&3 diff --git a/databases/clip/files/patch-gd::configure b/databases/clip/files/patch-gd::configure new file mode 100644 index 000000000000..1fa157673577 --- /dev/null +++ b/databases/clip/files/patch-gd::configure @@ -0,0 +1,83 @@ +$FreeBSD$ + +--- cliplibs/clip-gd/gd/configure.orig Fri Sep 27 15:29:21 2002 ++++ cliplibs/clip-gd/gd/configure Sat Sep 28 03:03:27 2002 +@@ -23,7 +23,9 @@ + osname=UNIX + stdlibpath=/usr/local/lib + stdincpath=/usr/local/include ++freetypepath= + LIBXPM='-lXpm -lX11' ++DLLSUFF='.so' + + case "$uname" in + BSD/OS*|bsdi*) +@@ -36,6 +38,7 @@ + ;; + FreeBSD*) + osname=FREEBSD ++ freetypepath=/freetype + STATICLINK=-static + ;; + NetBSD*) +@@ -91,7 +94,7 @@ + echo "INSTALL_LIB='$stdlibpath'" >&3 + echo "INSTALL_INCLUDE='$stdincpath'" >&3 + echo "LIBDIRS='-L. -L$stdlibpath -L/usr/lib/X11 -L/usr/X11R6/lib'" >&3 +-echo "INCLUDEDIRS='-I. -I/usr/include/freetype2 -I/usr/include/X11 -I/usr/X11R6/include -I/usr/X11R6/include/X11 -I$stdincpath'" >&3 ++echo "INCLUDEDIRS='-I. -I${stdincpath}/freetype2 -I${stdincpath}/freetype2/freetype -I${stdincpath}/freetype1 -I${stdincpath}/freetype1/freetype -I/usr/include/X11 -I/usr/X11R6/include -I/usr/X11R6/include/X11 -I$stdincpath'" >&3 + + if [ -f $stdlibpath/libpng${DLLSUFF} ] + then +@@ -108,18 +111,17 @@ + fi + + #?????????? +-if [ -f $stdlibpath/freetype${DLLSUFF} ] ++if [ -f $stdlibpath/libfreetype${DLLSUFF} ] + then + echo "LIBFREETYPE='-lfreetype'" >&3 + else + echo 'Warning: libfreetype not installed' +-fi +- +-if [ -f $stdlibpath/libttf${DLLSUFF} ] +-then +- echo "LIBTTF='-lttf'" >&3 +-else +- echo 'Warning: libttf not installed' ++ if [ -f $stdlibpath/libttf${DLLSUFF} ] ++ then ++ echo "LIBTTF='-lttf'" >&3 ++ else ++ echo 'Warning: libttf not installed' ++ fi + fi + + if [ -f /usr/X11R6/include/X11/xpm.h -o -f /usr/include/X11/xpm.h ] +@@ -178,18 +180,17 @@ + echo '#define HAVE_LIBXPM' >&3 + fi + +-if [ -f $stdincpath/freetype2/freetype.h ] ++if [ -f $stdincpath/freetype2${freetypepath}/freetype.h ] + then + echo '#define HAVE_LIBFREETYPE' >&3 + else + echo 'Warning: system do not have installed FREETYPE development' +-fi +- +-if [ -f $stdincpath/freetype2/freetype.h ] +-then +- echo '#define HAVE_LIBTTF' >&3 +-else +- echo 'Warning: system do not have installed TTF development' ++ if [ -f $stdincpath/freetype1${freetypepath}/freetype.h ] ++ then ++ echo '#define HAVE_LIBTTF' >&3 ++ else ++ echo 'Warning: system do not have installed TTF development' ++ fi + fi + + echo "#endif" >&3 diff --git a/databases/clip/pkg-plist b/databases/clip/pkg-plist index 0318de975e03..52f840818517 100644 --- a/databases/clip/pkg-plist +++ b/databases/clip/pkg-plist @@ -101,6 +101,7 @@ clip/charsets/ruscii.tbl clip/charsets/ruscii.uni clip/charsets/utf_8.uni clip/cliprc/.notrm +clip/cliprc/clip-gtk.cliprc clip/cliprc/clipflags clip/doc/Readme.cygwin clip/doc/Readme.en @@ -180,8 +181,47 @@ clip/doc/example/clip-com/Makefile clip/doc/example/clip-com/com.prg clip/doc/example/clip-crypto/Makefile clip/doc/example/clip-crypto/crypto.prg +clip/doc/example/clip-fw/Makefile +clip/doc/example/clip-fw/atest.prg +clip/doc/example/clip-fw/bitmaps/calc.bmp +clip/doc/example/clip-fw/bitmaps/calendar.bmp +clip/doc/example/clip-fw/bitmaps/cara.bmp +clip/doc/example/clip-fw/bitmaps/clipboar.bmp +clip/doc/example/clip-fw/bitmaps/copy.bmp +clip/doc/example/clip-fw/bitmaps/cut.bmp +clip/doc/example/clip-fw/bitmaps/end.bmp +clip/doc/example/clip-fw/bitmaps/exit.bmp +clip/doc/example/clip-fw/bitmaps/fivewin.bmp +clip/doc/example/clip-fw/bitmaps/fivewin1.bmp +clip/doc/example/clip-fw/bitmaps/help.bmp +clip/doc/example/clip-fw/bitmaps/info.bmp +clip/doc/example/clip-fw/bitmaps/openprj.bmp +clip/doc/example/clip-fw/bitmaps/paste.bmp +clip/doc/example/clip-fw/bitmaps/plus.bmp +clip/doc/example/clip-fw/bitmaps/saveprj.bmp +clip/doc/example/clip-fw/bmp.prg +clip/doc/example/clip-fw/combos.prg +clip/doc/example/clip-fw/customer.prg +clip/doc/example/clip-fw/data/custlast.ntx +clip/doc/example/clip-fw/data/custname.ntx +clip/doc/example/clip-fw/data/customer.dbf +clip/doc/example/clip-fw/data/sales.dbf +clip/doc/example/clip-fw/dlgtest.prg +clip/doc/example/clip-fw/lines.prg +clip/doc/example/clip-fw/t.prg +clip/doc/example/clip-fw/test.prg +clip/doc/example/clip-fw/testbar.prg +clip/doc/example/clip-fw/testlbx.prg +clip/doc/example/clip-fw/tooltip.prg clip/doc/example/clip-gd/Makefile clip/doc/example/clip-gd/gr.prg +clip/doc/example/clip-gtk/Makefile +clip/doc/example/clip-gtk/basket.bmp +clip/doc/example/clip-gtk/clip.xpm +clip/doc/example/clip-gtk/clipgtktest.prg +clip/doc/example/clip-gtkextra/Makefile +clip/doc/example/clip-gtkextra/pixmaps.ch +clip/doc/example/clip-gtkextra/sheet.prg clip/doc/example/clip-gzip/Makefile clip/doc/example/clip-gzip/gz.prg clip/doc/example/hello.prg @@ -327,6 +367,9 @@ clip/include/blob.ch clip/include/box.ch clip/include/browsys.ch clip/include/button.ch +clip/include/clip-gtk.ch +clip/include/clip-gtk.h +clip/include/clip-gtkextra.ch clip/include/clip.ch clip/include/clip.h clip/include/clipbase.h @@ -367,6 +410,49 @@ clip/include/fox.ch clip/include/foxsql.ch clip/include/frmdef.ch clip/include/func_ref.ch +clip/include/fwin/clipapi.h +clip/include/fwin/colors.ch +clip/include/fwin/column.ch +clip/include/fwin/comm.ch +clip/include/fwin/constant.ch +clip/include/fwin/database.ch +clip/include/fwin/dbf.ch +clip/include/fwin/dbm.ch +clip/include/fwin/dbms.ch +clip/include/fwin/dde.ch +clip/include/fwin/dialog.ch +clip/include/fwin/dict.ch +clip/include/fwin/dll.ch +clip/include/fwin/fivewin.ch +clip/include/fwin/folder.ch +clip/include/fwin/font.ch +clip/include/fwin/fwini.ch +clip/include/fwin/fwmsgs.h +clip/include/fwin/fwstd.ch +clip/include/fwin/info-unz.h +clip/include/fwin/ini.ch +clip/include/fwin/itk.ch +clip/include/fwin/mail.ch +clip/include/fwin/menu.ch +clip/include/fwin/msgxpm.ch +clip/include/fwin/obendcls.ch +clip/include/fwin/objects.ch +clip/include/fwin/objerror.ch +clip/include/fwin/objinsp.ch +clip/include/fwin/odbc.ch +clip/include/fwin/print.ch +clip/include/fwin/profiler.ch +clip/include/fwin/redefcls.ch +clip/include/fwin/report.ch +clip/include/fwin/sql.ch +clip/include/fwin/sysmetrics.ch +clip/include/fwin/tcbrowse.ch +clip/include/fwin/tree.ch +clip/include/fwin/video.ch +clip/include/fwin/vkey.ch +clip/include/fwin/winapi.ch +clip/include/fwin/winten.h +clip/include/fwin/yacc.ch clip/include/gdinfo.ch clip/include/getexit.ch clip/include/html.ch @@ -435,8 +521,13 @@ clip/lang/ru_RU.KOI8-U clip/lib/libclip-bzip2.so clip/lib/libclip-com.so clip/lib/libclip-crypto.so +clip/lib/libclip-fw.so clip/lib/libclip-gd.a clip/lib/libclip-gd.so +clip/lib/libclip-gtk.a +clip/lib/libclip-gtk.so +clip/lib/libclip-gtkextra.a +clip/lib/libclip-gtkextra.so clip/lib/libclip-gzip.so clip/lib/libclip-nanfor.so clip/lib/libclip-netto.so @@ -468,6 +559,10 @@ clip/locale.pot/bdbfs/modistru.pot clip/locale.pot/bdbfs/print.pot clip/locale.pot/bdbfs/tb2html.pot clip/locale.pot/bdbfs/viewer.pot +clip/locale.pot/clip-fw/fw_msg.pot +clip/locale.pot/clip-fw/fw_sys.pot +clip/locale.pot/clip-fw/fw_utils.pot +clip/locale.pot/clip-fw/x_sys.pot clip/locale.pot/debug/cld_obj.pot clip/locale.pot/debug/clip_cld.pot clip/locale.pot/debug/command.pot @@ -491,6 +586,7 @@ clip/term/pcansi @dirrm clip/term @dirrm clip/locale.pot/pp @dirrm clip/locale.pot/debug +@dirrm clip/locale.pot/clip-fw @dirrm clip/locale.pot/bdbfs @dirrm clip/locale.pot @dirrm clip/locale.po/ru_RU.KOI8-R @@ -503,6 +599,7 @@ clip/term/pcansi @dirrm clip/include/netto @dirrm clip/include/nanfor @dirrm clip/include/memdebug +@dirrm clip/include/fwin @dirrm clip/include @dirrm clip/etc/terminfo/x @dirrm clip/etc/terminfo/v @@ -519,7 +616,12 @@ clip/term/pcansi @dirrm clip/doc/rus @dirrm clip/doc/ncpfs @dirrm clip/doc/example/clip-gzip +@dirrm clip/doc/example/clip-gtkextra +@dirrm clip/doc/example/clip-gtk @dirrm clip/doc/example/clip-gd +@dirrm clip/doc/example/clip-fw/data +@dirrm clip/doc/example/clip-fw/bitmaps +@dirrm clip/doc/example/clip-fw @dirrm clip/doc/example/clip-crypto @dirrm clip/doc/example/clip-com @dirrm clip/doc/example/clip-bzip2 |