Attachment #63529 for bug #94732

View | Details | Raw Unified | Return to bug 94732
Collapse All | Expand All




#

PORTNAME=	chmlib
PORTVERSION=	0.37.4
PORTREVISION=	0
CATEGORIES=	misc
MASTER_SITES=	http://66.93.236.84/~jedwin/projects/chmlib/
DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
EXTRACT_SUFX=	.tgz

MAINTAINER=	vsevolod@FreeBSD.org
COMMENT=	A library for dealing with Microsoft ITSS/CHM format files

USE_REINPLACE=	yes
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--disable-io64 --disable-pread --exec-prefix=${PREFIX}
USE_GMAKE=	yes
INSTALLS_SHLIB=	yes
WRKSRC=		${WRKDIR}/${PORTNAME}-0.37

post-patch:
	@${REINPLACE_CMD} -e "s,-lpthread,${PTHREAD_LIBS}," ${WRKSRC}/configure

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (chmlib-0.37.tgz) = 86c2aba79f231b91ff1d9eade9872359	1	MD5 (chmlib-0.37.4.tgz) = 458c14c7a38c441263e6984924a05b24
2	SHA256 (chmlib-0.37.tgz) = e01b7d0194a9b37cd817aaf2315c24773af2a9650fe0d504f42f36fab8353410	2	SHA256 (chmlib-0.37.4.tgz) = 9c6dde31330b77e760600c187c8279f38bc8b7fada8e03bb9cf5cfd9f91d2aab
3	SIZE (chmlib-0.37.tgz) = 363771	3	SIZE (chmlib-0.37.4.tgz) = 363315

Lines 1-3 Link Here

(-)pkg-plist (+2 lines)
1	include/chm_lib.h	1	include/chm_lib.h
		2	lib/libchm.a
		3	lib/libchm.la
2	lib/libchm.so	4	lib/libchm.so
3	lib/libchm.so.0	5	lib/libchm.so.0




--- Makefile.in.orig    Wed Oct 26 16:13:45 2005
+++ Makefile.in Thu Oct 27 21:33:48 2005
@@ -30,7 +31,7 @@
 CFLAGS=@CFLAGS@ @CHM_MT@ @CHM_USE_PREAD@ @CHM_USE_IO64@ @DMALLOC_DISABLE@
 LDFLAGS=@LDFLAGS@
 prefix=@prefix@
+exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 CC=@CC@
@@ -29,17 +29,15 @@
 src/%.lo: $(srcdir)/src/%.c
 	${LIBTOOL} --mode=compile ${CC} -c -o $@ $^ ${CFLAGS}
 
-src/libchm.la: src/chm_lib.lo src/lzx.lo
+src/libchm.la: src/chm_lib.lo src/lzx.lo src/az_chmlib_add.lo
 	${LIBTOOL} --mode=link ${CC} -o $@ $^ ${LDFLAGS} -rpath $(libdir)
 
 install: src/libchm.la
 	chmod a+r src/libchm.la
 	mkdir -p $(prefix)
-	install -m0755 src/libchm.la $(DESTDIR)$(libdir)/
 	install -m0644 $(srcdir)/src/chm_lib.h $(DESTDIR)$(includedir)/
