diff --git a/graphics/tkimg/Makefile b/graphics/tkimg/Makefile index e6d1b11310c..2ebad1c6ab6 100644 --- a/graphics/tkimg/Makefile +++ b/graphics/tkimg/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2010/07/28 17:04:55 sebastia Exp $ +# $OpenBSD: Makefile,v 1.2 2010/07/30 16:41:09 sebastia Exp $ SHARED_ONLY = Yes @@ -49,22 +49,9 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \ REGRESS_IS_INTERACTIVE = X11 REGRESS_TARGET = test IMGLIBDIR = Img${V} -SUBST_VARS = SHLIB_VERSION IMGLIBDIR INSTALL_TARGET = collate FAKE_FLAGS = INSTALL_ROOT=${DESTDIR} - -pre-configure: - ${SUBST_CMD} ${WRKSRC}/bmp/configure \ - ${WRKSRC}/base/configure ${WRKSRC}/gif/configure \ - ${WRKSRC}/ico/configure ${WRKSRC}/jpeg/configure \ - ${WRKSRC}/pcx/configure ${WRKSRC}/pixmap/configure \ - ${WRKSRC}/png/configure ${WRKSRC}/ppm/configure \ - ${WRKSRC}/ps/configure ${WRKSRC}/sgi/configure \ - ${WRKSRC}/sun/configure ${WRKSRC}/tga/configure \ - ${WRKSRC}/tiff/configure ${WRKSRC}/window/configure \ - ${WRKSRC}/xbm/configure ${WRKSRC}/xpm/configure \ - ${WRKSRC}/libz/tcl/configure ${WRKSRC}/libjpeg/tcl/configure \ - ${WRKSRC}/libpng/tcl/configure ${WRKSRC}/libtiff/tcl/configure +CONFIGURE_ENV = SHLIB_VERSION=${SHLIB_VERSION} IMGLIBDIR=${IMGLIBDIR} post-install: # disable img::png when requiring package Img diff --git a/graphics/tkimg/pkg/PLIST b/graphics/tkimg/pkg/PLIST index 13a378635bb..5426cbf3c1a 100644 --- a/graphics/tkimg/pkg/PLIST +++ b/graphics/tkimg/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2010/07/28 17:04:55 sebastia Exp $ +@comment $OpenBSD: PLIST,v 1.2 2010/07/30 16:41:09 sebastia Exp $ include/jpegtcl.h include/jpegtclDecls.h include/jpegtclDeclsMask.h @@ -17,34 +17,34 @@ include/zlibtcl.h include/zlibtclDecls.h include/zlibtclDeclsMask.h include/zlibtclDeclsUnmask.h -lib/${IMGLIBDIR}/ -@lib lib/${IMGLIBDIR}/libjpegtcl10.so.${LIBjpegtcl10_VERSION} -lib/${IMGLIBDIR}/libjpegtclstub10.a -@lib lib/${IMGLIBDIR}/libpngtcl126.so.${LIBpngtcl126_VERSION} -lib/${IMGLIBDIR}/libpngtclstub126.a -@lib lib/${IMGLIBDIR}/libtifftcl361.so.${LIBtifftcl361_VERSION} -lib/${IMGLIBDIR}/libtifftclstub361.a -@lib lib/${IMGLIBDIR}/libtkimg13.so.${LIBtkimg13_VERSION} -@lib lib/${IMGLIBDIR}/libtkimgbmp13.so.${LIBtkimgbmp13_VERSION} -@lib lib/${IMGLIBDIR}/libtkimggif13.so.${LIBtkimggif13_VERSION} -@lib lib/${IMGLIBDIR}/libtkimgico13.so.${LIBtkimgico13_VERSION} -@lib lib/${IMGLIBDIR}/libtkimgjpeg13.so.${LIBtkimgjpeg13_VERSION} -@lib lib/${IMGLIBDIR}/libtkimgpcx13.so.${LIBtkimgpcx13_VERSION} -@lib lib/${IMGLIBDIR}/libtkimgpixmap13.so.${LIBtkimgpixmap13_VERSION} -@lib lib/${IMGLIBDIR}/libtkimgpng13.so.${LIBtkimgpng13_VERSION} -@lib lib/${IMGLIBDIR}/libtkimgppm13.so.${LIBtkimgppm13_VERSION} -@lib lib/${IMGLIBDIR}/libtkimgps13.so.${LIBtkimgps13_VERSION} -@lib lib/${IMGLIBDIR}/libtkimgsgi13.so.${LIBtkimgsgi13_VERSION} -lib/${IMGLIBDIR}/libtkimgstub13.a -@lib lib/${IMGLIBDIR}/libtkimgsun13.so.${LIBtkimgsun13_VERSION} -@lib lib/${IMGLIBDIR}/libtkimgtga13.so.${LIBtkimgtga13_VERSION} -@lib lib/${IMGLIBDIR}/libtkimgtiff13.so.${LIBtkimgtiff13_VERSION} -@lib lib/${IMGLIBDIR}/libtkimgwindow13.so.${LIBtkimgwindow13_VERSION} -@lib lib/${IMGLIBDIR}/libtkimgxbm13.so.${LIBtkimgxbm13_VERSION} -@lib lib/${IMGLIBDIR}/libtkimgxpm13.so.${LIBtkimgxpm13_VERSION} -@lib lib/${IMGLIBDIR}/libzlibtcl121.so.${LIBzlibtcl121_VERSION} -lib/${IMGLIBDIR}/libzlibtclstub121.a -lib/${IMGLIBDIR}/pkgIndex.tcl +lib/Img1.3/ +@lib lib/Img1.3/libjpegtcl10.so.${LIBjpegtcl10_VERSION} +lib/Img1.3/libjpegtclstub10.a +@lib lib/Img1.3/libpngtcl126.so.${LIBpngtcl126_VERSION} +lib/Img1.3/libpngtclstub126.a +@lib lib/Img1.3/libtifftcl361.so.${LIBtifftcl361_VERSION} +lib/Img1.3/libtifftclstub361.a +@lib lib/Img1.3/libtkimg13.so.${LIBtkimg13_VERSION} +@lib lib/Img1.3/libtkimgbmp13.so.${LIBtkimgbmp13_VERSION} +@lib lib/Img1.3/libtkimggif13.so.${LIBtkimggif13_VERSION} +@lib lib/Img1.3/libtkimgico13.so.${LIBtkimgico13_VERSION} +@lib lib/Img1.3/libtkimgjpeg13.so.${LIBtkimgjpeg13_VERSION} +@lib lib/Img1.3/libtkimgpcx13.so.${LIBtkimgpcx13_VERSION} +@lib lib/Img1.3/libtkimgpixmap13.so.${LIBtkimgpixmap13_VERSION} +@lib lib/Img1.3/libtkimgpng13.so.${LIBtkimgpng13_VERSION} +@lib lib/Img1.3/libtkimgppm13.so.${LIBtkimgppm13_VERSION} +@lib lib/Img1.3/libtkimgps13.so.${LIBtkimgps13_VERSION} +@lib lib/Img1.3/libtkimgsgi13.so.${LIBtkimgsgi13_VERSION} +lib/Img1.3/libtkimgstub13.a +@lib lib/Img1.3/libtkimgsun13.so.${LIBtkimgsun13_VERSION} +@lib lib/Img1.3/libtkimgtga13.so.${LIBtkimgtga13_VERSION} +@lib lib/Img1.3/libtkimgtiff13.so.${LIBtkimgtiff13_VERSION} +@lib lib/Img1.3/libtkimgwindow13.so.${LIBtkimgwindow13_VERSION} +@lib lib/Img1.3/libtkimgxbm13.so.${LIBtkimgxbm13_VERSION} +@lib lib/Img1.3/libtkimgxpm13.so.${LIBtkimgxpm13_VERSION} +@lib lib/Img1.3/libzlibtcl121.so.${LIBzlibtcl121_VERSION} +lib/Img1.3/libzlibtclstub121.a +lib/Img1.3/pkgIndex.tcl lib/jpegtclConfig.sh lib/pngtclConfig.sh lib/tifftclConfig.sh diff --git a/x11/tkdnd/Makefile b/x11/tkdnd/Makefile index 0502d65ae39..acb924db243 100644 --- a/x11/tkdnd/Makefile +++ b/x11/tkdnd/Makefile @@ -1,49 +1,52 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2010/07/16 08:30:27 sebastia Exp $ +# $OpenBSD: Makefile,v 1.2 2010/07/30 16:41:09 sebastia Exp $ -SHARED_ONLY= Yes +SHARED_ONLY = Yes -COMMENT= drag n drop extension for Tk +COMMENT = drag n drop extension for Tk -DISTNAME= tkdnd-1.0a2 -SHARED_LIBS= tkdnd 0.0 -CATEGORIES= x11 +REVISION = 0 +DISTNAME = tkdnd-1.0a2 +SHARED_LIBS = tkdnd 0.0 +CATEGORIES = x11 -HOMEPAGE= http://tkdnd.sourceforge.net/ +HOMEPAGE = http://tkdnd.sourceforge.net/ -MAINTAINER= Sebastian Reitenbach +MAINTAINER = Sebastian Reitenbach # BSD -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes +PERMIT_PACKAGE_CDROM = Yes +PERMIT_PACKAGE_FTP = Yes +PERMIT_DISTFILES_CDROM = Yes +PERMIT_DISTFILES_FTP = Yes -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tkdnd/} +MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=tkdnd/} -MODULES= x11/tk -BUILD_DEPENDS= ${MODTK_BUILD_DEPENDS} -RUN_DEPENDS= ${MODTK_RUN_DEPENDS} +MODULES = x11/tk +BUILD_DEPENDS = ${MODTK_BUILD_DEPENDS} +RUN_DEPENDS = ${MODTK_RUN_DEPENDS} WANTLIB += X11 Xau Xdmcp Xext Xft Xrender Xss expat fontconfig -WANTLIB += freetype m z pthread pthread-stubs xcb +WANTLIB += freetype m z pthread-stubs xcb -USE_GMAKE= yes -WRKSRC= ${WRKDIR}/${DISTNAME}/unix -CONFIGURE_STYLE=gnu -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --with-tclinclude=${MODTCL_INCDIR} \ - --with-tcl=${MODTCL_LIBDIR} \ - --with-tk=${MODTK_LIBDIR} \ - --datadir=${PREFIX}/share/examples \ - --prefix=${WRKINST} -CONFIGURE_ENV= CFLAGS+=-I${X11BASE}/include -REGRESS_TARGET= tests -REGRESS_IS_INTERACTIVE= X11 - -SUBST_VARS= LIBtkdnd_VERSION MODTK_INCDIR DESTDIR +USE_GMAKE = yes +WRKSRC = ${WRKDIR}/${DISTNAME}/unix +CONFIGURE_STYLE = gnu +CONFIGURE_ARGS = ${CONFIGURE_SHARED} \ + --with-tclinclude=${MODTCL_INCDIR} \ + --with-tcl=${MODTCL_LIBDIR} \ + --with-tk=${MODTK_LIBDIR} \ + --datadir=${PREFIX}/share/examples \ + --prefix=${WRKINST} +CONFIGURE_ENV = CFLAGS+=-I${X11BASE}/include \ + LIBtkdnd_VERSION=${LIBtkdnd_VERSION} \ + DESTDIR=${DESTDIR} +MAKE_ENV = MODTK_INCDIR=${MODTK_INCDIR} +REGRESS_TARGET = tests +REGRESS_IS_INTERACTIVE = X11 +SUBST_VARS = DESTDIR pre-configure: - ${SUBST_CMD} ${WRKSRC}/Makefile.in ${WRKSRC}/configure ${WRKSRC}/mkIndex.tcl.in + ${SUBST_CMD} ${WRKSRC}/mkIndex.tcl.in ${MODTCL_TCLSH_ADJ} ${WRKSRC}/../demo/dnddemo.tcl ${WRKSRC}/../demo/newtest.tcl post-install: diff --git a/x11/tkhtml/Makefile b/x11/tkhtml/Makefile index d898e3b9f5d..6c866024a93 100644 --- a/x11/tkhtml/Makefile +++ b/x11/tkhtml/Makefile @@ -1,46 +1,42 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2010/07/16 08:32:13 sebastia Exp $ +# $OpenBSD: Makefile,v 1.2 2010/07/30 16:41:09 sebastia Exp $ -SHARED_ONLY= Yes +SHARED_ONLY = Yes -COMMENT= Tk widget to display HTML/CSS formatted contents +COMMENT = Tk widget to display HTML/CSS formatted contents -DISTNAME= tkhtml3-alpha-16 -PKGNAME= ${DISTNAME:S/3-alpha-/-3a/} -SHARED_LIBS= Tkhtml30 0.0 -CATEGORIES= x11 +DISTNAME = tkhtml3-alpha-16 +PKGNAME = ${DISTNAME:S/3-alpha-/-3a/} +SHARED_LIBS = Tkhtml30 0.0 +CATEGORIES = x11 -HOMEPAGE= http://tkhtml.tcl.tk/ +HOMEPAGE = http://tkhtml.tcl.tk/ -MAINTAINER= Sebastian Reitenbach +MAINTAINER = Sebastian Reitenbach # BSD -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes +PERMIT_PACKAGE_CDROM = Yes +PERMIT_PACKAGE_FTP = Yes +PERMIT_DISTFILES_CDROM = Yes +PERMIT_DISTFILES_FTP = Yes -MASTER_SITES= ${HOMEPAGE} +MASTER_SITES = ${HOMEPAGE} -MODULES= x11/tk -BUILD_DEPENDS= ${MODTK_BUILD_DEPENDS} -RUN_DEPENDS= ${MODTK_RUN_DEPENDS} -WANTLIB+= X11 +MODULES = x11/tk +BUILD_DEPENDS = ${MODTK_BUILD_DEPENDS} +RUN_DEPENDS = ${MODTK_RUN_DEPENDS} +WANTLIB += X11 -WRKDIST= ${WRKDIR}/htmlwidget -USE_GMAKE= Yes -SEPARATE_BUILD= simple -CONFIGURE_STYLE=gnu -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --with-tcl=${MODTCL_LIBDIR} \ - --with-tclinclude=${MODTCL_INCDIR} \ - --with-tk=${MODTK_LIBDIR} \ - --with-tkinclude=${MODTK_INCDIR} \ - --datadir=${PREFIX}/share/examples -NO_REGRESS= Yes - -SUBST_VARS= LIBTkhtml30_VERSION - -pre-configure: - ${SUBST_CMD} ${WRKSRC}/configure +WRKDIST = ${WRKDIR}/htmlwidget +USE_GMAKE = Yes +SEPARATE_BUILD = simple +CONFIGURE_STYLE = gnu +CONFIGURE_ENV = LIBTkhtml30_VERSION=${LIBTkhtml30_VERSION} +CONFIGURE_ARGS = ${CONFIGURE_SHARED} \ + --with-tcl=${MODTCL_LIBDIR} \ + --with-tclinclude=${MODTCL_INCDIR} \ + --with-tk=${MODTK_LIBDIR} \ + --with-tkinclude=${MODTK_INCDIR} \ + --datadir=${PREFIX}/share/examples +NO_REGRESS = Yes .include diff --git a/x11/tktreectrl/Makefile b/x11/tktreectrl/Makefile index fd129ce49c5..a0bafb87f99 100644 --- a/x11/tktreectrl/Makefile +++ b/x11/tktreectrl/Makefile @@ -1,48 +1,43 @@ -# $OpenBSD: Makefile,v 1.3 2010/07/30 06:59:00 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.4 2010/07/30 16:41:09 sebastia Exp $ -SHARED_ONLY= Yes +SHARED_ONLY = Yes -COMMENT= tree widget extension for Tk +COMMENT = tree widget extension for Tk -DISTNAME= tktreectrl-2.2.9 -REVISION= 0 -SHLIB_VERSION= 0.0 -SHARED_LIBS= treectrl22 ${SHLIB_VERSION} -CATEGORIES= x11 +DISTNAME = tktreectrl-2.2.9 +REVISION = 1 +SHARED_LIBS = treectrl22 0.0 +CATEGORIES = x11 -HOMEPAGE= http://tktreectrl.sourceforge.net/ +HOMEPAGE = http://tktreectrl.sourceforge.net/ -MAINTAINER= Sebastian Reitenbach +MAINTAINER = Sebastian Reitenbach # BSD -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes +PERMIT_PACKAGE_CDROM = Yes +PERMIT_PACKAGE_FTP = Yes +PERMIT_DISTFILES_CDROM = Yes +PERMIT_DISTFILES_FTP = Yes -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tktreectrl/} +MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=tktreectrl/} -WANTLIB+= X11 +WANTLIB += X11 -MODULES= x11/tk -BUILD_DEPENDS= ${MODTK_BUILD_DEPENDS} -RUN_DEPENDS= ${MODTK_RUN_DEPENDS} +MODULES = x11/tk +BUILD_DEPENDS = ${MODTK_BUILD_DEPENDS} +RUN_DEPENDS = ${MODTK_RUN_DEPENDS} -SEPARATE_BUILD= simple -CONFIGURE_STYLE=gnu -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --with-tcl=${MODTCL_LIBDIR} \ - --with-tk=${MODTK_LIBDIR} \ - --datadir=${PREFIX}/share/examples \ - --enable-64bit \ - --enable-64bit-vis -REGRESS_IS_INTERACTIVE= X11 -REGRESS_TARGET= test - -SUBST_VARS= SHLIB_VERSION +SEPARATE_BUILD = simple +CONFIGURE_STYLE = gnu +CONFIGURE_ENV = LIBtreectrl22_VERSION=${LIBtreectrl22_VERSION} +CONFIGURE_ARGS = ${CONFIGURE_SHARED} \ + --with-tcl=${MODTCL_LIBDIR} \ + --with-tk=${MODTK_LIBDIR} \ + --datadir=${PREFIX}/share/examples +REGRESS_IS_INTERACTIVE = X11 +REGRESS_TARGET = test pre-configure: - ${SUBST_CMD} ${WRKSRC}/configure ${MODTCL_TCLSH_ADJ} ${WRKSRC}/demos/demo.tcl mv "${WRKSRC}/doc/What's New in TkTreeCtrl.html" ${WRKSRC}/doc/Whats_New_in_TkTreeCtrl.html diff --git a/x11/tktreectrl/patches/patch-configure b/x11/tktreectrl/patches/patch-configure index 9a04551d8f6..d32eb417107 100644 --- a/x11/tktreectrl/patches/patch-configure +++ b/x11/tktreectrl/patches/patch-configure @@ -1,4 +1,4 @@ -$OpenBSD: patch-configure,v 1.1.1.1 2010/07/09 16:43:11 sebastia Exp $ +$OpenBSD: patch-configure,v 1.2 2010/07/30 16:41:09 sebastia Exp $ --- configure.orig Sun May 17 21:21:59 2009 +++ configure Tue Dec 8 09:06:27 2009 @@ -10182,13 +10182,7 @@ $as_echo "$tcl_cv_ld_elf" >&6; } @@ -21,7 +21,7 @@ $OpenBSD: patch-configure,v 1.1.1.1 2010/07/09 16:43:11 sebastia Exp $ CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} - SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0' -+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}' ++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${LIBtreectrl22_VERSION}' { $as_echo "$as_me:$LINENO: checking for ELF" >&5 $as_echo_n "checking for ELF... " >&6; } if test "${tcl_cv_ld_elf+set}" = set; then diff --git a/x11/tktreectrl/pkg/PFRAG.shared b/x11/tktreectrl/pkg/PFRAG.shared deleted file mode 100644 index 727ec303ffb..00000000000 --- a/x11/tktreectrl/pkg/PFRAG.shared +++ /dev/null @@ -1,2 +0,0 @@ -@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2010/07/09 16:43:11 sebastia Exp $ -@lib lib/treectrl2.2.9/libtreectrl22.so.${LIBtreectrl22_VERSION} diff --git a/x11/tktreectrl/pkg/PLIST b/x11/tktreectrl/pkg/PLIST index 9d57f55ad13..803007cd5a4 100644 --- a/x11/tktreectrl/pkg/PLIST +++ b/x11/tktreectrl/pkg/PLIST @@ -1,7 +1,7 @@ -@comment $OpenBSD: PLIST,v 1.2 2010/07/11 13:03:21 sebastia Exp $ -%%SHARED%% +@comment $OpenBSD: PLIST,v 1.3 2010/07/30 16:41:09 sebastia Exp $ lib/treectrl2.2.9/ lib/treectrl2.2.9/filelist-bindings.tcl +@lib lib/treectrl2.2.9/libtreectrl22.so.${LIBtreectrl22_VERSION} lib/treectrl2.2.9/pkgIndex.tcl lib/treectrl2.2.9/treectrl.tcl @man man/mann/treectrl.n