Split off parts of the Makefile into Makefile.common, to prepare for the

python bindings for newt.

While here, fix the library to link against its dependencies.
Bump PKGREVISION.

4 files changed, 39 insertions, 29 deletions

diff --git a/devel/newt/Makefile b/devel/newt/Makefile
index c40ebec6356..5950ea59814 100644
--- a/devel/newt/Makefile
+++ b/devel/newt/Makefile
@@ -1,33 +1,18 @@
-# $NetBSD: Makefile,v 1.8 2008/03/03 17:45:36 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2008/04/13 09:54:42 wiz Exp $
 
-DISTNAME=	${PKGNAME_NOREV}-5.src.rpm
-PKGNAME=	newt-0.51.6
-PKGREVISION=	2
-CATEGORIES=	devel
-MASTER_SITES=	http://download.fedora.redhat.com/pub/fedora/linux/core/3/SRPMS/
-EXTRACT_SUFX=	# empty
+.include "Makefile.common"
 
-MAINTAINER=	riz@NetBSD.org
-HOMEPAGE=	# empty
+PKGREVISION=	3
 COMMENT=	Windowing toolkit based on libslang
 
-BUILD_DEPENDS+=	rpm2pkg>=2.0:../../pkgtools/rpm2pkg
-
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_TOOLS+=	gmake gzcat tar
-
 USE_LIBTOOL=	yes
 NO_EXPORT_CPP=	yes
 GNU_CONFIGURE=	yes
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 
 INSTALLATION_DIRS=	bin include lib
 
-do-extract:
-	${LOCALBASE}/sbin/rpm2pkg -d ${WRKDIR} ${DISTDIR}/${DISTNAME}
-	cd ${WRKDIR} ; ${GZCAT} ${WRKSRC}.tar.gz | ${TAR} -xf -
-
 do-install:
 	cd ${WRKSRC}; \
 	 ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} libnewt.la ${DESTDIR}${PREFIX}/lib;\
diff --git a/devel/newt/Makefile.common b/devel/newt/Makefile.common
new file mode 100644
index 00000000000..c26a6b6a7d3
--- /dev/null
+++ b/devel/newt/Makefile.common
@@ -0,0 +1,25 @@
+# $NetBSD: Makefile.common,v 1.1 2008/04/13 09:54:42 wiz Exp $
+# used by devel/py-newt/Makefile
+
+DISTNAME=	newt-${VERSION}-5.src.rpm
+PKGNAME=	newt-${VERSION}
+VERSION=	0.51.6
+CATEGORIES=	devel
+MASTER_SITES=	http://download.fedora.redhat.com/pub/fedora/linux/core/3/SRPMS/
+EXTRACT_SUFX=	# empty
+
+MAINTAINER=	riz@NetBSD.org
+HOMEPAGE=	# empty
+
+BUILD_DEPENDS+=	rpm2pkg>=2.0:../../pkgtools/rpm2pkg
+
+DISTINFO_FILE=	${.CURDIR}/../../devel/newt/distinfo
+PATCHDIR=	${.CURDIR}/../../devel/newt/patches
+
+USE_TOOLS+=	gmake gzcat tar
+
+WRKSRC=		${WRKDIR}/newt-${VERSION}
+
+do-extract:
+	${LOCALBASE}/sbin/rpm2pkg -d ${WRKDIR} ${DISTDIR}/${DISTNAME}
+	cd ${WRKDIR} ; ${GZCAT} ${WRKSRC}.tar.gz | ${TAR} -xf -
diff --git a/devel/newt/distinfo b/devel/newt/distinfo
index e1fd9e9e934..a21906625fb 100644
--- a/devel/newt/distinfo
+++ b/devel/newt/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/04/08 02:47:24 riz Exp $
+$NetBSD: distinfo,v 1.2 2008/04/13 09:54:42 wiz Exp $
 
 SHA1 (newt-0.51.6-5.src.rpm) = 69f705b6593ba48169219c11259704467811a321
 RMD160 (newt-0.51.6-5.src.rpm) = b5791cb36a7209da132ce7cd24c6d93d976ddf1e
 Size (newt-0.51.6-5.src.rpm) = 174867 bytes
