6 files changed, 64 insertions, 16 deletions

diff --git a/x11-wm/windowmaker-i18n/Makefile b/x11-wm/windowmaker-i18n/Makefile
index ac9460fb5d6d..83d8d6bedbaf 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.16.1
+# Version required:	0.17.5
 # Date created:		August 13, 1997
 # Whom:			handy@physics.montana.edu
 #
-# $Id: Makefile,v 1.15 1998/07/03 06:51:19 tg Exp $
+# $Id: Makefile,v 1.16 1998/07/08 14:48:52 tg Exp $
 
-DISTNAME=	WindowMaker-0.16.1
-PKGNAME=	windowmaker-0.16.1
+DISTNAME=	WindowMaker-0.17.5
+PKGNAME=	windowmaker-0.17.5
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.windowmaker.org/pub/beta/srcs/ \
 		ftp://ftp.io.com/pub/mirror/windowmaker/beta/srcs/ \
@@ -14,7 +14,6 @@ MASTER_SITES=	ftp://ftp.windowmaker.org/pub/beta/srcs/ \
 
 MAINTAINER=	handy@physics.montana.edu
 
-BUILD_DEPENDS=	${PREFIX}/lib/libPropList.a:${PORTSDIR}/devel/libproplist
 LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
 		jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
 		png\\.2\\.:${PORTSDIR}/graphics/png \
@@ -25,7 +24,23 @@ GNU_CONFIGURE=	yes
 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-libs="-L${LOCALBASE}/lib -ltiff34" \
 	--with-gfx-incs="-I${LOCALBASE}/include/tiff34 -I${LOCALBASE}/include"
 
+post-extract:
+	cd ${WRKSRC}; ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} libPropList.tar.gz
+
+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)
+
+pre-install:
+	@(cd ${WRKSRC}/libPropList; ${MAKE} install)
+
 .include <bsd.port.mk>
diff --git a/x11-wm/windowmaker-i18n/distinfo b/x11-wm/windowmaker-i18n/distinfo
index d840da96aa6d..46697d8590ef 100644
--- a/x11-wm/windowmaker-i18n/distinfo
+++ b/x11-wm/windowmaker-i18n/distinfo
@@ -1 +1 @@
-MD5 (WindowMaker-0.16.1.tar.gz) = c28b9e99a70903d149c089a2dd399422
+MD5 (WindowMaker-0.17.5.tar.gz) = 734d07f175bf6b6e89be9f28a5c1136d
diff --git a/x11-wm/windowmaker-i18n/pkg-plist b/x11-wm/windowmaker-i18n/pkg-plist
index 788b08a75679..6cb054c025aa 100644
--- a/x11-wm/windowmaker-i18n/pkg-plist
+++ b/x11-wm/windowmaker-i18n/pkg-plist
@@ -10,19 +10,25 @@ bin/wmaker.inst
 bin/wmsetbg
 bin/wxcopy
 bin/wxpaste
+lib/libPropList.a
+@exec ranlib %D/%F
+lib/libPropList.so.0.7
+@exec /sbin/ldconfig -m %D
+@unexec /sbin/ldconfig -m %D
 lib/libwraster.a
 @exec ranlib %D/%F
 lib/libWMaker.a
 @exec ranlib %D/%F
 lib/libWINGs.a
 @exec ranlib %D/%F
+include/proplist.h
 include/wraster.h
 include/WINGs.h
 include/WMaker.h
+include/WUtil.h
 share/WINGs/Images.tiff
 share/WINGs/Images.xpm
 share/WindowMaker/Backgrounds/BlueImage.jpeg
-share/WindowMaker/Copyright
 share/WindowMaker/Defaults/WMRootMenu
 share/WindowMaker/Defaults/WMState
 share/WindowMaker/Defaults/WMWindowAttributes
@@ -38,6 +44,8 @@ share/WindowMaker/Pixmaps/clip.tiff
 share/WindowMaker/Pixmaps/clip.xpm
 share/WindowMaker/Pixmaps/defaultAppIcon.tiff
 share/WindowMaker/Pixmaps/defaultAppIcon.xpm
+share/WindowMaker/Pixmaps/tile.tiff
+share/WindowMaker/Pixmaps/tile.xpm
 share/WindowMaker/README
 share/WindowMaker/Styles/Black
 share/WindowMaker/Styles/Blue
@@ -76,6 +84,7 @@ share/WindowMaker/menu.nl
 share/WindowMaker/menu.no
 share/WindowMaker/menu.pt
 share/WindowMaker/menu.ru
