8 files changed, 150 insertions, 44 deletions

diff --git a/x11-toolkits/paragui-devel/Makefile b/x11-toolkits/paragui-devel/Makefile
index 08b5e42a3530..2fd25b1f6c85 100644
--- a/x11-toolkits/paragui-devel/Makefile
+++ b/x11-toolkits/paragui-devel/Makefile
@@ -7,30 +7,34 @@
 #
 
 PORTNAME=	paragui
-PORTVERSION=	0.7.2
+PORTVERSION=	1.0.0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.bms-austria.com/pub/paragui/release/
 
 MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	SDL-1.1.3:${PORTSDIR}/devel/sdl12 \
-		SDL_ttf.3:${PORTSDIR}/graphics/sdl_ttf
+		SDL_image.10:${PORTSDIR}/graphics/sdl_image \
+		SDL_ttf.3:${PORTSDIR}/graphics/sdl_ttf \
+		expat.2:${PORTSDIR}/textproc/expat2
 
 SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
 
 USE_X_PREFIX=	yes
-USE_FREETYPE=	yes
-USE_LIBTOOL=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}" \
-		CFLAGS="${CXXFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
+		CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-
-USE_GMAKE=	yes
-
 INSTALLS_SHLIB=	yes
 
+SHLIB_VER=	3
+PLIST_SUB=	SHLIB_VER="${SHLIB_VER}"
+
 post-patch:
-	@${PERL} -pi -e "s,\`sdl-config ,\`${SDL_CONFIG} ,g ; \
-		s,SDL/,SDL11/,g" ${WRKSRC}/configure
+	@${PERL} -pi -e 's|LT_CURRENT=.*$$|LT_CURRENT=${SHLIB_VER}|g ; \
+		 s|`sdl-config |`\$$\{SDL_CONFIG\} |g' ${WRKSRC}/configure
+	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+		's|\$$\(SDL_CFLAGS\)|\$$\(PARAGUI_CFLAGS\)|g ; \
+		 s|-release \$$\(LT_RELEASE\)||g'
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/paragui-devel/distinfo b/x11-toolkits/paragui-devel/distinfo
index c4574694132c..43c78df17dea 100644
--- a/x11-toolkits/paragui-devel/distinfo
+++ b/x11-toolkits/paragui-devel/distinfo
@@ -1 +1 @@
-MD5 (paragui-0.7.2.tar.gz) = c80c1b471a5edb140da00e4e1308501b
+MD5 (paragui-1.0.0.tar.gz) = 43b4e678a21bfe6ca75820d10a2b4289
diff --git a/x11-toolkits/paragui-devel/files/patch-ltmain.sh b/x11-toolkits/paragui-devel/files/patch-ltmain.sh
new file mode 100644
index 000000000000..5204c4e61246
--- /dev/null
+++ b/x11-toolkits/paragui-devel/files/patch-ltmain.sh
@@ -0,0 +1,41 @@
+--- ltmain.sh.orig	Mon Feb 11 17:35:31 2002
++++ ltmain.sh	Fri Mar  1 06:01:48 2002
+@@ -1056,14 +1056,14 @@
+ 	    # These systems don't actually have a C library (as such)
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+-	  *-*-openbsd*)
++	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+ 	  esac
+ 	 elif test "X$arg" = "X-lc_r"; then
+ 	  case $host in
+-	  *-*-openbsd*)
++	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc_r directly, use -pthread flag.
+ 	    continue
+ 	    ;;
+@@ -2494,7 +2494,7 @@
+ 	  *-*-netbsd*)
+ 	    # Don't link with libc until the a.out ld.so is fixed.
+ 	    ;;
+-	  *-*-openbsd*)
++	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    ;;
+ 	  *)
+@@ -4281,10 +4281,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/x11-toolkits/paragui-devel/pkg-plist b/x11-toolkits/paragui-devel/pkg-plist
index f40384ca58c1..bc44edfe3e86 100644
--- a/x11-toolkits/paragui-devel/pkg-plist
+++ b/x11-toolkits/paragui-devel/pkg-plist
@@ -1,25 +1,32 @@
 bin/paragui-config
 include/paragui/paraconfig.h
+include/paragui/paraconfig_gnu.h
 include/paragui/paragui.h
-include/paragui/paragui_doc.h
 include/paragui/paragui_types.h
-include/paragui/parastretch.h
 include/paragui/pgapplication.h
 include/paragui/pgbutton.h
-include/paragui/pgbuttongroup.h
 include/paragui/pgcheckbutton.h
