Update port to 0.7.1 (and unmark as BROKEN)

5 files changed, 141 insertions, 23 deletions

diff --git a/graphics/killustrator/Makefile b/graphics/killustrator/Makefile
index 9c76cebf0d35..79e3f32ab8fc 100644
--- a/graphics/killustrator/Makefile
+++ b/graphics/killustrator/Makefile
@@ -1,21 +1,30 @@
 # New ports collection makefile for:   killustrator
-# Version required:    0.2.1
+# Version required:    0.7.1
 # Date created:        07 May 1998
 # Whom:                Yukihiro Nakai <Nakai@technologist.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	killustrator-0.2.1
+DISTNAME=	killustrator-0.7.1
 CATEGORIES=	graphics kde
 MASTER_SITES=	http://wwwiti.cs.uni-magdeburg.de/~sattler/pub/killustrator/
 
-MAINTAINER=	nacai@iname.com
+MAINTAINER=	jedgar@FreeBSD.org
 
-LIB_DEPENDS=	kdecore.2:${PORTSDIR}/x11/kde11
-
-BROKEN=		upgrade
+LIB_DEPENDS=	kdecore.2:${PORTSDIR}/x11/kdelibs11 \
+		intl.1:${PORTSDIR}/devel/gettext \
+		gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+RUN_DEPENDS=	${LOCALBASE}/bin/kdehelp:${PORTSDIR}/x11/kdebase11
 
 GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib"
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 400004
+BROKEN=		"Requires NEWGCC-compiled KDE libs"
+.endif
 
 .include <bsd.port.mk>
diff --git a/graphics/killustrator/distinfo b/graphics/killustrator/distinfo
index 698a7e8c4e88..e85b915ba0bc 100644
--- a/graphics/killustrator/distinfo
+++ b/graphics/killustrator/distinfo
@@ -1 +1 @@
-MD5 (killustrator-0.2.1.tar.gz) = 5886b2da03a2326db571fca95ed7a2f6
+MD5 (killustrator-0.7.1.tar.gz) = 410299f51759690e4dd397025a1053bf
diff --git a/graphics/killustrator/files/patch-aa b/graphics/killustrator/files/patch-aa
index 5a168e314fab..df25e258b547 100644
--- a/graphics/killustrator/files/patch-aa
+++ b/graphics/killustrator/files/patch-aa
@@ -1,11 +1,11 @@
---- src/Makefile.in.orig	Thu May  7 12:42:53 1998
-+++ src/Makefile.in	Thu May  7 12:43:00 1998
-@@ -186,7 +186,7 @@
+--- standalone/Makefile.in.orig	Tue Oct 19 08:59:09 1999
++++ standalone/Makefile.in	Tue Jan  4 21:11:54 2000
+@@ -212,7 +212,7 @@
+ FILTER_LIBS = ../filter/libfilter.a
+ XML_LIBS = ../xmlutils/libxml.a
+ KSHARE_LIBS = ../share/libkillu.a
+-killustrator_LDADD = $(FILTER_LIBS) $(KSHARE_LIBS) $(XML_LIBS) 	   $(LIBQIMGIO) $(LIB_KFILE) $(LIB_KIMGIO) $(LIBJPEG) $(LIBTIFF) $(LIBJPEG) $(LIBTIFF)
++killustrator_LDADD = $(FILTER_LIBS) $(KSHARE_LIBS) $(XML_LIBS) 	   $(LIBQIMGIO) $(LIB_KFILE) $(LIB_KIMGIO) $(LIBJPEG) $(LIBTIFF) $(LIBJPEG) $(LIBTIFF) -lgnugetopt
  
- # the libraries to link against. Be aware of the order. First the libraries,
- # that depend on the following ones.
--killustrator_LDADD   = filter/libsimple.a -lkfm -lkfile -lkdeui -lkdecore -lqt @LIBQIMGIO@ -lX11 -lXext @LIBSOCKET@ -ldl
-+killustrator_LDADD   = filter/libsimple.a -lkfm -lkfile -lkdeui -lkdecore -lqt @LIBQIMGIO@ -lX11 -lXext @LIBSOCKET@
  
  # this option you can leave out. Just, if you use "make dist", you need it
