Add patch-af to find the pr(1) program properly, rather than

hardcoding an invalid path.

Also modify the package (jointly by jlam and agc) to use the zlib
buildlink2 infrastructure, rather than using the one in the package.

3 files changed, 30 insertions, 6 deletions

diff --git a/devel/opencm/patches/patch-ac b/devel/opencm/patches/patch-ac
index bb0e4f81d1b..4e2b5c5fdb6 100644
--- a/devel/opencm/patches/patch-ac
+++ b/devel/opencm/patches/patch-ac
@@ -1,13 +1,24 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/08/28 14:53:15 agc Exp $
+$NetBSD: patch-ac,v 1.2 2002/08/28 16:49:42 agc Exp $
 
 --- src/Makefile.in	2002/08/27 17:42:12	1.1
 +++ src/Makefile.in	2002/08/27 17:45:06
-@@ -108,7 +108,7 @@
+@@ -107,8 +107,8 @@
+ # COMREADLINE=-DUSE_READLINE -I/usr/include/readline
  SESSIONTIMEOUT=-DCLIENT_TIMEOUT=1800
  LIBDIFF=$(TOPDIR)/../libgdiff/libgdiff.a
- LIBZ=$(TOPDIR)/../zlib/libz.a
+-LIBZ=$(TOPDIR)/../zlib/libz.a
 -LIBGC=$(TOPDIR)/../gc6.0/.libs/libgc.a
-+LIBGC=@prefix@/lib/libgc.a
++LIBZ=-lz
++LIBGC=-lgc
  
  XCFLAGS = -Wmissing-prototypes -Wall -Wreturn-type -DDATADIR=\"$(datadir)\"
  # XCFLAGS += -Wno-unused -Werror
+@@ -235,7 +235,7 @@
+ nodepend:
+ 	find $(TOPDIR) -name '*.m' -exec rm {} \;
+ 
+-$(OPENCM): $(OBJECTS) $(LIBDIFF) $(LIBZ) $(LIBGC)
++$(OPENCM): $(OBJECTS) $(LIBDIFF)
+ 	$(CC) -o $(OPENCM) $(CFLAGS) $(OBJECTS) $(LDFLAGS) $(LIBDIFF) $(LIBZ) $(LIBGC) $(LIBS)
+ 
+ # Whenever we rebuild a .o file, we also need to rebuild the .m file:
diff --git a/devel/opencm/patches/patch-ad b/devel/opencm/patches/patch-ad
index 634a0d4e0fd..4dd102b7110 100644
--- a/devel/opencm/patches/patch-ad
+++ b/devel/opencm/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/08/28 14:53:15 agc Exp $
+$NetBSD: patch-ad,v 1.2 2002/08/28 16:49:42 agc Exp $
 
 --- Makefile.in	2002/08/27 17:47:00	1.1
 +++ Makefile.in	2002/08/27 17:47:13
@@ -7,7 +7,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/08/28 14:53:15 agc Exp $
  ### Subdirectories to run make in for the primary targets.
  # Unix source subdirs, where we'll want to run lint and etags:
 -USOURCE_SUBDIRS = libgdiff gc6.0 zlib src
-+USOURCE_SUBDIRS = libgdiff zlib src
++USOURCE_SUBDIRS = libgdiff src
  # All other subdirs:
  SUBDIRS = ${USOURCE_SUBDIRS} doc tools etc
  
diff --git a/devel/opencm/patches/patch-af b/devel/opencm/patches/patch-af
new file mode 100644
index 00000000000..a070845d28f
--- /dev/null
+++ b/devel/opencm/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2002/08/28 16:49:42 agc Exp $
+
+--- libgdiff/Makefile.in	2002/08/28 16:37:05	1.1
++++ libgdiff/Makefile.in	2002/08/28 16:39:31
+@@ -31,7 +31,7 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ 
+-PR_PROGRAM = /bin/pr
++PR_PROGRAM = $(shell type pr | awk '{ print $$NF }')
+ 
+ #### End of system configuration section. ####
+