+include/paragui/pgcolors.h
 include/paragui/pgcolumnitem.h
-include/paragui/pgdrawline.h
-include/paragui/pgdrawobject.h
+include/paragui/pgcompat.h
+include/paragui/pgdatacontainer.h
+include/paragui/pgdraw.h
 include/paragui/pgdropdown.h
 include/paragui/pgeventobject.h
-include/paragui/pggradientwidget.h
+include/paragui/pgfile.h
+include/paragui/pgfilearchive.h
+include/paragui/pgfont.h
+include/paragui/pgimage.h
+include/paragui/pginfo.h
 include/paragui/pglabel.h
+include/paragui/pglayout.h
 include/paragui/pglineedit.h
 include/paragui/pglistbox.h
 include/paragui/pglistboxbaseitem.h
 include/paragui/pglistboxitem.h
+include/paragui/pglog.h
 include/paragui/pgmaskedit.h
+include/paragui/pgmenubar.h
 include/paragui/pgmessagebox.h
 include/paragui/pgmessageobject.h
 include/paragui/pgnavigator.h
@@ -28,23 +35,24 @@ include/paragui/pgprogressbar.h
 include/paragui/pgradiobutton.h
 include/paragui/pgrect.h
 include/paragui/pgrectlist.h
+include/paragui/pgrichedit.h
 include/paragui/pgscrollbar.h
 include/paragui/pgslider.h
 include/paragui/pgspinnerbox.h
-include/paragui/pgstaticframe.h
 include/paragui/pgsurfacecache.h
 include/paragui/pgtheme.h
+include/paragui/pgthemewidget.h
 include/paragui/pgwidget.h
 include/paragui/pgwidgetdnd.h
 include/paragui/pgwidgetlist.h
+include/paragui/pgwidgetlistex.h
 include/paragui/pgwindow.h
-include/paragui/rendertextrect.h
-@dirrm include/paragui
-lib/libparagui-0.7.so.2
 lib/libparagui.a
 lib/libparagui.so
+lib/libparagui.so.%%SHLIB_VER%%
+lib/pkgconfig/paragui.pc
 share/aclocal/paragui.m4
 share/paragui/default.zip
-share/paragui/qnx.zip
 share/paragui/simple.zip
 @dirrm share/paragui
+@dirrm include/paragui
diff --git a/x11-toolkits/paragui/Makefile b/x11-toolkits/paragui/Makefile
index 08b5e42a3530..2fd25b1f6c85 100644
--- a/x11-toolkits/paragui/Makefile
+++ b/x11-toolkits/paragui/Makefile
@@ -7,30 +7,34 @@
 #
 
 PORTNAME=	paragui
-PORTVERSION=	0.7.2
+PORTVERSION=	1.0.0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.bms-austria.com/pub/paragui/release/
 
 MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	SDL-1.1.3:${PORTSDIR}/devel/sdl12 \
-		SDL_ttf.3:${PORTSDIR}/graphics/sdl_ttf
+		SDL_image.10:${PORTSDIR}/graphics/sdl_image \
+		SDL_ttf.3:${PORTSDIR}/graphics/sdl_ttf \
+		expat.2:${PORTSDIR}/textproc/expat2
 
 SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
 
 USE_X_PREFIX=	yes
