4 files changed, 24 insertions, 69 deletions

diff --git a/devel/judy/Makefile b/devel/judy/Makefile
index be173ddb0e5b..2ca41550d6dc 100644
--- a/devel/judy/Makefile
+++ b/devel/judy/Makefile
@@ -6,30 +6,27 @@
 #
 
 PORTNAME=	Judy
-PORTVERSION=	0.1.8
-PORTREVISION=	1
+PORTVERSION=	1.0.0
 CATEGORIES=	devel
-MASTER_SITES=	http://judy.sourceforge.net/downloads/
-DISTNAME=	${PORTNAME}.${PORTVERSION}
-EXTRACT_SUFX=	.tar.bz
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	judy
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	General purpose dynamic array
 
-BROKEN=		Unfetchable
-
-USE_BZIP2=	YES
-HAS_CONFIGURE=	YES
+GNU_CONFIGURE=	YES
+USE_LIBTOOL_VER=15
+USE_GMAKE=	YES
 INSTALLS_SHLIB=	YES
 USE_REINPLACE=	YES
 
 MAN3=	Judy.3x Judy1.3x Judy1_funcs.3x JudyHS.3x JudyHS_funcs.3x \
 	JudyL.3x JudyL_funcs.3x JudySL.3x JudySL_funcs.3x
 
-MLINKS=	Judy1.3x J1T.3x Judy1.3x J1S.3x Judy1.3x J1U.3x Judy1.3x J1F.3x \
-	Judy1.3x J1N.3x Judy1.3x J1L.3x Judy1.3x J1P.3x Judy1.3x J1FE.3x \
-	Judy1.3x J1NE.3x Judy1.3x J1LE.3x Judy1.3x J1PE.3x Judy1.3x J1C.3x \
-	Judy1.3x J1BC.3x Judy1.3x J1FA.3x Judy1.3x J1MU.3x \
+MLINKS=	Judy.3x J1T.3x Judy.3x J1S.3x Judy.3x J1U.3x Judy.3x J1F.3x \
+	Judy.3x J1N.3x Judy.3x J1L.3x Judy.3x J1P.3x Judy.3x J1FE.3x \
+	Judy.3x J1NE.3x Judy.3x J1LE.3x Judy.3x J1PE.3x Judy.3x J1C.3x \
+	Judy.3x J1BC.3x Judy.3x J1FA.3x Judy.3x J1MU.3x \
 	Judy1_funcs.3x Judy1Test.3x Judy1_funcs.3x Judy1Set.3x \
 	Judy1_funcs.3x Judy1Unset.3x Judy1_funcs.3x Judy1First.3x \
 	Judy1_funcs.3x Judy1Next.3x Judy1_funcs.3x Judy1Last.3x \
@@ -62,33 +59,24 @@ MLINKS=	Judy1.3x J1T.3x Judy1.3x J1S.3x Judy1.3x J1U.3x Judy1.3x J1F.3x \
 	JudySL_funcs.3x JudySLNext.3x JudySL_funcs.3x JudySLLast.3x \
 	JudySL_funcs.3x JudySLPrev.3x JudySL_funcs.3x JudySLFreeArray.3x
 
-SHLIB_MAJOR=	0
+SHLIB_MAJOR=	1
 PLIST_SUB=	SHLIB_MAJOR="${SHLIB_MAJOR}"
 
-DLVDIR=		${WRKSRC}/src/bsd_ia32/product/deliver/usr
-
 LIST_DOCS=	COPYRIGHT README *.htm
-LIST_EXAMPLES=	Makefile README *.c
-
-post-patch:
-	@${REINPLACE_CMD} -e 's!%%CC%%!${CC}!' \
-		${WRKSRC}/make_includes/platform.bsd_ia32.mk
 