-	install -m0755 src/.libs/libchm.so.0.0.0 $(DESTDIR)$(libdir)/
-	ln -s $(DESTDIR)$(libdir)/libchm.so.0.0.0 $(DESTDIR)$(libdir)/libchm.so
-	ln -s $(DESTDIR)$(libdir)/libchm.so.0.0.0 $(DESTDIR)$(libdir)/libchm.so.0
+	install -m0755 src/.libs/libchm.so.0 $(DESTDIR)$(libdir)/
+	ln -s $(DESTDIR)$(libdir)/libchm.so.0 $(DESTDIR)$(libdir)/libchm.so

 clean:
 	rm -fr src/libchm.la src/*.o src/*.lo .libs src/.libs src/${EXAMPLES}

patch-az_chmlib_add.c
--- /dev/null	Fri Feb 25 18:33:00 2005
+++ src/az_chmlib_add.c	Fri Feb 25 18:29:45 2005




--- ltmain.sh.orig	Fri Oct 22 09:03:41 2004
+++ ltmain.sh	Fri Oct 22 09:03:58 2004
@@ -5550,10 +5550,12 @@
 	fi
 
 	# Install the pseudo-library for information purposes.
+	if /usr/bin/false ; then
 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
 	instname="$dir/$name"i
 	$show "$install_prog $instname $destdir/$name"
 	$run eval "$install_prog $instname $destdir/$name" || exit $?
+	fi
 
 	# Maybe install the static library, too.
 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"

Return to bug 94732

Lines 7-27 Link Here

(-)Makefile (-4 / +2 lines)
7	#	7	#
8		8
9	PORTNAME= chmlib	9	PORTNAME= chmlib
10	PORTVERSION= 0.3.7	10	PORTVERSION= 0.37.4
11	PORTREVISION= 0
12	CATEGORIES= misc	11	CATEGORIES= misc
13	MASTER_SITES= http://66.93.236.84/~jedwin/projects/chmlib/	12	MASTER_SITES= http://66.93.236.84/~jedwin/projects/chmlib/
14	DISTNAME= ${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
15	EXTRACT_SUFX= .tgz	13	EXTRACT_SUFX= .tgz
16		14
17	MAINTAINER= vsevolod@FreeBSD.org	15	MAINTAINER= vsevolod@FreeBSD.org
18	COMMENT= A library for dealing with Microsoft ITSS/CHM format files	16	COMMENT= A library for dealing with Microsoft ITSS/CHM format files
19		17
20	USE_REINPLACE= yes
21	GNU_CONFIGURE= yes	18	GNU_CONFIGURE= yes
22	CONFIGURE_ARGS= --disable-io64 --disable-pread --exec-prefix=${PREFIX}	19	CONFIGURE_ARGS= --disable-io64 --disable-pread --exec-prefix=${PREFIX}
23	USE_GMAKE= yes	20	USE_GMAKE= yes
24	INSTALLS_SHLIB= yes	21	INSTALLS_SHLIB= yes
		22	WRKSRC= ${WRKDIR}/${PORTNAME}-0.37
25		23
26	post-patch:	24	post-patch:
27	@${REINPLACE_CMD} -e "s,-lpthread,${PTHREAD_LIBS}," ${WRKSRC}/configure	25	@${REINPLACE_CMD} -e "s,-lpthread,${PTHREAD_LIBS}," ${WRKSRC}/configure

Lines 1-35 Link Here

(-)files/patch-Makefile.in (-24 / +3 lines)
1	--- Makefile.in.orig Wed Oct 26 16:13:45 2005	1	--- Makefile.in.orig Wed Oct 26 16:13:45 2005
2	+++ Makefile.in Thu Oct 27 21:33:48 2005	2	+++ Makefile.in Thu Oct 27 21:33:48 2005
3	@@ -11,6 +11,7 @@	3	@@ -30,7 +31,7 @@
4	CFLAGS=@CFLAGS@ @CHM_MT@ @CHM_USE_PREAD@ @CHM_USE_IO64@ @DMALLOC_DISABLE@
5	LDFLAGS=@LDFLAGS@
6	prefix=@prefix@
7	+exec_prefix=@exec_prefix@
8	libdir=@libdir@
9	includedir=@includedir@
10	CC=@CC@
11	@@ -29,17 +29,15 @@
12	src/%.lo: $(srcdir)/src/%.c	4	src/%.lo: $(srcdir)/src/%.c
13	${LIBTOOL} --mode=compile ${CC} -c -o $@ $^ ${CFLAGS}	5	${LIBTOOL} --mode=compile ${CC} -c -o $@ $^ ${CFLAGS}
14		6
15	-src/libchm.la: src/chm_lib.lo src/lzx.lo	7	-src/libchm.la: src/chm_lib.lo src/lzx.lo
16	+src/libchm.la: src/chm_lib.lo src/lzx.lo src/az_chmlib_add.lo	8	+src/libchm.la: src/chm_lib.lo src/lzx.lo src/az_chmlib_add.lo
17	${LIBTOOL} --mode=link ${CC} -o $@ $^ ${LDFLAGS} -rpath $(libdir)	9	${LIBTOOL} --mode=link ${CC} -o $@ $^ ${LDFLAGS} -rpath $(libdir)
18		10
19	install: src/libchm.la	11	install: src/libchm.la
20	chmod a+r src/libchm.la
21	mkdir -p $(prefix)
22	- install -m0755 src/libchm.la $(DESTDIR)$(libdir)/
23	install -m0644 $(srcdir)/src/chm_lib.h $(DESTDIR)$(includedir)/
24	- install -m0755 src/.libs/libchm.so.0.0.0 $(DESTDIR)$(libdir)/
25	- ln -s $(DESTDIR)$(libdir)/libchm.so.0.0.0 $(DESTDIR)$(libdir)/libchm.so
26	- ln -s $(DESTDIR)$(libdir)/libchm.so.0.0.0 $(DESTDIR)$(libdir)/libchm.so.0
27	+ install -m0755 src/.libs/libchm.so.0 $(DESTDIR)$(libdir)/
28	+ ln -s $(DESTDIR)$(libdir)/libchm.so.0 $(DESTDIR)$(libdir)/libchm.so
29
30	clean:
31	rm -fr src/libchm.la src/.o src/.lo .libs src/.libs src/${EXAMPLES}
32
33	patch-az_chmlib_add.c	12	patch-az_chmlib_add.c
34	--- /dev/null Fri Feb 25 18:33:00 2005	13	--- /dev/null Fri Feb 25 18:33:00 2005
35	+++ src/az_chmlib_add.c Fri Feb 25 18:29:45 2005	14	+++ src/az_chmlib_add.c Fri Feb 25 18:29:45 2005

Removed Link Here

(-)files/patch-ltmain.sh (-15 lines)
1	--- ltmain.sh.orig Fri Oct 22 09:03:41 2004
2	+++ ltmain.sh Fri Oct 22 09:03:58 2004
3	@@ -5550,10 +5550,12 @@
4	fi
5
6	# Install the pseudo-library for information purposes.
7	+ if /usr/bin/false ; then
8	name=`$echo "X$file" \| $Xsed -e 's%^.*/%%'`
9	instname="$dir/$name"i
10	$show "$install_prog $instname $destdir/$name"
11	$run eval "$install_prog $instname $destdir/$name" \|\| exit $?
12	+ fi
13
14	# Maybe install the static library, too.
15	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"