-USE_FREETYPE=	yes
-USE_LIBTOOL=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}" \
-		CFLAGS="${CXXFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
+		CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-
-USE_GMAKE=	yes
-
 INSTALLS_SHLIB=	yes
 
+SHLIB_VER=	3
+PLIST_SUB=	SHLIB_VER="${SHLIB_VER}"
+
 post-patch:
-	@${PERL} -pi -e "s,\`sdl-config ,\`${SDL_CONFIG} ,g ; \
-		s,SDL/,SDL11/,g" ${WRKSRC}/configure
+	@${PERL} -pi -e 's|LT_CURRENT=.*$$|LT_CURRENT=${SHLIB_VER}|g ; \
+		 s|`sdl-config |`\$$\{SDL_CONFIG\} |g' ${WRKSRC}/configure
+	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+		's|\$$\(SDL_CFLAGS\)|\$$\(PARAGUI_CFLAGS\)|g ; \
+		 s|-release \$$\(LT_RELEASE\)||g'
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/paragui/distinfo b/x11-toolkits/paragui/distinfo
index c4574694132c..43c78df17dea 100644
--- a/x11-toolkits/paragui/distinfo
+++ b/x11-toolkits/paragui/distinfo
@@ -1 +1 @@
-MD5 (paragui-0.7.2.tar.gz) = c80c1b471a5edb140da00e4e1308501b
+MD5 (paragui-1.0.0.tar.gz) = 43b4e678a21bfe6ca75820d10a2b4289
diff --git a/x11-toolkits/paragui/files/patch-ltmain.sh b/x11-toolkits/paragui/files/patch-ltmain.sh
new file mode 100644
index 000000000000..5204c4e61246
--- /dev/null
+++ b/x11-toolkits/paragui/files/patch-ltmain.sh
@@ -0,0 +1,41 @@
+--- ltmain.sh.orig	Mon Feb 11 17:35:31 2002
++++ ltmain.sh	Fri Mar  1 06:01:48 2002
+@@ -1056,14 +1056,14 @@
+ 	    # These systems don't actually have a C library (as such)
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+-	  *-*-openbsd*)
++	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+ 	  esac
+ 	 elif test "X$arg" = "X-lc_r"; then
+ 	  case $host in
+-	  *-*-openbsd*)
++	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc_r directly, use -pthread flag.
+ 	    continue
+ 	    ;;
+@@ -2494,7 +2494,7 @@
+ 	  *-*-netbsd*)
+ 	    # Don't link with libc until the a.out ld.so is fixed.
+ 	    ;;
+-	  *-*-openbsd*)
++	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    ;;
+ 	  *)
+@@ -4281,10 +4281,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/x11-toolkits/paragui/pkg-plist b/x11-toolkits/paragui/pkg-plist
index f40384ca58c1..bc44edfe3e86 100644
--- a/x11-toolkits/paragui/pkg-plist
+++ b/x11-toolkits/paragui/pkg-plist
@@ -1,25 +1,32 @@
 bin/paragui-config
 include/paragui/paraconfig.h
+include/paragui/paraconfig_gnu.h
 include/paragui/paragui.h
-include/paragui/paragui_doc.h
 include/paragui/paragui_types.h
-include/paragui/parastretch.h
 include/paragui/pgapplication.h
 include/paragui/pgbutton.h
-include/paragui/pgbuttongroup.h
 include/paragui/pgcheckbutton.h
+include/paragui/pgcolors.h
 include/paragui/pgcolumnitem.h
-include/paragui/pgdrawline.h
-include/paragui/pgdrawobject.h
+include/paragui/pgcompat.h
+include/paragui/pgdatacontainer.h
+include/paragui/pgdraw.h
 include/paragui/pgdropdown.h
 include/paragui/pgeventobject.h
-include/paragui/pggradientwidget.h
+include/paragui/pgfile.h
+include/paragui/pgfilearchive.h
+include/paragui/pgfont.h
+include/paragui/pgimage.h
+include/paragui/pginfo.h
 include/paragui/pglabel.h
+include/paragui/pglayout.h
 include/paragui/pglineedit.h
 include/paragui/pglistbox.h
 include/paragui/pglistboxbaseitem.h
 include/paragui/pglistboxitem.h
+include/paragui/pglog.h
 include/paragui/pgmaskedit.h
+include/paragui/pgmenubar.h
 include/paragui/pgmessagebox.h
 include/paragui/pgmessageobject.h
 include/paragui/pgnavigator.h
@@ -28,23 +35,24 @@ include/paragui/pgprogressbar.h
 include/paragui/pgradiobutton.h
 include/paragui/pgrect.h
 include/paragui/pgrectlist.h
+include/paragui/pgrichedit.h
 include/paragui/pgscrollbar.h
 include/paragui/pgslider.h
 include/paragui/pgspinnerbox.h
-include/paragui/pgstaticframe.h
 include/paragui/pgsurfacecache.h
 include/paragui/pgtheme.h
+include/paragui/pgthemewidget.h
 include/paragui/pgwidget.h
 include/paragui/pgwidgetdnd.h
 include/paragui/pgwidgetlist.h
+include/paragui/pgwidgetlistex.h
 include/paragui/pgwindow.h
-include/paragui/rendertextrect.h
-@dirrm include/paragui
-lib/libparagui-0.7.so.2
 lib/libparagui.a
 lib/libparagui.so
+lib/libparagui.so.%%SHLIB_VER%%
+lib/pkgconfig/paragui.pc
 share/aclocal/paragui.m4
 share/paragui/default.zip
-share/paragui/qnx.zip
 share/paragui/simple.zip
 @dirrm share/paragui
+@dirrm include/paragui