- noinst_HEADERS = Handle.h GObject.h GPolyline.h GPolygon.h GOval.h \
diff --git a/graphics/killustrator/pkg-descr b/graphics/killustrator/pkg-descr
index 4efdd1fae194..b7482114f619 100644
--- a/graphics/killustrator/pkg-descr
+++ b/graphics/killustrator/pkg-descr
@@ -1,3 +1,7 @@
-the vector drawing tool for K Desktop Environment
+killustrator is vector drawing tool for K Desktop Environment
+
+The aim of the killustrator project is the development of a freely
+available vector-based drawing application similiar to Corel Draw
+or Adobe Illustrator.
 
 WWW: http://wwwiti.cs.uni-magdeburg.de/~sattler/killustrator.html
diff --git a/graphics/killustrator/pkg-plist b/graphics/killustrator/pkg-plist
index df7233eae6af..42f98d90f5e2 100644
--- a/graphics/killustrator/pkg-plist
+++ b/graphics/killustrator/pkg-plist
@@ -1,26 +1,131 @@
 bin/killustrator
-share/apps/killustrator/pics/abottom.xpm
+share/applnk/Graphics/killustrator.kdelnk
+share/apps/killustrator/default.pal
 share/apps/killustrator/pics/ahcenter.xpm
 share/apps/killustrator/pics/aleft.xpm
 share/apps/killustrator/pics/aright.xpm
 share/apps/killustrator/pics/atop.xpm
+share/apps/killustrator/pics/abottom.xpm
 share/apps/killustrator/pics/avcenter.xpm
-share/apps/killustrator/pics/beziertool.xpm
-share/apps/killustrator/pics/dbottom.xpm
-share/apps/killustrator/pics/dhcenter.xpm
-share/apps/killustrator/pics/dhdist.xpm
 share/apps/killustrator/pics/dleft.xpm
 share/apps/killustrator/pics/dright.xpm
+share/apps/killustrator/pics/dhcenter.xpm
+share/apps/killustrator/pics/dhdist.xpm
 share/apps/killustrator/pics/dtop.xpm
+share/apps/killustrator/pics/dbottom.xpm
 share/apps/killustrator/pics/dvcenter.xpm
 share/apps/killustrator/pics/dvdist.xpm
 share/apps/killustrator/pics/ellipsetool.xpm
 share/apps/killustrator/pics/linetool.xpm
-share/apps/killustrator/pics/pointtool.xpm
-share/apps/killustrator/pics/polygontool.xpm
+share/apps/killustrator/pics/freehandtool.xpm
 share/apps/killustrator/pics/recttool.xpm
 share/apps/killustrator/pics/selecttool.xpm
 share/apps/killustrator/pics/texttool.xpm