-do-install:
-	${INSTALL_DATA} ${DLVDIR}/include/Judy.h ${PREFIX}/include
-	${INSTALL_DATA} ${DLVDIR}/lib/libJudy.a ${PREFIX}/lib
-	${INSTALL_DATA} ${DLVDIR}/lib/libJudy.so \
-		${PREFIX}/lib/libJudy.so.${SHLIB_MAJOR}
-	${LN} -sf libJudy.so.${SHLIB_MAJOR} ${PREFIX}/lib/libJudy.so
-	${INSTALL_MAN} ${DLVDIR}/share/man/man3/*.3x ${MANPREFIX}/man/man3
+post-install:
 .ifndef(NOPORTDOCS)
 	@${ECHO_MSG} "===>   Installing documentation for ${PKGNAME}"
 	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${LIST_DOCS:S!^!${DLVDIR}/share/doc/Judy/!} ${DOCSDIR}
-	@${ECHO_MSG} "===>   Installing examples for ${PKGNAME}"
-	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${LIST_EXAMPLES:S!^!${DLVDIR}/share/doc/Judy/demo/!} ${EXAMPLESDIR}
-	${INSTALL_SCRIPT} ${DLVDIR}/share/doc/Judy/demo/run_demo ${EXAMPLESDIR}
+	${INSTALL_DATA} ${LIST_DOCS:S!^!${WRKSRC}/doc/ext/!} ${DOCSDIR}
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "i386"
+CONFIGURE_ARGS+=	--enable-32-bit
+.elif ${ARCH} == "amd64" || ${ARCH} == "ia64"
+CONFIGURE_ARGS+=	--enable-64-bit
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/judy/distinfo b/devel/judy/distinfo
index b3b683d9f0f8..1a3f6592b8c3 100644
--- a/devel/judy/distinfo
+++ b/devel/judy/distinfo
@@ -1,2 +1,2 @@
-MD5 (Judy.0.1.8.tar.bz) = a68acfabc73e3f395ca6ad5628c1f18b
-SIZE (Judy.0.1.8.tar.bz) = 333651
+MD5 (Judy-1.0.0.tar.gz) = 4742f3bd4cb4e08e60a3216a13c3b61a
+SIZE (Judy-1.0.0.tar.gz) = 694853
diff --git a/devel/judy/files/patch-platform.bsd_ia32.mk b/devel/judy/files/patch-platform.bsd_ia32.mk
deleted file mode 100644
index 50150f9f6ee6..000000000000
--- a/devel/judy/files/patch-platform.bsd_ia32.mk
+++ /dev/null
@@ -1,25 +0,0 @@
---- make_includes/platform.bsd_ia32.mk.orig	Thu Aug 19 14:55:28 2004
-+++ make_includes/platform.bsd_ia32.mk	Thu Aug 19 14:59:35 2004
-@@ -3,12 +3,11 @@
- # Makefile fragment for Judy* for platform "freebsd_ia32".
- # See platform.hpux_pa.mk for more comments.
- 
--SHELL	= /bin/sh
- 
- # For portability use the generic names for cc, ld, and ar, which are typically
- # symlinks to more specific names, such as /usr/bin/cc -> /opt/ansic/bin/cc.
- 
--CCPATH	= cc
-+CCPATH	= %%CC%%
- LDPATH	= ld
- ARPATH	= ar
- AR	= $(ARPATH)
-@@ -106,7 +105,7 @@
- # flavors, so spell them out here by flavor, meaning this file cannot be
- # flavor-ignorant:
- 
--CC_OPTS_product = -Wall -O2
-+CC_OPTS_product = $(CFLAGS)
- CC_OPTS_cov	= -Wall -O -DJU_FLAVOR_COV
- CC_OPTS_debug	= -Wall -g -DJU_FLAVOR_DEBUG
- 
diff --git a/devel/judy/pkg-plist b/devel/judy/pkg-plist
index 99e960341eb4..954b5430799c 100644
--- a/devel/judy/pkg-plist
+++ b/devel/judy/pkg-plist
@@ -14,11 +14,3 @@ lib/libJudy.so.%%SHLIB_MAJOR%%
 %%PORTDOCS%%%%DOCSDIR%%/Judy_3x.htm
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%%%EXAMPLESDIR%%/run_demo
-%%PORTDOCS%%%%EXAMPLESDIR%%/interSL.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/interL.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/funhist.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/JudySort.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/README
-%%PORTDOCS%%%%EXAMPLESDIR%%/Makefile
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%