update to 0.35

changes: bugfix, build system improvements

4 files changed, 26 insertions, 52 deletions

diff --git a/print/ijs/Makefile b/print/ijs/Makefile
index b61c7e47d98..2c39e0640b4 100644
--- a/print/ijs/Makefile
+++ b/print/ijs/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2006/03/04 21:30:30 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2006/07/07 19:01:43 drochner Exp $
 
-DISTNAME=	ijs-0.34
-PKGREVISION=	2
+DISTNAME=	ijs-0.35
 CATEGORIES=	print
 MASTER_SITES=	http://www.linuxprinting.org/ijs/download/
 
@@ -16,6 +15,7 @@ GNU_CONFIGURE=		yes
 BUILD_TARGET=		libijs.la
 MAKE_ENV+=		XCFLAGS=${CFLAGS:M*:Q}
 MAKE_ENV+=		IJS_VERSION_INFO="0:0"
+PKGCONFIG_OVERRIDE=	ijs.pc.in
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ijs
diff --git a/print/ijs/PLIST b/print/ijs/PLIST
index e40fd81eae2..1d30ca1e6cb 100644
--- a/print/ijs/PLIST
+++ b/print/ijs/PLIST
@@ -1,9 +1,11 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:51 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/07/07 19:01:43 drochner Exp $
 bin/ijs-config
 include/ijs/ijs.h
 include/ijs/ijs_client.h
 include/ijs/ijs_server.h
 lib/libijs.la
+lib/pkgconfig/ijs.pc
+man/man1/ijs-config.1
 share/doc/ijs/ijs_spec.pdf
 @dirrm share/doc/ijs
 @dirrm include/ijs
diff --git a/print/ijs/distinfo b/print/ijs/distinfo
index cbef3f36e5e..2540441f1ea 100644
--- a/print/ijs/distinfo
+++ b/print/ijs/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 12:51:43 agc Exp $
+$NetBSD: distinfo,v 1.3 2006/07/07 19:01:43 drochner Exp $
 
-SHA1 (ijs-0.34.tar.gz) = 227376a72be87fb6fd537ae14b128997625cbebc
-RMD160 (ijs-0.34.tar.gz) = c3e4a26a348c7ac7c6e745262c54b090a4308e49
-Size (ijs-0.34.tar.gz) = 129063 bytes
-SHA1 (patch-aa) = 7060e2ce72c89fcd6273c4b501dc3d5d3ac20eaa
+SHA1 (ijs-0.35.tar.gz) = 201df12d476dfc2da0ae1fe7710eede9d305be04
+RMD160 (ijs-0.35.tar.gz) = 1949b34d68b6af8c5db823f7265c603b1cada2e0
+Size (ijs-0.35.tar.gz) = 344262 bytes
+SHA1 (patch-aa) = 608e7c51ab684cc3356c58784c098a5f203c4b94
diff --git a/print/ijs/patches/patch-aa b/print/ijs/patches/patch-aa
index 45f7d721f80..58bbbd22782 100644
--- a/print/ijs/patches/patch-aa
+++ b/print/ijs/patches/patch-aa
@@ -1,50 +1,22 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/09/11 18:37:09 jlam Exp $
+$NetBSD: patch-aa,v 1.2 2006/07/07 19:01:43 drochner Exp $
 
---- Makefile.in.orig	Mon Apr 22 14:51:55 2002
+--- Makefile.in.orig	2004-02-11 12:51:54.000000000 +0100
 +++ Makefile.in
-@@ -1,7 +1,7 @@
- # Unix
+@@ -129,7 +129,7 @@ pkginclude_HEADERS = \
  
- CC=@CC@
--CFLAGS=-g -Wall -ansi -pedantic -Wmissing-prototypes
-+CFLAGS+=-Wall -ansi -pedantic -Wmissing-prototypes
- LDLIBS=
- OBJ=.@OBJEXT@
- EXE=@EXEEXT@
-@@ -32,6 +32,11 @@ INSTALL = @INSTALL@
+ noinst_HEADERS = unistd_.h
  
- IJS_COMMON_OBJ=ijs$(OBJ)
+-bin_PROGRAMS = ijs_client_example ijs_server_example
++#bin_PROGRAMS = ijs_client_example ijs_server_example
  
-+.SUFFIXES: .lo
-+
-+.c.lo:
-+	$(LIBTOOL) $(CC) $(CFLAGS) -c $<
-+
- all:	libijs.a libijs$(SHARED_OBJ) ijs_client_example$(EXE) ijs_server_example$(EXE)
+ bin_SCRIPTS = ijs-config
  
- LIB_OBJS=ijs$(OBJ) ijs_client$(OBJ) ijs_server$(OBJ) $(IJS_EXEC_SERVER)
-@@ -47,6 +52,9 @@ libijs.a:	$(LIB_OBJS)
- libijs$(SHARED_OBJ):	$(LIB_OBJS)
- 	$(CC) $(SHARED_LDFLAGS) $^ -o $@
+@@ -194,7 +194,7 @@ LTLIBRARIES = $(lib_LTLIBRARIES)
+ @SYSDEPS_WINDOWS_FALSE@libijs_la_DEPENDENCIES = ijs_exec_unix.lo
+ am_libijs_la_OBJECTS = ijs.lo ijs_client.lo ijs_server.lo
+ libijs_la_OBJECTS = $(am_libijs_la_OBJECTS)
+-bin_PROGRAMS = ijs_client_example$(EXEEXT) ijs_server_example$(EXEEXT)
++#bin_PROGRAMS = ijs_client_example$(EXEEXT) ijs_server_example$(EXEEXT)
+ PROGRAMS = $(bin_PROGRAMS)
  
-+libijs.la: $(LIB_OBJS:.o=.lo)
-+	$(LIBTOOL) $(CC) -o $@ $(LIB_OBJS:.o=.lo) -rpath $(libdir) -version-info $(IJS_VERSION_INFO)
-+
- ijs_client_example$(EXE):	ijs_client_example$(OBJ) ijs_client$(OBJ) $(IJS_COMMON_OBJ) $(IJS_EXEC_SERVER)
- 	$(CC) $(CFLAGS) $(FE)ijs_client_example$(EXE) ijs_client_example$(OBJ) ijs_client$(OBJ) $(IJS_COMMON_OBJ) $(IJS_EXEC_SERVER) $(LDLIBS)
- 
-@@ -59,11 +67,9 @@ common_clean:
- clean: common_clean
- 	$(RM) *~ gmon.out core ijs_spec.log ijs_spec.tex ijs_spec.aux libijs.a libijs$(SHARED_OBJ) config.cache config.log config.status ijs-config
- 
--install:	all
--	$(INSTALL) ijs_client_example$(EXE) -c $(bindir)/ijs_client_example$(EXE)
--	$(INSTALL) ijs-config -c $(bindir)/ijs-config
--	$(INSTALL) libijs.a $(libdir)/libijs.a
--	$(INSTALL) libijs$(SHARED_OBJ) $(libdir)/libijs$(SHARED_OBJ)
-+install:
-+	$(INSTALL) -c ijs-config $(bindir)/ijs-config
-+	$(LIBTOOL) $(INSTALL) libijs.la $(libdir)/libijs.la
- 	-mkdir $(pkgincludedir)
- 	$(INSTALL) ijs.h $(pkgincludedir)/ijs.h
- 	$(INSTALL) ijs_client.h $(pkgincludedir)/ijs_client.h
+ am_ijs_client_example_OBJECTS = ijs_client_example.$(OBJEXT)