+share/apps/killustrator/pics/beziertool.xpm
+share/apps/killustrator/pics/hmirror.xpm
+share/apps/killustrator/pics/zoomtool.xpm
+share/apps/killustrator/pics/polygontool.xpm
+share/apps/killustrator/pics/pointtool.xpm
+share/apps/killustrator/pics/ellipse1.xpm
+share/apps/killustrator/pics/ellipse2.xpm
+share/apps/killustrator/pics/ellipse3.xpm
+share/apps/killustrator/pics/vmirror.xpm
+share/apps/killustrator/pics/tleftalign.xpm
+share/apps/killustrator/pics/tcenteralign.xpm
+share/apps/killustrator/pics/trightalign.xpm
+share/apps/killustrator/pics/lo-killustrator.xpm
+share/apps/killustrator/pics/logo.xpm
+share/apps/killustrator/pics/deletelayer.xpm
+share/apps/killustrator/pics/lowerlayer.xpm
+share/apps/killustrator/pics/newlayer.xpm
+share/apps/killustrator/pics/raiselayer.xpm
+share/apps/killustrator/pics/eye.xpm
+share/apps/killustrator/pics/deleteNode.xpm
+share/apps/killustrator/pics/joinNodes.xpm
+share/apps/killustrator/pics/moveNode.xpm
+share/apps/killustrator/pics/newNode.xpm
+share/apps/killustrator/pics/split.xpm
+share/apps/killustrator/pics/mini-killustrator.xpm
+share/apps/killustrator/pics/killustrator-intro.gif
+share/doc/HTML/de/killustrator/index-1.html
+share/doc/HTML/de/killustrator/index-2.html
+share/doc/HTML/de/killustrator/index-3.html
+share/doc/HTML/de/killustrator/index-4.html
+share/doc/HTML/de/killustrator/index-5.html
+share/doc/HTML/de/killustrator/index-6.html
+share/doc/HTML/de/killustrator/index.html
+share/doc/HTML/de/killustrator/killustrator-1.html
+share/doc/HTML/de/killustrator/killustrator-2.html
+share/doc/HTML/de/killustrator/killustrator-3.html
+share/doc/HTML/de/killustrator/killustrator-4.html
+share/doc/HTML/de/killustrator/killustrator-5.html
+share/doc/HTML/de/killustrator/killustrator-6.html
+share/doc/HTML/de/killustrator/Poly_set.png
+share/doc/HTML/de/killustrator/ausrichten.png
+share/doc/HTML/de/killustrator/bezier.png
+share/doc/HTML/de/killustrator/blend_dialog.png
+share/doc/HTML/de/killustrator/color.png
+share/doc/HTML/de/killustrator/ellipse.png
+share/doc/HTML/de/killustrator/export.png
+share/doc/HTML/de/killustrator/freehand.png
+share/doc/HTML/de/killustrator/line.png
+share/doc/HTML/de/killustrator/logo.png
+share/doc/HTML/de/killustrator/logotp3.png
+share/doc/HTML/de/killustrator/movepoint.png
+share/doc/HTML/de/killustrator/newpoint.png
+share/doc/HTML/de/killustrator/open_dialog.png
+share/doc/HTML/de/killustrator/pfeil.png
+share/doc/HTML/de/killustrator/point.png
+share/doc/HTML/de/killustrator/polygon.png
+share/doc/HTML/de/killustrator/rect.png
+share/doc/HTML/de/killustrator/rmpoint.png
+share/doc/HTML/de/killustrator/save_dialog.png
+share/doc/HTML/de/killustrator/schichten.png
+share/doc/HTML/de/killustrator/text.png
+share/doc/HTML/de/killustrator/verteilen.png
+share/doc/HTML/de/killustrator/zoom.png
+share/doc/HTML/en/killustrator/index.html
+share/doc/HTML/en/killustrator/killustrator-1.html
+share/doc/HTML/en/killustrator/killustrator-2.html
+share/doc/HTML/en/killustrator/killustrator-3.html
+share/doc/HTML/en/killustrator/killustrator-4.html
+share/doc/HTML/en/killustrator/killustrator-5.html
+share/doc/HTML/en/killustrator/align.png
+share/doc/HTML/en/killustrator/align2.png
+share/doc/HTML/en/killustrator/bezier.png
+share/doc/HTML/en/killustrator/colour.png
+share/doc/HTML/en/killustrator/ellipse.png
+share/doc/HTML/en/killustrator/freehand.png
+share/doc/HTML/en/killustrator/line.png
+share/doc/HTML/en/killustrator/logo.png
+share/doc/HTML/en/killustrator/logotp3.png
+share/doc/HTML/en/killustrator/movepoint.png
+share/doc/HTML/en/killustrator/newpoint.png
+share/doc/HTML/en/killustrator/pfeil.png
+share/doc/HTML/en/killustrator/point.png
+share/doc/HTML/en/killustrator/polygon-setup.png
+share/doc/HTML/en/killustrator/polygon.png
+share/doc/HTML/en/killustrator/rect.png
+share/doc/HTML/en/killustrator/rmpoint.png
+share/doc/HTML/en/killustrator/text.png
+share/doc/HTML/en/killustrator/zoom.png
+share/icons/mini/killustrator.xpm
+share/icons/killustrator.xpm
+share/icons/killustrator-doc.xpm
+share/icons/killustrator-doc-mini.xpm
+share/icons/locolor/killustrator.xpm
+share/locale/da/LC_MESSAGES/killustrator.mo
 share/locale/de/LC_MESSAGES/killustrator.mo
+share/locale/fr/LC_MESSAGES/killustrator.mo
+share/locale/hu/LC_MESSAGES/killustrator.mo
+share/locale/ja/LC_MESSAGES/killustrator.mo
+share/locale/no/LC_MESSAGES/killustrator.mo
+share/locale/pl/LC_MESSAGES/killustrator.mo
+share/locale/pt/LC_MESSAGES/killustrator.mo
+share/locale/pt_BR/LC_MESSAGES/killustrator.mo
+share/locale/sk/LC_MESSAGES/killustrator.mo
+share/mimelnk/application/x-killustrator.kdelnk
+@dirrm share/doc/HTML/de/killustrator
+@dirrm share/doc/HTML/en/killustrator
 @dirrm share/apps/killustrator/pics
 @dirrm share/apps/killustrator