6 files changed, 41 insertions, 91 deletions

diff --git a/misc/gonvert/Makefile b/misc/gonvert/Makefile
index 66b5a43a9f63..e5e43317cece 100644
--- a/misc/gonvert/Makefile
+++ b/misc/gonvert/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	gonvert
-PORTVERSION=	0.1.7
-PORTREVISION=	1
+PORTVERSION=	0.1.10
 CATEGORIES=	misc python gnome
 MASTER_SITES=	http://www.unihedron.com/projects/gonvert/downloads/
 
diff --git a/misc/gonvert/distinfo b/misc/gonvert/distinfo
index 18eedfc1ec32..d12e1345c4b1 100644
--- a/misc/gonvert/distinfo
+++ b/misc/gonvert/distinfo
@@ -1,2 +1,2 @@
-MD5 (gonvert-0.1.7.tar.gz) = 87f7d95ab46ba715b46db401872fc05c
-SIZE (gonvert-0.1.7.tar.gz) = 106229
+MD5 (gonvert-0.1.10.tar.gz) = bdddefe0f8a7e60a4f8bc329cd640186
+SIZE (gonvert-0.1.10.tar.gz) = 107394
diff --git a/print/libijs/Makefile b/print/libijs/Makefile
index 8ca104b44730..5cdd713f0e41 100644
--- a/print/libijs/Makefile
+++ b/print/libijs/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libijs
-PORTVERSION=	0.34
-PORTREVISION=	1
+PORTVERSION=	0.35
 CATEGORIES=	print
 MASTER_SITES=	http://www.linuxprinting.org/ijs/download/
 DISTNAME=	ijs-${PORTVERSION}
@@ -16,14 +15,12 @@ DIST_SUBDIR=	ghostscript
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C library that supports plugin printer driver for Ghostscript
 
+USE_BZIP2=	yes
+USE_GNOME=	gnometarget lthack pkgconfig
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 
-MAKE_ENV=	SHLIB_VER=${SHLIB_VER}
-PLIST_SUB=	SHLIB_VER=${SHLIB_VER}
-
-SHLIB_VER=	1
+MAN1=		ijs-config.1
 
 .include <bsd.port.mk>
diff --git a/print/libijs/distinfo b/print/libijs/distinfo
index c7fd5df4c722..a2bf89dc9117 100644
--- a/print/libijs/distinfo
+++ b/print/libijs/distinfo
@@ -1,2 +1,2 @@
-MD5 (ghostscript/ijs-0.34.tar.gz) = 9f6b7cfac8dbaddda9f6c90f06a0d699
-SIZE (ghostscript/ijs-0.34.tar.gz) = 129063
+MD5 (ghostscript/ijs-0.35.tar.bz2) = 896fdcb7a01c586ba6eb81398ea3f6e9
+SIZE (ghostscript/ijs-0.35.tar.bz2) = 257476
diff --git a/print/libijs/files/patch-Makefile.in b/print/libijs/files/patch-Makefile.in
index 764104e0351c..d201c8999170 100644
--- a/print/libijs/files/patch-Makefile.in
+++ b/print/libijs/files/patch-Makefile.in
@@ -1,76 +1,28 @@
---- Makefile.in.orig	Tue Apr 23 06:51:55 2002
-+++ Makefile.in	Sun Apr 28 13:09:35 2002
-@@ -1,14 +1,15 @@
- # Unix
+--- Makefile.in.orig	Wed Feb 11 20:51:54 2004
++++ Makefile.in	Thu Mar 11 13:37:51 2004
+@@ -117,7 +117,7 @@
+ 
+ MAINT_CHARSET = latin1
+ m4datadir = $(datadir)/aclocal
+-pkgconfigdatadir = $(prefix)/lib/pkgconfig
++pkgconfigdatadir = $(prefix)/libdata/pkgconfig
+ 
+ lib_LTLIBRARIES = libijs.la
+ 
+@@ -143,12 +143,12 @@
+ @SYSDEPS_WINDOWS_TRUE@libijs_la_LIBADD = ijs_exec_win.lo $(IJS_DEPLIBS)
+ @SYSDEPS_WINDOWS_FALSE@libijs_la_LIBADD = ijs_exec_unix.lo $(IJS_DEPLIBS)
+ # Uncommment to build an unversioned library (version in soname)
+-libijs_la_LDFLAGS = -release $(IJS_VERSION) -rpath $(libdir)
++#libijs_la_LDFLAGS = -release $(IJS_VERSION) -rpath $(libdir)
+ 
+ # Uncomment to build a versioned library
+-#libijs_la_LDFLAGS = \
+-# -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+-# -rpath $(libdir)
++libijs_la_LDFLAGS = \
++ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
++ -rpath $(libdir)
+ ijs_client_example_SOURCES = ijs_client_example.c
+ ijs_client_example_LDADD = libijs.la
  