+share/WindowMaker/menu.tr
 share/WindowMaker/wmmacros
 @dirrm share/WindowMaker/Themes
 @dirrm share/WindowMaker/Styles
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index ac9460fb5d6d..83d8d6bedbaf 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	WindowMaker
-# Version required:	0.16.1
+# Version required:	0.17.5
 # Date created:		August 13, 1997
 # Whom:			handy@physics.montana.edu
 #
-# $Id: Makefile,v 1.15 1998/07/03 06:51:19 tg Exp $
+# $Id: Makefile,v 1.16 1998/07/08 14:48:52 tg Exp $
 
-DISTNAME=	WindowMaker-0.16.1
-PKGNAME=	windowmaker-0.16.1
+DISTNAME=	WindowMaker-0.17.5
+PKGNAME=	windowmaker-0.17.5
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.windowmaker.org/pub/beta/srcs/ \
 		ftp://ftp.io.com/pub/mirror/windowmaker/beta/srcs/ \
@@ -14,7 +14,6 @@ MASTER_SITES=	ftp://ftp.windowmaker.org/pub/beta/srcs/ \
 
 MAINTAINER=	handy@physics.montana.edu
 
-BUILD_DEPENDS=	${PREFIX}/lib/libPropList.a:${PORTSDIR}/devel/libproplist
 LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
 		jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
 		png\\.2\\.:${PORTSDIR}/graphics/png \
@@ -25,7 +24,23 @@ GNU_CONFIGURE=	yes
 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-libs="-L${LOCALBASE}/lib -ltiff34" \
 	--with-gfx-incs="-I${LOCALBASE}/include/tiff34 -I${LOCALBASE}/include"
 
+post-extract:
+	cd ${WRKSRC}; ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} libPropList.tar.gz
+
+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)
+
+pre-install:
+	@(cd ${WRKSRC}/libPropList; ${MAKE} install)
+
 .include <bsd.port.mk>
diff --git a/x11-wm/windowmaker/distinfo b/x11-wm/windowmaker/distinfo
index d840da96aa6d..46697d8590ef 100644
--- a/x11-wm/windowmaker/distinfo
+++ b/x11-wm/windowmaker/distinfo
@@ -1 +1 @@
-MD5 (WindowMaker-0.16.1.tar.gz) = c28b9e99a70903d149c089a2dd399422
+MD5 (WindowMaker-0.17.5.tar.gz) = 734d07f175bf6b6e89be9f28a5c1136d
diff --git a/x11-wm/windowmaker/pkg-plist b/x11-wm/windowmaker/pkg-plist
index 788b08a75679..6cb054c025aa 100644
--- a/x11-wm/windowmaker/pkg-plist
+++ b/x11-wm/windowmaker/pkg-plist
@@ -10,19 +10,25 @@ bin/wmaker.inst
 bin/wmsetbg
 bin/wxcopy
 bin/wxpaste
+lib/libPropList.a
+@exec ranlib %D/%F
+lib/libPropList.so.0.7
+@exec /sbin/ldconfig -m %D
+@unexec /sbin/ldconfig -m %D
 lib/libwraster.a
 @exec ranlib %D/%F
 lib/libWMaker.a
 @exec ranlib %D/%F
 lib/libWINGs.a
 @exec ranlib %D/%F
+include/proplist.h
 include/wraster.h
 include/WINGs.h
 include/WMaker.h
+include/WUtil.h
 share/WINGs/Images.tiff
 share/WINGs/Images.xpm
 share/WindowMaker/Backgrounds/BlueImage.jpeg
-share/WindowMaker/Copyright
 share/WindowMaker/Defaults/WMRootMenu
 share/WindowMaker/Defaults/WMState
 share/WindowMaker/Defaults/WMWindowAttributes
@@ -38,6 +44,8 @@ share/WindowMaker/Pixmaps/clip.tiff
 share/WindowMaker/Pixmaps/clip.xpm
 share/WindowMaker/Pixmaps/defaultAppIcon.tiff
 share/WindowMaker/Pixmaps/defaultAppIcon.xpm
+share/WindowMaker/Pixmaps/tile.tiff
+share/WindowMaker/Pixmaps/tile.xpm
 share/WindowMaker/README
 share/WindowMaker/Styles/Black
 share/WindowMaker/Styles/Blue
@@ -76,6 +84,7 @@ share/WindowMaker/menu.nl
 share/WindowMaker/menu.no
 share/WindowMaker/menu.pt
 share/WindowMaker/menu.ru
+share/WindowMaker/menu.tr
 share/WindowMaker/wmmacros
 @dirrm share/WindowMaker/Themes
 @dirrm share/WindowMaker/Styles