Date: Mon, 20 Mar 2006 14:07:18 +0100 (CET) From: Pav Lucistnik <pav@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/94732: Update misc/chmlib to 0.37.4 Message-ID: <200603201307.k2KD7IRd039538@ikaros.oook.cz> Resent-Message-ID: <200603201310.k2KDALdn094201@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 94732 >Category: ports >Synopsis: Update misc/chmlib to 0.37.4 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Mar 20 13:10:21 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Pav Lucistnik >Release: FreeBSD 6.1-PRERELEASE amd64 >Organization: >Environment: System: FreeBSD ikaros.oook.cz 6.1-PRERELEASE FreeBSD 6.1-PRERELEASE #6: Sat Mar 18 13:37:55 CET 2006 root@ikaros.oook.cz:/usr/obj/usr/src/sys/USBDEBUG amd64 >Description: Update chmlib to 0.37.4 Drop libtool hackery which is no needed anymore >How-To-Repeat: >Fix: --- chmlib.diff begins here --- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/misc/chmlib/Makefile,v retrieving revision 1.14 diff -a -u -r1.14 Makefile --- Makefile 27 Oct 2005 17:47:33 -0000 1.14 +++ Makefile 20 Mar 2006 13:02:13 -0000 @@ -7,21 +7,19 @@ # PORTNAME= chmlib -PORTVERSION= 0.3.7 -PORTREVISION= 0 +PORTVERSION= 0.37.4 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 Index: distinfo =================================================================== RCS file: /home/pcvs/ports/misc/chmlib/distinfo,v retrieving revision 1.6 diff -a -u -r1.6 distinfo --- distinfo 22 Jan 2006 12:59:12 -0000 1.6 +++ distinfo 20 Mar 2006 13:02:13 -0000 @@ -1,3 +1,3 @@ -MD5 (chmlib-0.37.tgz) = 86c2aba79f231b91ff1d9eade9872359 -SHA256 (chmlib-0.37.tgz) = e01b7d0194a9b37cd817aaf2315c24773af2a9650fe0d504f42f36fab8353410 -SIZE (chmlib-0.37.tgz) = 363771 +MD5 (chmlib-0.37.4.tgz) = 458c14c7a38c441263e6984924a05b24 +SHA256 (chmlib-0.37.4.tgz) = 9c6dde31330b77e760600c187c8279f38bc8b7fada8e03bb9cf5cfd9f91d2aab +SIZE (chmlib-0.37.4.tgz) = 363315 Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/misc/chmlib/pkg-plist,v retrieving revision 1.3 diff -a -u -r1.3 pkg-plist --- pkg-plist 29 Oct 2005 10:34:19 -0000 1.3 +++ pkg-plist 20 Mar 2006 13:02:13 -0000 @@ -1,3 +1,5 @@ include/chm_lib.h +lib/libchm.a +lib/libchm.la lib/libchm.so lib/libchm.so.0 Index: files/patch-Makefile.in =================================================================== RCS file: /home/pcvs/ports/misc/chmlib/files/patch-Makefile.in,v retrieving revision 1.2 diff -a -u -r1.2 patch-Makefile.in --- files/patch-Makefile.in 27 Oct 2005 17:47:33 -0000 1.2 +++ files/patch-Makefile.in 20 Mar 2006 13:02:13 -0000 @@ -1,35 +1,14 @@ --- Makefile.in.orig Wed Oct 26 16:13:45 2005 +++ Makefile.in Thu Oct 27 21:33:48 2005 -@@ -11,6 +11,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 @@ +@@ -30,7 +31,7 @@ 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 Index: files/patch-ltmain.sh =================================================================== RCS file: files/patch-ltmain.sh diff -N files/patch-ltmain.sh --- files/patch-ltmain.sh 22 Oct 2004 01:09:20 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,15 +0,0 @@ ---- 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" --- chmlib.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200603201307.k2KD7IRd039538>