From afbc2ba0b430b20365147c38909ab4c05894dcab Mon Sep 17 00:00:00 2001 From: Thomas Gellekum Date: Fri, 30 Oct 1998 08:24:36 +0000 Subject: Upgrade to 0.20.2. Submitted by: Brian Handy --- x11-wm/windowmaker-i18n/Makefile | 28 +++---------- x11-wm/windowmaker-i18n/distinfo | 2 +- x11-wm/windowmaker-i18n/files/patch-ad | 72 +++++++++++++++++++++++----------- x11-wm/windowmaker-i18n/pkg-plist | 4 +- x11-wm/windowmaker/Makefile | 28 +++---------- x11-wm/windowmaker/distinfo | 2 +- x11-wm/windowmaker/files/patch-ah | 11 ++++++ x11-wm/windowmaker/pkg-plist | 4 +- 8 files changed, 79 insertions(+), 72 deletions(-) create mode 100644 x11-wm/windowmaker/files/patch-ah diff --git a/x11-wm/windowmaker-i18n/Makefile b/x11-wm/windowmaker-i18n/Makefile index e2250e6bb2d0..5416ff0eaedc 100644 --- a/x11-wm/windowmaker-i18n/Makefile +++ b/x11-wm/windowmaker-i18n/Makefile @@ -1,12 +1,12 @@ # New ports collection makefile for: WindowMaker -# Version required: 0.20.1 +# Version required: 0.20.2 # Date created: August 13, 1997 # Whom: handy@physics.montana.edu # -# $Id: Makefile,v 1.34 1998/09/30 13:24:39 tg Exp $ +# $Id: Makefile,v 1.35 1998/10/19 10:57:04 tg Exp $ -DISTNAME= WindowMaker-0.20.1 -PKGNAME= windowmaker-0.20.1 +DISTNAME= WindowMaker-0.20.2 +PKGNAME= windowmaker-0.20.2 CATEGORIES= x11-wm MASTER_SITES= ftp://ftp.windowmaker.org/pub/beta/srcs/ \ ftp://ftp.io.com/pub/mirror/windowmaker/beta/srcs/ \ @@ -15,7 +15,6 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DATAFILES} MAINTAINER= handy@physics.montana.edu -RUN_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80 LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ gif.3:${PORTSDIR}/graphics/giflib \ jpeg.9:${PORTSDIR}/graphics/jpeg \ @@ -28,32 +27,17 @@ CONFIGURE_ENV= X11BASE=${X11BASE} CONFIGURE_ARGS= --with-pixmapdir=${PREFIX}/include/X11/pixmaps \ --with-nlsdir=${LOCALBASE}/lib/locale \ --with-gfx-libs="-L${LOCALBASE}/lib" \ - --with-gfx-incs="-I${LOCALBASE}/include/tiff34 -I${LOCALBASE}/include" + --with-gfx-incs="-I${LOCALBASE}/include/tiff34 -I${LOCALBASE}/include" \ + --disable-debug MAN1= geticonset.1x getstyle.1x seticons.1x setstyle.1x \ wdwrite.1x wmaker.1x wmsetbg.1x wxcopy.1x wxpaste.1x DATAFILES= WindowMaker-data.tar.gz -post-extract: - cd ${WRKSRC}; ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} libPropList.tar.gz - post-patch: @perl -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/WPrefs.app/Paths.c -pre-configure: - @(cd ${WRKSRC}/libPropList && CC="${CC}" CXX="${CXX}" \ - ac_cv_path_CC="${CC}" CFLAGS="${CFLAGS} -fPIC" \ - INSTALL="/usr/bin/install -c -o ${BINOWN} -g ${BINGRP}" \ - INSTALL_DATA="${INSTALL_DATA}" \ - INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ - ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; \ - ${MAKE} ${MAKE_ENV}) - -pre-install: - @(cd ${WRKSRC}/libPropList; ${MAKE} ${MAKE_ENV} install) - post-install: ${MKDIR} ${PREFIX}/share/WindowMaker/Pixmaps/ ${INSTALL_DATA} ${WRKDIR}/WindowMaker-data/pixmaps/* \ diff --git a/x11-wm/windowmaker-i18n/distinfo b/x11-wm/windowmaker-i18n/distinfo index f5508fc3ee05..46a3274c71e7 100644 --- a/x11-wm/windowmaker-i18n/distinfo +++ b/x11-wm/windowmaker-i18n/distinfo @@ -1,2 +1,2 @@ -MD5 (WindowMaker-0.20.1.tar.gz) = 6ed696ff93b3ecaf155dacbaa32fcfda +MD5 (WindowMaker-0.20.2.tar.gz) = 26f92b4697238911f51566530f1915a3 MD5 (WindowMaker-data.tar.gz) = 6ea0c37314ea9e9ab27e8bdf45a31a82 diff --git a/x11-wm/windowmaker-i18n/files/patch-ad b/x11-wm/windowmaker-i18n/files/patch-ad index d630e21ea8fe..e712cf0a9732 100644 --- a/x11-wm/windowmaker-i18n/files/patch-ad +++ b/x11-wm/windowmaker-i18n/files/patch-ad @@ -1,23 +1,23 @@ ---- configure.orig Wed Sep 23 10:48:39 1998 -+++ configure Sat Sep 26 01:50:28 1998 -@@ -3570,7 +3570,7 @@ +--- configure.orig Fri Oct 23 06:49:55 1998 ++++ configure Sat Oct 24 12:58:13 1998 +@@ -3678,7 +3678,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lgif $GFX_INC_PATH $GFX_LIB_PATH $XLFLAGS $LIBS" +LIBS="-lgif $GFX_INC_PATH $GFX_LIB_PATH $XLFLAGS $XLIBS $LIBS" cat > conftest.$ac_ext <&6 --echo "configure:3634: checking for TIFFGetVersion in -ltiff" >&5 +-echo "configure:3783: checking for TIFFGetVersion in -ltiff" >&5 -ac_lib_var=`echo tiff'_'TIFFGetVersion | sed 'y%./+-%__p_%'` + echo $ac_n "checking for TIFFGetVersion in -ltiff34""... $ac_c" 1>&6 -+echo "configure:3634: checking for TIFFGetVersion in -ltiff34" >&5 ++echo "configure:3783: checking for TIFFGetVersion in -ltiff34" >&5 +ac_lib_var=`echo tiff34'_'TIFFGetVersion | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -26,26 +26,54 @@ -LIBS="-ltiff $GFX_INC_PATH $GFX_LIB_PATH $XLFLAGS $XLIBS $GFXLIBS -lm $LIBS" +LIBS="-ltiff34 $GFX_INC_PATH $GFX_LIB_PATH $XLFLAGS $XLIBS $GFXLIBS -lm $LIBS" cat > conftest.$ac_ext <&6 -- GFXFLAGS="$GFXFLAGS -DUSE_TIFF" GFXLIBS="-ltiff $GFXLIBS" -+ GFXFLAGS="$GFXFLAGS -DUSE_TIFF" GFXLIBS="-ltiff34 $GFXLIBS" - ICONEXT="tiff" +- my_libok=yes my_libname="-ltiff" ++ my_libok=yes my_libname="-ltiff34" else echo "$ac_t""no" 1>&6 -@@ -3717,14 +3717,14 @@ + my_libok=no +@@ -3821,14 +3821,14 @@ + + if test "$my_libok" = no; then + if test "$zlib" = "yes"; then +- echo $ac_n "checking for TIFFGetVersion in -ltiff""... $ac_c" 1>&6 +-echo "configure:3826: checking for TIFFGetVersion in -ltiff" >&5 +-ac_lib_var=`echo tiff'_'TIFFGetVersion | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for TIFFGetVersion in -ltiff34""... $ac_c" 1>&6 ++echo "configure:3826: checking for TIFFGetVersion in -ltiff34" >&5 ++ac_lib_var=`echo tiff34'_'TIFFGetVersion | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" +-LIBS="-ltiff $GFX_INC_PATH $GFX_LIB_PATH $XLFLAGS $XLIBS $GFXLIBS -lz -lm $LIBS" ++LIBS="-ltiff34 $GFX_INC_PATH $GFX_LIB_PATH $XLFLAGS $XLIBS $GFXLIBS -lz -lm $LIBS" + cat > conftest.$ac_ext <&6 +- my_libok=yes my_libname="-ltiff -lz" ++ my_libok=yes my_libname="-ltiff34 -lz" + else + echo "$ac_t""no" 1>&6 + my_libok=no +@@ -3866,14 +3866,14 @@ fi - if test ! "$ICONEXT" = "tiff"; then + if test "$my_libok" = no; then - echo $ac_n "checking for TIFFGetVersion in -ltiff34""... $ac_c" 1>&6 --echo "configure:3722: checking for TIFFGetVersion in -ltiff34" >&5 +-echo "configure:3871: checking for TIFFGetVersion in -ltiff34" >&5 -ac_lib_var=`echo tiff34'_'TIFFGetVersion | sed 'y%./+-%__p_%'` + echo $ac_n "checking for TIFFGetVersion in -ltiff""... $ac_c" 1>&6 -+echo "configure:3722: checking for TIFFGetVersion in -ltiff" >&5 ++echo "configure:3871: checking for TIFFGetVersion in -ltiff" >&5 +ac_lib_var=`echo tiff'_'TIFFGetVersion | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -54,14 +82,14 @@ -LIBS="-ltiff34 $GFX_INC_PATH $GFX_LIB_PATH $XLFLAGS $XLIBS $GFXLIBS -lm $LIBS" +LIBS="-ltiff $GFX_INC_PATH $GFX_LIB_PATH $XLFLAGS $XLIBS $GFXLIBS -lm $LIBS" cat > conftest.$ac_ext <&6 -- GFXFLAGS="$GFXFLAGS -DUSE_TIFF" GFXLIBS="-ltiff34 $GFXLIBS" -+ GFXFLAGS="$GFXFLAGS -DUSE_TIFF" GFXLIBS="-ltiff $GFXLIBS" - ICONEXT="tiff" +- my_libok=yes my_libname="-ltiff34" ++ my_libok=yes my_libname="-ltiff" else echo "$ac_t""no" 1>&6 + my_libok=no diff --git a/x11-wm/windowmaker-i18n/pkg-plist b/x11-wm/windowmaker-i18n/pkg-plist index 3c20c719f289..d770b56ec944 100644 --- a/x11-wm/windowmaker-i18n/pkg-plist +++ b/x11-wm/windowmaker-i18n/pkg-plist @@ -115,7 +115,6 @@ GNUstep/Apps/WPrefs.app/xpm/whandling.xpm GNUstep/Apps/WPrefs.app/xpm/windowfocus.xpm GNUstep/Apps/WPrefs.app/xpm/workspace.xpm GNUstep/Apps/WPrefs.app/xpm/xis.xpm -bin/dockit bin/geticonset bin/getstyle bin/seticons @@ -249,7 +248,6 @@ share/WindowMaker/Styles/Pastel share/WindowMaker/Styles/Pink share/WindowMaker/Styles/Pumpkin share/WindowMaker/Styles/Purple -share/WindowMaker/Styles/Rainbow share/WindowMaker/Styles/Red share/WindowMaker/Styles/RednBlue share/WindowMaker/Styles/ShinyBrown @@ -262,6 +260,7 @@ share/WindowMaker/Themes/Night share/WindowMaker/Themes/OpenStep share/WindowMaker/Themes/Pastel share/WindowMaker/autostart.sh +share/WindowMaker/exitscript.sh share/WindowMaker/menu share/WindowMaker/menu.cz share/WindowMaker/menu.de @@ -281,6 +280,7 @@ share/WindowMaker/menu.no share/WindowMaker/menu.pt share/WindowMaker/menu.ru share/WindowMaker/menu.se +share/WindowMaker/menu.sl share/WindowMaker/menu.tr share/WindowMaker/plmenu share/WindowMaker/wmmacros diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile index e2250e6bb2d0..5416ff0eaedc 100644 --- a/x11-wm/windowmaker/Makefile +++ b/x11-wm/windowmaker/Makefile @@ -1,12 +1,12 @@ # New ports collection makefile for: WindowMaker -# Version required: 0.20.1 +# Version required: 0.20.2 # Date created: August 13, 1997 # Whom: handy@physics.montana.edu # -# $Id: Makefile,v 1.34 1998/09/30 13:24:39 tg Exp $ +# $Id: Makefile,v 1.35 1998/10/19 10:57:04 tg Exp $ -DISTNAME= WindowMaker-0.20.1 -PKGNAME= windowmaker-0.20.1 +DISTNAME= WindowMaker-0.20.2 +PKGNAME= windowmaker-0.20.2 CATEGORIES= x11-wm MASTER_SITES= ftp://ftp.windowmaker.org/pub/beta/srcs/ \ ftp://ftp.io.com/pub/mirror/windowmaker/beta/srcs/ \ @@ -15,7 +15,6 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DATAFILES} MAINTAINER= handy@physics.montana.edu -RUN_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80 LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ gif.3:${PORTSDIR}/graphics/giflib \ jpeg.9:${PORTSDIR}/graphics/jpeg \ @@ -28,32 +27,17 @@ CONFIGURE_ENV= X11BASE=${X11BASE} CONFIGURE_ARGS= --with-pixmapdir=${PREFIX}/include/X11/pixmaps \ --with-nlsdir=${LOCALBASE}/lib/locale \ --with-gfx-libs="-L${LOCALBASE}/lib" \ - --with-gfx-incs="-I${LOCALBASE}/include/tiff34 -I${LOCALBASE}/include" + --with-gfx-incs="-I${LOCALBASE}/include/tiff34 -I${LOCALBASE}/include" \ + --disable-debug MAN1= geticonset.1x getstyle.1x seticons.1x setstyle.1x \ wdwrite.1x wmaker.1x wmsetbg.1x wxcopy.1x wxpaste.1x DATAFILES= WindowMaker-data.tar.gz -post-extract: - cd ${WRKSRC}; ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} libPropList.tar.gz - post-patch: @perl -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/WPrefs.app/Paths.c -pre-configure: - @(cd ${WRKSRC}/libPropList && CC="${CC}" CXX="${CXX}" \ - ac_cv_path_CC="${CC}" CFLAGS="${CFLAGS} -fPIC" \ - INSTALL="/usr/bin/install -c -o ${BINOWN} -g ${BINGRP}" \ - INSTALL_DATA="${INSTALL_DATA}" \ - INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ - ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; \ - ${MAKE} ${MAKE_ENV}) - -pre-install: - @(cd ${WRKSRC}/libPropList; ${MAKE} ${MAKE_ENV} install) - post-install: ${MKDIR} ${PREFIX}/share/WindowMaker/Pixmaps/ ${INSTALL_DATA} ${WRKDIR}/WindowMaker-data/pixmaps/* \ diff --git a/x11-wm/windowmaker/distinfo b/x11-wm/windowmaker/distinfo index f5508fc3ee05..46a3274c71e7 100644 --- a/x11-wm/windowmaker/distinfo +++ b/x11-wm/windowmaker/distinfo @@ -1,2 +1,2 @@ -MD5 (WindowMaker-0.20.1.tar.gz) = 6ed696ff93b3ecaf155dacbaa32fcfda +MD5 (WindowMaker-0.20.2.tar.gz) = 26f92b4697238911f51566530f1915a3 MD5 (WindowMaker-data.tar.gz) = 6ea0c37314ea9e9ab27e8bdf45a31a82 diff --git a/x11-wm/windowmaker/files/patch-ah b/x11-wm/windowmaker/files/patch-ah new file mode 100644 index 000000000000..98271d305b53 --- /dev/null +++ b/x11-wm/windowmaker/files/patch-ah @@ -0,0 +1,11 @@ +--- WINGs/usleep.c.orig Wed Oct 21 14:43:55 1998 ++++ WINGs/usleep.c Mon Oct 26 19:27:37 1998 +@@ -11,6 +11,8 @@ + # include + #endif + ++#include ++#include + + #if defined(HAVE_SELECT) + diff --git a/x11-wm/windowmaker/pkg-plist b/x11-wm/windowmaker/pkg-plist index 3c20c719f289..d770b56ec944 100644 --- a/x11-wm/windowmaker/pkg-plist +++ b/x11-wm/windowmaker/pkg-plist @@ -115,7 +115,6 @@ GNUstep/Apps/WPrefs.app/xpm/whandling.xpm GNUstep/Apps/WPrefs.app/xpm/windowfocus.xpm GNUstep/Apps/WPrefs.app/xpm/workspace.xpm GNUstep/Apps/WPrefs.app/xpm/xis.xpm -bin/dockit bin/geticonset bin/getstyle bin/seticons @@ -249,7 +248,6 @@ share/WindowMaker/Styles/Pastel share/WindowMaker/Styles/Pink share/WindowMaker/Styles/Pumpkin share/WindowMaker/Styles/Purple -share/WindowMaker/Styles/Rainbow share/WindowMaker/Styles/Red share/WindowMaker/Styles/RednBlue share/WindowMaker/Styles/ShinyBrown @@ -262,6 +260,7 @@ share/WindowMaker/Themes/Night share/WindowMaker/Themes/OpenStep share/WindowMaker/Themes/Pastel share/WindowMaker/autostart.sh +share/WindowMaker/exitscript.sh share/WindowMaker/menu share/WindowMaker/menu.cz share/WindowMaker/menu.de @@ -281,6 +280,7 @@ share/WindowMaker/menu.no share/WindowMaker/menu.pt share/WindowMaker/menu.ru share/WindowMaker/menu.se +share/WindowMaker/menu.sl share/WindowMaker/menu.tr share/WindowMaker/plmenu share/WindowMaker/wmmacros -- cgit v1.2.3