6 files changed, 22 insertions, 32 deletions

diff --git a/archivers/liblzxcomp/Makefile b/archivers/liblzxcomp/Makefile
index 11b83437181b..e578a2244678 100644
--- a/archivers/liblzxcomp/Makefile
+++ b/archivers/liblzxcomp/Makefile
@@ -2,33 +2,21 @@
 # $FreeBSD$
 
 PORTNAME=	liblzxcomp
-PORTVERSION=	20020619
+PORTVERSION=	20050705
 CATEGORIES=	archivers
-MASTER_SITES=	http://www.speakeasy.org/~russotto/chm/
+MASTER_SITES=	http://www.russotto.net/chm/
 DISTNAME=	lzx_compress
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	ak@FreeBSD.org
 COMMENT=	LZX compression library
 
-DEPRECATED=	No more public distfiles
-EXPIRATION_DATE=	2014-03-07
-
-USE_LDCONFIG=	YES
-SHLIB_MAJOR=	1
-PLIST_SUB=	SHLIB_MAJOR="${SHLIB_MAJOR}"
-
-.if defined(NOPROFILE)
-PLIST_SUB+=	PROFILE="@comment "
-.else
-PLIST_SUB+=	PROFILE=""
-.endif
+USES=	uidfix
+USE_LDCONFIG=	yes
 
 post-patch:
-	${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.prev
-	@${SED} -e "s=%%SHLIB_MAJOR%%=${SHLIB_MAJOR}=g" \
-		${FILESDIR}/Makefile > ${WRKSRC}/Makefile
-	${REINPLACE_CMD} -i '' -e 's|stdint|sys/types|' \
+	@${CP} ${FILESDIR}/Makefile.bsd ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -i '' -e 's|stdint|sys/types|' \
 		${WRKSRC}/lzx_compress.mdoc3 ${WRKSRC}/lzx_layer.c
-	${MV} ${WRKSRC}/lzx_compress.mdoc3 ${WRKSRC}/lzxcomp.3
+	@${MV} ${WRKSRC}/lzx_compress.mdoc3 ${WRKSRC}/lzxcomp.3
 
 .include <bsd.port.mk>
diff --git a/archivers/liblzxcomp/distinfo b/archivers/liblzxcomp/distinfo
index 9c306bbd9418..af1f418320f3 100644
--- a/archivers/liblzxcomp/distinfo
+++ b/archivers/liblzxcomp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (lzx_compress.tar.gz) = f74078e8cc7675cf0786b5c4c7e1d6dba2f84028aa5726913c9980316b81f5d8
-SIZE (lzx_compress.tar.gz) = 30202
+SHA256 (lzx_compress.tar.gz) = d63f046130677db666d6cec6f4a62349060928ec85b1feaf2fce9222293a95f7
+SIZE (lzx_compress.tar.gz) = 33561
diff --git a/archivers/liblzxcomp/files/Makefile b/archivers/liblzxcomp/files/Makefile.bsd
index 568ef24a7db9..e6ede132552d 100644
--- a/archivers/liblzxcomp/files/Makefile
+++ b/archivers/liblzxcomp/files/Makefile.bsd
@@ -4,10 +4,10 @@ LIB = 	lzxcomp
 SRCS=	lz_nonslide.c lzx_layer.c
 INCS=	lzx_compress.h lzx_constants.h
 
-COPTS= -DLZ_ONEBUFFER -DLAZY -DNONSLIDE
+CFLAGS+= -DLZ_ONEBUFFER -DLAZY -DNONSLIDE
 LDADD= -lm
 
-SHLIB_MAJOR=	%%SHLIB_MAJOR%%
+SHLIB_MAJOR=	1
 
 LIBDIR=		${PREFIX}/lib
 INCLUDEDIR=	${PREFIX}/include
diff --git a/archivers/liblzxcomp/files/patch-lz_nonslide.c b/archivers/liblzxcomp/files/patch-lz_nonslide.c
index 56c1409b3d01..339cb29f2737 100644
--- a/archivers/liblzxcomp/files/patch-lz_nonslide.c
+++ b/archivers/liblzxcomp/files/patch-lz_nonslide.c
@@ -1,6 +1,5 @@
---- lz_nonslide.c.orig	Sun Feb 27 21:08:11 2005
-+++ lz_nonslide.c	Sun Feb 27 21:08:47 2005
-@@ -19,6 +19,7 @@
+Index: lz_nonslide.c
+@@ -19,10 +19,11 @@
  /* 
   * Document here
   */
@@ -8,3 +7,8 @@
  #include <stdio.h>
  #include <stdlib.h>
  #include <assert.h>
+-#include <strings.h>
++#include <string.h>
+ #ifdef DEBUG_PERF
+ #include <sys/time.h>
+ #include <sys/resource.h>
diff --git a/archivers/liblzxcomp/pkg-descr b/archivers/liblzxcomp/pkg-descr
index 8f9b3c7d1977..0beb77a1e934 100644
--- a/archivers/liblzxcomp/pkg-descr
+++ b/archivers/liblzxcomp/pkg-descr
@@ -1,5 +1,4 @@
 LZX compression engine, suitable for creating compressed CHM files.  Or
-for use in a CAB-making utility or for any other purpose LZX is useful
-for.
+for use in a CAB-making utility or for any other purpose LZX is useful for.
 
-WWW: http://www.speakeasy.org/~russotto/chm/
+WWW: http://www.russotto.net/chm/
diff --git a/archivers/liblzxcomp/pkg-plist b/archivers/liblzxcomp/pkg-plist
index 0bc86c03886f..212047ea1889 100644
--- a/archivers/liblzxcomp/pkg-plist
+++ b/archivers/liblzxcomp/pkg-plist
@@ -2,6 +2,5 @@ include/lzx_compress.h
 include/lzx_constants.h
 lib/liblzxcomp.a
 lib/liblzxcomp.so
-lib/liblzxcomp.so.%%SHLIB_MAJOR%%
-%%PROFILE%%lib/liblzxcomp_p.a
+lib/liblzxcomp.so.1
 man/man3/lzxcomp.3.gz