libtoolify also .dep rule in common.mak

fix path in pwlib.mak and gui.mak, too
bump pkg revision to 2

5 files changed, 61 insertions, 6 deletions

diff --git a/devel/pwlib/Makefile b/devel/pwlib/Makefile
index e5b59653c5a..0416772d5a7 100644
--- a/devel/pwlib/Makefile
+++ b/devel/pwlib/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2002/12/03 13:00:17 jdolecek Exp $
+# $NetBSD: Makefile,v 1.18 2002/12/03 20:20:36 jdolecek Exp $
 #
 
 DISTNAME=		pwlib_1.4.4
 PKGNAME=		pwlib-1.4.4
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		devel
 MASTER_SITES=		http://www.openh323.org/bin/
 COUNTRY_MIRRORS=	at us1 us2 ru de cz
diff --git a/devel/pwlib/distinfo b/devel/pwlib/distinfo
index 591ea616485..4d00f2150dd 100644
--- a/devel/pwlib/distinfo
+++ b/devel/pwlib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2002/12/03 13:00:17 jdolecek Exp $
+$NetBSD: distinfo,v 1.7 2002/12/03 20:20:37 jdolecek Exp $
 
 SHA1 (pwlib_1.4.4.tar.gz) = 5432ba3e4771fb281283161bb956b5a19e5200c7
 Size (pwlib_1.4.4.tar.gz) = 907721 bytes
@@ -8,6 +8,8 @@ SHA1 (patch-ac) = 07fa4e45663840e273e21b8f240ec749fff4a13a
 SHA1 (patch-ae) = 02d323e53908049146c4b389e2b2d32ebf2c4a61
 SHA1 (patch-af) = e410a5e918e4e957ad8902b29f0a2f385c116bde
 SHA1 (patch-ag) = a2a7e8929c125f827c4e078f4a578497cbaff94b
-SHA1 (patch-ai) = 40902c75b1a5fe06e3ca47f360f2349d2684f9e4
+SHA1 (patch-ai) = 62a5ba1fa41b05d1b90738870c00a4d1785c6ecc
 SHA1 (patch-aj) = 93e039bb60c5cb75abb916e2797c644b67a6b9b0
 SHA1 (patch-al) = 29256c9f08e9e76779676651f4dd9569a747ced0
+SHA1 (patch-am) = 5b80fce03de136913dadfdbbdc161edef2f72919
+SHA1 (patch-an) = f79776e86d32bd15fd9f8fe1c0c02196ce4bcd3e
diff --git a/devel/pwlib/patches/patch-ai b/devel/pwlib/patches/patch-ai
index bb238ee5669..aba9fcecc92 100644
--- a/devel/pwlib/patches/patch-ai
+++ b/devel/pwlib/patches/patch-ai
@@ -1,7 +1,7 @@
-$NetBSD: patch-ai,v 1.2 2002/12/01 18:31:42 jdolecek Exp $
+$NetBSD: patch-ai,v 1.3 2002/12/03 20:20:37 jdolecek Exp $
 
 --- make/common.mak.orig	Thu Oct 10 06:43:44 2002
-+++ make/common.mak	Sat Nov 30 16:46:15 2002
++++ make/common.mak	Tue Dec  3 20:29:43 2002
 @@ -261,11 +261,11 @@
  #
  $(OBJDIR)/%.o : %.cxx 
@@ -16,6 +16,21 @@ $NetBSD: patch-ai,v 1.2 2002/12/01 18:31:42 jdolecek Exp $
  
  #
  # create list of object files 
+@@ -288,12 +288,12 @@
+ $(DEPDIR)/%.dep : %.cxx 
+ 	@if [ ! -d $(DEPDIR) ] ; then mkdir -p $(DEPDIR) ; fi
+ 	@printf %s $(OBJDIR)/ > $@
+-	$(CPLUS) $(STDCCFLAGS) -M $< >> $@
++	@LIBTOOL@ --tag=CXX $(CPLUS) $(STDCCFLAGS) -M $< >> $@
+ 
+ $(DEPDIR)/%.dep : %.c 
+ 	@if [ ! -d $(DEPDIR) ] ; then mkdir -p $(DEPDIR) ; fi
+ 	@printf %s $(OBJDIR)/ > $@
+-	$(CC) $(STDCCFLAGS) -M $< >> $@
++	@LIBTOOL@ --tag=CC $(CC) $(STDCCFLAGS) -M $< >> $@
+ 
+ #
+ # add in good files to delete
 @@ -328,7 +328,7 @@
  # directory
  	@if [ ! -L $(OBJDIR)/lib ] ; then cd $(OBJDIR); ln -s $(PW_LIBDIR) lib; fi
diff --git a/devel/pwlib/patches/patch-am b/devel/pwlib/patches/patch-am
new file mode 100644
index 00000000000..d762213d2a8
--- /dev/null
+++ b/devel/pwlib/patches/patch-am
@@ -0,0 +1,20 @@
+$NetBSD: patch-am,v 1.1 2002/12/03 20:20:37 jdolecek Exp $
+
+--- make/pwlib.mak.orig	Tue Dec  3 20:28:02 2002
++++ make/pwlib.mak	Tue Dec  3 20:28:43 2002
+@@ -44,11 +44,11 @@
+ #
+ 
+ ifndef PWLIBDIR
+-PWLIBDIR=$(HOME)/pwlib
++PWLIBDIR = @PREFIX@
+ endif
+ 
+-include $(PWLIBDIR)/make/unix.mak
+-include $(PWLIBDIR)/make/gui.mak
+-include $(PWLIBDIR)/make/common.mak
++include $(PWLIBDIR)/share/pwlib/make/unix.mak
++include $(PWLIBDIR)/share/pwlib/make/gui.mak
++include $(PWLIBDIR)/share/pwlib/make/common.mak
+ 
+ # End of pwlib.mak
diff --git a/devel/pwlib/patches/patch-an b/devel/pwlib/patches/patch-an
new file mode 100644
index 00000000000..d03203e2abf
--- /dev/null
+++ b/devel/pwlib/patches/patch-an
@@ -0,0 +1,18 @@
+$NetBSD: patch-an,v 1.1 2002/12/03 20:20:38 jdolecek Exp $
+
+--- make/gui.mak.orig	Tue Dec  3 20:30:26 2002
++++ make/gui.mak	Tue Dec  3 20:30:40 2002
+@@ -64,11 +64,11 @@
+ #
+ 
+ 
+-include $(PWLIBDIR)/make/defaultgui.mak
++include $(PWLIBDIR)/share/pwlib/make/defaultgui.mak
+ 
+ ifneq (,$(GUI_TYPE))
+ 
+-include $(PWLIBDIR)/make/$(GUI_TYPE).mak
++include $(PWLIBDIR)/share/pwlib/make/$(GUI_TYPE).mak
+ 
+ ifndef	GUI_SRC_NAME
+ GUI_SRC_NAME	= $(GUI_TYPE)