4 files changed, 13 insertions, 39 deletions

diff --git a/cad/geda-netlist/Makefile b/cad/geda-netlist/Makefile
index c44006a5b686..97bc52563da4 100644
--- a/cad/geda-netlist/Makefile
+++ b/cad/geda-netlist/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	netlist
-PORTVERSION=	20060123
-PORTREVISION=	1
+PORTVERSION=	20060906
+PORTREVISION=	0
 CATEGORIES=	cad
 MASTER_SITES=	ftp://ftp.geda.seul.org/pub/geda/devel/${PORTVERSION}/ \
 		http://geda.seul.org/devel/${PORTVERSION}/ \
@@ -15,10 +15,10 @@ MASTER_SITES=	ftp://ftp.geda.seul.org/pub/geda/devel/${PORTVERSION}/ \
 PKGNAMEPREFIX=	geda-
 DISTNAME=	${PKGNAMEPREFIX}g${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	The gEDA's netlister
 
-LIB_DEPENDS=	geda.25:${PORTSDIR}/cad/libgeda
+LIB_DEPENDS=	geda.26:${PORTSDIR}/cad/libgeda
 RUN_DEPENDS=	${LOCALBASE}/share/geda/sym:${PORTSDIR}/cad/geda-symbols
 
 DATADIR=	${PREFIX}/share/geda
@@ -26,7 +26,7 @@ DOCSDIR=	${PREFIX}/share/doc/geda
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20
-CONFIGURE_ARGS=	--with-docdir=${DOCSDIR}
+CONFIGURE_ARGS=	--with-docdir=${DOCSDIR} --mandir=${PREFIX}/man
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
@@ -38,4 +38,9 @@ MAN1=		gnetlist.1
 BROKEN=		does not compile on 4.x
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -E \
+		-e "s,^(DATADIR[[:space:]]*=[[:space:]]*)gEDA,\1geda," \
+		${WRKSRC}/configure
+
 .include <bsd.port.post.mk>
diff --git a/cad/geda-netlist/distinfo b/cad/geda-netlist/distinfo
index 0901f5faa070..0b3feb6d585e 100644
--- a/cad/geda-netlist/distinfo
+++ b/cad/geda-netlist/distinfo
@@ -1,3 +1,3 @@
-MD5 (geda-gnetlist-20060123.tar.gz) = b976e9dac5764844ae79892cfdc3d6a4
-SHA256 (geda-gnetlist-20060123.tar.gz) = 80a437ba751981cdf7d85d39622263d8f2172b1dac0a2f19482e0fa065227f75
-SIZE (geda-gnetlist-20060123.tar.gz) = 323201
+MD5 (geda-gnetlist-20060906.tar.gz) = e70f4d1f2088d1b6516a205a041cdb9e
+SHA256 (geda-gnetlist-20060906.tar.gz) = 56fdeacb22f66d7d6691478ef136a12a598c8ba7ec3d895e500daa48daede66f
+SIZE (geda-gnetlist-20060906.tar.gz) = 332971
diff --git a/cad/geda-netlist/files/patch-configure b/cad/geda-netlist/files/patch-configure
deleted file mode 100644
index af4fb8204248..000000000000
--- a/cad/geda-netlist/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Thu Jul 13 15:10:52 2006
-+++ configure	Thu Jul 13 15:11:01 2006
-@@ -5467,7 +5467,7 @@
- # gEDA/gaf specify setup start
- #
- 
--DATADIR=gEDA
-+DATADIR=geda
- GEDADATADIR=$datadir/$DATADIR
- 
- if eval "test x$opt_rcdir = x"; then
diff --git a/cad/geda-netlist/files/patch-src_Makefile.in b/cad/geda-netlist/files/patch-src_Makefile.in
deleted file mode 100644
index 244c25799ecf..000000000000
--- a/cad/geda-netlist/files/patch-src_Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/Makefile.in.orig	Tue Jan 24 06:24:35 2006
-+++ src/Makefile.in	Mon Jun 26 02:55:21 2006
-@@ -194,7 +194,7 @@
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -lgeda
- DIST_SOURCES = $(gnetlist_SOURCES)
- DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
- SOURCES = $(gnetlist_SOURCES)
-@@ -234,7 +234,7 @@
- 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
- gnetlist$(EXEEXT): $(gnetlist_OBJECTS) $(gnetlist_DEPENDENCIES) 
- 	@rm -f gnetlist$(EXEEXT)
--	$(LINK) $(gnetlist_LDFLAGS) $(gnetlist_OBJECTS) $(gnetlist_LDADD) $(LIBS)
-+	$(LINK) $(gnetlist_LDADD) $(gnetlist_LDFLAGS) $(LIBS) $(gnetlist_OBJECTS) 
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT) core *.core