- CC=@CC@
--CFLAGS=-g -Wall -ansi -pedantic -Wmissing-prototypes
-+CFLAGS=@CFLAGS@ -ansi -pedantic -Wmissing-prototypes
- LDLIBS=
- OBJ=.@OBJEXT@
- EXE=@EXEEXT@
- 
- # todo: this needs to be .dylib on OS X - write a test
--SHARED_LDFLAGS=-shared
--SHARED_OBJ=.so
-+SHARED_LDFLAGS=-shared -Wl,-soname,libijs$(SHARED_OBJ)
-+SHARED_OBJ=.so.$(SHLIB_VER)
-+SHLIB_VER?=0
- #SHARED_LDFLAGS=-dylib
- #SHARED_OBJ=.dylib
- 
-@@ -28,11 +29,20 @@
- 
- pkgincludedir=$(includedir)/ijs
- 
--INSTALL = @INSTALL@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_DATA = @INSTALL_DATA@
- 
- IJS_COMMON_OBJ=ijs$(OBJ)
- 
--all:	libijs.a libijs$(SHARED_OBJ) ijs_client_example$(EXE) ijs_server_example$(EXE)
-+.SUFFIXES: .c .lo .o
-+
-+.c.o:
-+	$(CC) $(CFLAGS) -c -o $@ $<
-+.c.lo:
-+	$(CC) $(CFLAGS) -fPIC -DPIC -c -o $@ $<
-+
-+all:	libijs.a libijs$(SHARED_OBJ) ijs_client_example$(EXE)
- 
- LIB_OBJS=ijs$(OBJ) ijs_client$(OBJ) ijs_server$(OBJ) $(IJS_EXEC_SERVER)
- 
-@@ -44,7 +54,7 @@
- # Note: this builds both the server and client into a single library. Logically, it
- # makes sense to separate them, but they're small enough to make this probably
- # not worthwhile.
--libijs$(SHARED_OBJ):	$(LIB_OBJS)
-+libijs$(SHARED_OBJ):	$(LIB_OBJS:.o=.lo)
- 	$(CC) $(SHARED_LDFLAGS) $^ -o $@
- 
- ijs_client_example$(EXE):	ijs_client_example$(OBJ) ijs_client$(OBJ) $(IJS_COMMON_OBJ) $(IJS_EXEC_SERVER)
-@@ -60,14 +70,15 @@
- 	$(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_PROGRAM) ijs_client_example$(EXE) $(bindir)/ijs_client_example$(EXE)
-+	$(INSTALL_SCRIPT) ijs-config $(bindir)/ijs-config
-+	$(INSTALL_DATA) libijs.a $(libdir)/libijs.a
-+	$(INSTALL_DATA) libijs$(SHARED_OBJ) $(libdir)/libijs$(SHARED_OBJ)
-+	-ln -sf libijs$(SHARED_OBJ) $(libdir)/libijs.so
- 	-mkdir $(pkgincludedir)
--	$(INSTALL) ijs.h $(pkgincludedir)/ijs.h
--	$(INSTALL) ijs_client.h $(pkgincludedir)/ijs_client.h
--	$(INSTALL) ijs_server.h $(pkgincludedir)/ijs_server.h
-+	$(INSTALL_DATA) ijs.h $(pkgincludedir)/ijs.h
-+	$(INSTALL_DATA) ijs_client.h $(pkgincludedir)/ijs_client.h
-+	$(INSTALL_DATA) ijs_server.h $(pkgincludedir)/ijs_server.h
- 
- uninstall:
- 	$(RM) $(bindir)/ijs_client_example$(EXE) $(bindir)/ijs-config $(libdir)/libijs.a $(libdir)/libijs$(SHARED_OBJ)
diff --git a/print/libijs/pkg-plist b/print/libijs/pkg-plist
index 80476524202c..83803b51d0a8 100644
--- a/print/libijs/pkg-plist
+++ b/print/libijs/pkg-plist
@@ -1,9 +1,11 @@
-bin/ijs_client_example
 bin/ijs-config
+bin/ijs_client_example
+bin/ijs_server_example
 include/ijs/ijs.h
 include/ijs/ijs_client.h
 include/ijs/ijs_server.h
 lib/libijs.a
 lib/libijs.so
-lib/libijs.so.%%SHLIB_VER%%
+lib/libijs.so.1
+libdata/pkgconfig/ijs.pc
 @dirrm include/ijs