-SHA1 (patch-aa) = 9a35c2e114d3f3d726f86b3432cae21d9668ba6b
+SHA1 (patch-aa) = f81b1879a7d1a6b2fa5ce58ffaf4ada4d8b1003c
diff --git a/devel/newt/patches/patch-aa b/devel/newt/patches/patch-aa
index 882e44103f6..d650df341dc 100644
--- a/devel/newt/patches/patch-aa
+++ b/devel/newt/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/04/08 02:47:24 riz Exp $
---- Makefile.in.orig	2003-11-05 22:56:47.000000000 -0800
-+++ Makefile.in	2005-02-05 11:06:33.000000000 -0800
+$NetBSD: patch-aa,v 1.2 2008/04/13 09:54:42 wiz Exp $
+--- Makefile.in.orig	2003-11-06 06:56:47.000000000 +0000
++++ Makefile.in
 @@ -1,18 +1,16 @@
 -LIBS = -lslang -lm #-lefence
 -SHLIBS = -lslang -lm -lc
@@ -25,7 +25,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/04/08 02:47:24 riz Exp $
  
  WHIPTCLSO=
  #WHIPTCLSO=whiptcl.so
-@@ -21,16 +19,16 @@
+@@ -21,16 +19,16 @@ PROGS = test whiptail $(WHIPTCLSO) testg
  TESTOBJS = test.o
  NDIALOGOBJS = whiptail.o dialogboxes.o
  WHIPTCLOBJS = whiptcl.o dialogboxes.o
@@ -46,7 +46,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/04/08 02:47:24 riz Exp $
  includedir = $(prefix)/include
  libdir = $(prefix)/lib
  bindir = $(prefix)/bin
-@@ -38,6 +36,7 @@
+@@ -38,6 +36,7 @@ ARCHNAME = $(shell uname -m | sed 's/i.8
  
  #--------------------------------------
  
@@ -54,7 +54,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/04/08 02:47:24 riz Exp $
  SOURCES = $(subst .o,.c,$(TESTOBJS) $(NDIALOGOBJS) $(LIBOBJS))
  
  SHAREDDIR = shared
-@@ -49,43 +48,49 @@
+@@ -49,43 +48,49 @@ else
  TARGET=depend $(PROGS)
  endif
  
@@ -109,7 +109,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/04/08 02:47:24 riz Exp $
 +
 +$(LIBNEWT): $(LIBOBJS) newt.o
 +	${LIBTOOL} --mode=link ${CC} -o ${LIBNEWT} ${LIBOBJS:.o=.lo} \
-+	newt.lo -rpath ${PREFIX}/lib -version-number 0:51:6
++	newt.lo -rpath ${PREFIX}/lib -version-number 0:51:6 ${SHLIBS}
  
  newt.o: newt.c Makefile
 -	$(CC) $(CFLAGS) -DVERSION=\"$(VERSION)\" -c -o $@ $<
@@ -120,7 +120,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/04/08 02:47:24 riz Exp $
  
  veryclean: clean
  	rm -f .depend
-@@ -97,19 +102,19 @@
+@@ -97,19 +102,19 @@ clean:
  depend:
  	$(CPP) $(CFLAGS) -M $(SOURCES) > .depend
  
@@ -149,7 +149,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/04/08 02:47:24 riz Exp $
  
  
  install: $(LIBNEWT) install-sh whiptail
-@@ -147,7 +152,3 @@
+@@ -147,7 +152,3 @@ archive:    configure
  	@rm -f /tmp/newt-$(VERSION).tar.gz
  	@echo " "
  	@echo "The final archive is ./newt-$(VERSION).tar.gz."