4 files changed, 44 insertions, 37 deletions

diff --git a/graphics/twinlib/Makefile b/graphics/twinlib/Makefile
index b2d5c543bc93..e46eed6b1d25 100644
--- a/graphics/twinlib/Makefile
+++ b/graphics/twinlib/Makefile
@@ -1,34 +1,34 @@
-# New ports collection makefile for:	paintlib
-# Version required:	0.2.1
+# New ports collection makefile for:	twinlib
+# Version required:	${VER}
 # Date created:		04 Jan 2000
 # Whom:			Will Andrews <andrews@technologist.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	paintlib.0.2.1
-PKGNAME=	paintlib-0.2.1
+DISTNAME=	twinlib.${VER}
+PKGNAME=	twinlib-${VER}
 CATEGORIES=	graphics devel
-MASTER_SITES=	http://rio.xdev.org/paintlib/
+MASTER_SITES=	http://rio.xdev.org/twinlib/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	will@FreeBSD.org
 
-USE_QT2=	yes
+BUILD_DEPENDS=	${LOCALBASE}/bin/tmake:${PORTSDIR}/devel/tmake
+
+VER=		0.2.3
+USE_QT=		yes
 USE_X_PREFIX=	yes
-WRKSRC=		${WRKDIR}/paintlib
+WRKSRC=		${WRKDIR}/twinlib
 MAKE_ENV+=	PREFIX=${PREFIX} CXX=${CXX}
 VERSION=	0
 PLIST_SUB+=	VERSION=${VERSION}
-
-post-patch:
-	@${PERL} -pi -e "s:%%VERSION%%:${VERSION}:g" ${WRKSRC}/Makefile
-	@${PERL} -pi -e "s:g\+\+:${CXX}:g" ${WRKSRC}/Makefile
+MAKE_ENV+=	TMAKEPATH="${LOCALBASE}/share/tmake/freebsd-g++" \
+		QTDIR="${X11BASE}"
 
 do-install:
-	@${INSTALL_DATA} ${WRKSRC}/PaintLib.h ${PREFIX}/include
-	@${INSTALL_DATA} ${WRKSRC}/libPaintLib.so.${VERSION} ${PREFIX}/lib
-	@${LN} -sf libPaintLib.so.${VERSION} ${PREFIX}/lib/libPaintLib.so
-	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+	@${INSTALL_DATA} ${WRKSRC}/TwinLib.h ${PREFIX}/include
+	@${INSTALL_DATA} ${WRKSRC}/libTwinlib.so.${VER} ${PREFIX}/lib/libTwinlib.so.${VERSION}
+	@${LN} -sf ${PREFIX}/libTwinlib.so.${VERSION} ${PREFIX}/lib/libTwinlib.so
 
 .include <bsd.port.mk>
diff --git a/graphics/twinlib/distinfo b/graphics/twinlib/distinfo
index ba09c876d5cd..7b5740043b18 100644
--- a/graphics/twinlib/distinfo
+++ b/graphics/twinlib/distinfo
@@ -1 +1 @@
-MD5 (paintlib.0.2.1.tgz) = fcdac1684bb2aad93e83e06d4e9ca18f
+MD5 (twinlib.0.2.3.tgz) = d1b57303fd62df647f6fd92aae80b860
diff --git a/graphics/twinlib/files/patch-aa b/graphics/twinlib/files/patch-aa
index 51e7e68ce182..886344f667d8 100644
--- a/graphics/twinlib/files/patch-aa
+++ b/graphics/twinlib/files/patch-aa
@@ -1,17 +1,24 @@
---- Makefile	Mon Jan  3 21:53:07 2000
-+++ Makefile.new	Tue Jan  4 13:27:24 2000
-@@ -1,6 +1,11 @@
--QT = /usr/local/qt/include
--LIBS = -L/usr/X11R6/lib -lqt -lqimgio -lpng -ljpeg 
--LIBPATH = /usr/X11R6/lib
-+CXX ?= g++
-+QT = $(PREFIX)/include/qt2 -I$(PREFIX)/include
-+LIBS = -L$(PREFIX)/lib -lqt2 -lpng -ljpeg 
-+LIBPATH = $(PREFIX)/lib
-+LIBRARY = libPaintLib.so.%%VERSION%%
-+
-+all: Image.o
-+	$(CXX) -shared -Wl,-soname,libPaintLib.so -o $(LIBRARY)
+--- Makefile	Mon Jan 17 10:30:27 2000
++++ Makefile.new	Thu Apr  6 20:27:24 2000
+@@ -1,4 +1,7 @@
+-PATHLIBS = /usr/X11R6/lib
++X11BASE		?=	/usr/X11R6
++LOCALBASE	?=	/usr/local
++PATHLIBS	=	$(X11BASE)/lib
++TMAKE		=	$(LOCALBASE)/bin/tmake
  
- install: Image.o PaintLib.h
- 	clear
+ all: Makefile.twinlib 
+ 	make -f Makefile.twinlib
+@@ -7,10 +10,10 @@
+ 	make -f Makefile.example
+ 	
+ Makefile.twinlib: twinlib.pro 
+-	tmake twinlib.pro -o Makefile.twinlib
++	$(TMAKE) twinlib.pro -o Makefile.twinlib
+ 
+ Makefile.example: example.pro
+-	tmake example.pro -o Makefile.example
++	$(TMAKE) example.pro -o Makefile.example
+ 
+ clean:
+ 	make -f Makefile.twinlib clean
diff --git a/graphics/twinlib/pkg-plist b/graphics/twinlib/pkg-plist
index 31ffb84ce62f..72761018846a 100644
--- a/graphics/twinlib/pkg-plist
+++ b/graphics/twinlib/pkg-plist
@@ -1,5 +1,5 @@
-include/PaintLib.h
-lib/libPaintLib.so
-lib/libPaintLib.so.%%VERSION%%
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+include/TwinLib.h
+lib/libTwinlib.so
+lib/libTwinlib.so.%%VERSION%%
+@exec /sbin/ldconfig -m %B
+@unexec /sbin/ldconfig -R