Date: Mon, 31 Dec 2012 00:49:01 +0800 (CST) From: Po-Chien Lin <linpc@cs.nctu.edu.tw> To: FreeBSD-gnats-submit@FreeBSD.org Cc: delgod@portaone.com Subject: ports/174836: [PATCH] sysutils/isomd5sum: update to 1.0.7 Message-ID: <20121230164901.C9D82CF001@tbbs2.cs.nctu.edu.tw> Resent-Message-ID: <201212301650.qBUGo1kx008028@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 174836 >Category: ports >Synopsis: [PATCH] sysutils/isomd5sum: update to 1.0.7 >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: Sun Dec 30 16:50:01 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Po-Chien Lin >Release: FreeBSD 10.0-CURRENT amd64 >Organization: >Environment: System: FreeBSD tbbs2.cs.nctu.edu.tw 10.0-CURRENT FreeBSD 10.0-CURRENT #7 r244683: Wed Dec 26 09:38:31 CST >Description: - Update to 1.0.7 - Add USE_GCC variable to prevent build with clang - Add LICENSE - Alter the ordering in pkg-plist >How-To-Repeat: >Fix: --- isomd5sum-1.0.7.patch begins here --- diff -ruN --exclude=CVS /usr/ports/sysutils/isomd5sum/Makefile ./Makefile --- /usr/ports/sysutils/isomd5sum/Makefile 2012-11-17 14:01:35.000000000 +0800 +++ ./Makefile 2012-12-31 00:43:25.000000000 +0800 @@ -1,24 +1,22 @@ -# New ports collection makefile for: isomd5sum -# Date created: June 17, 2008 -# Whom: Marzhan Mykola <delgod@portaone.com> -# +# Created by: Marzhan Mykola <delgod@portaone.com> # $FreeBSD: ports/sysutils/isomd5sum/Makefile,v 1.3 2012/11/17 06:01:35 svnexp Exp $ -# PORTNAME= isomd5sum -PORTVERSION= 1.0.4 -PORTREVISION= 1 +PORTVERSION= 1.0.7 CATEGORIES= sysutils MASTER_SITES= https://fedorahosted.org/releases/i/s/isomd5sum/ MAINTAINER= delgod@portaone.com COMMENT= Implanting and checking checksums within an ISO9660 image +LICENSE= GPLv2 + LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt USE_GMAKE= yes USE_BZIP2= yes USE_PYTHON= yes +USE_GCC= 4.2+ MAN1= implantisomd5.1 checkisomd5.1 diff -ruN --exclude=CVS /usr/ports/sysutils/isomd5sum/distinfo ./distinfo --- /usr/ports/sysutils/isomd5sum/distinfo 2011-03-19 20:32:38.000000000 +0800 +++ ./distinfo 2012-12-30 23:48:24.000000000 +0800 @@ -1,2 +1,2 @@ -SHA256 (isomd5sum-1.0.4.tar.bz2) = 7c113eeac39026deec395195aad10566c6f0ce97a63844f8bc023313fce53621 -SIZE (isomd5sum-1.0.4.tar.bz2) = 18486 +SHA256 (isomd5sum-1.0.7.tar.bz2) = 2aee6c354a7d78298f72e55c6cd7b317414ab334e355d37badf636ecacfb7ee8 +SIZE (isomd5sum-1.0.7.tar.bz2) = 17903 diff -ruN --exclude=CVS /usr/ports/sysutils/isomd5sum/files/patch-Makefile ./files/patch-Makefile --- /usr/ports/sysutils/isomd5sum/files/patch-Makefile 2008-07-05 19:59:08.000000000 +0800 +++ ./files/patch-Makefile 2012-12-31 00:37:30.000000000 +0800 @@ -1,15 +1,17 @@ ---- ./Makefile.orig 2008-02-08 04:30:07.000000000 +0000 -+++ ./Makefile 2008-06-17 17:07:37.000000000 +0000 -@@ -1,14 +1,14 @@ +--- Makefile.orig 2012-12-31 00:06:15.000000000 +0800 ++++ Makefile 2012-12-31 00:21:36.000000000 +0800 +@@ -1,16 +1,16 @@ PYVER := $(shell python -c 'import sys; print sys.version[0:3]') PYTHON = python$(PYVER) -PYTHONINCLUDE = /usr/include/$(PYTHON) +PYTHONINCLUDE = ${PYTHON_INCLUDEDIR} --ifneq (,$(filter ppc64 x86_64 s390x,$(shell uname -m))) + VERSION=1.0.7 + +-ifneq (,$(filter sparc64 ppc64 x86_64 s390x,$(shell uname -m))) -LIBDIR = lib64 -else -+#ifneq (,$(filter ppc64 x86_64 s390x,$(shell uname -m))) ++#ifneq (,$(filter sparc64 ppc64 x86_64 s390x,$(shell uname -m))) +#LIBDIR = lib64 +#else LIBDIR = lib @@ -21,38 +23,42 @@ OBJECTS = md5.o libimplantisomd5.o checkisomd5.o implantisomd5 SOURCES = $(patsubst %.o,%.c,$(OBJECTS)) -@@ -35,21 +35,21 @@ - $(CC) -shared -g -o pyisomd5sum.so -fpic $(PYOBJS) $(LDFLAGS) +@@ -39,24 +39,24 @@ + install: all install-bin install-python install-devel + + install-bin: +- install -d -m 0755 $(DESTDIR)/usr/bin +- install -d -m 0755 $(DESTDIR)/usr/share/man/man1 +- install -m 0755 implantisomd5 $(DESTDIR)/usr/bin +- install -m 0755 checkisomd5 $(DESTDIR)/usr/bin +- install -m 0644 implantisomd5.1 $(DESTDIR)/usr/share/man/man1 +- install -m 0644 checkisomd5.1 $(DESTDIR)/usr/share/man/man1 ++ install -d -m 0755 $(PREFIX)/bin ++ install -d -m 0755 $(PREFIX)/man/man1 ++ install -s -o root -g wheel -m 555 implantisomd5 $(PREFIX)/bin ++ install -s -o root -g wheel -m 555 checkisomd5 $(PREFIX)/bin ++ install -o root -g wheel -m 444 implantisomd5.1 $(PREFIX)/man/man1 ++ install -o root -g wheel -m 444 checkisomd5.1 $(PREFIX)/man/man1 + + install-python: +- install -d -m 0755 $(DESTDIR)/usr/$(LIBDIR)/$(PYTHON)/site-packages +- install -m 0755 pyisomd5sum.so $(DESTDIR)/usr/$(LIBDIR)/$(PYTHON)/site-packages ++ install -d -m 0755 $(PYTHONPREFIX_SITELIBDIR) ++ install -s -o root -g wheel -m 444 pyisomd5sum.so $(PYTHONPREFIX_SITELIBDIR) - install: all -- mkdir -p $(DESTDIR)/usr/$(LIBDIR)/$(PYTHON)/site-packages -- mkdir -p $(DESTDIR)/usr/include -- mkdir -p $(DESTDIR)/usr/bin -- mkdir -p $(DESTDIR)/usr/share/man/man1 -- install -m 755 implantisomd5 $(DESTDIR)/usr/bin -- install -m 755 checkisomd5 $(DESTDIR)/usr/bin -- install -m 755 implantisomd5.1 $(DESTDIR)/usr/share/man/man1 -- install -m 755 checkisomd5.1 $(DESTDIR)/usr/share/man/man1 -- install -m 755 pyisomd5sum.so $(DESTDIR)/usr/$(LIBDIR)/$(PYTHON)/site-packages -+ mkdir -p $(PYTHONPREFIX_SITELIBDIR) -+ mkdir -p $(PREFIX)/include -+ mkdir -p $(PREFIX)/bin -+ mkdir -p $(PREFIX)/man/man1 -+ install -m 755 implantisomd5 $(PREFIX)/bin -+ install -m 755 checkisomd5 $(PREFIX)/bin -+ install -m 755 implantisomd5.1 $(PREFIX)/man/man1 -+ install -m 755 checkisomd5.1 $(PREFIX)/man/man1 -+ install -m 755 pyisomd5sum.so $(PYTHONPREFIX_SITELIBDIR) - # ln -s ../../bin/implantisomd5 $(DESTDIR)/usr/lib/anaconda-runtime/implantisomd5 - # ln -s ../../bin/checkisomd5 $(DESTDIR)/usr/lib/anaconda-runtime/checkisomd5 -- install -m 644 libimplantisomd5.h $(DESTDIR)/usr/include/ -- install -m 644 libcheckisomd5.h $(DESTDIR)/usr/include/ -- install -m 644 libimplantisomd5.a $(DESTDIR)/usr/$(LIBDIR) -- install -m 644 libcheckisomd5.a $(DESTDIR)/usr/$(LIBDIR) -+ install -m 644 libimplantisomd5.h $(PREFIX)/include/ -+ install -m 644 libcheckisomd5.h $(PREFIX)/include/ -+ install -m 644 libimplantisomd5.a $(PREFIX)/$(LIBDIR) -+ install -m 644 libcheckisomd5.a $(PREFIX)/$(LIBDIR) + install-devel: +- install -d -m 0755 $(DESTDIR)/usr/include +- install -d -m 0755 $(DESTDIR)/usr/$(LIBDIR) +- install -m 0644 libimplantisomd5.h $(DESTDIR)/usr/include/ +- install -m 0644 libcheckisomd5.h $(DESTDIR)/usr/include/ +- install -m 0644 libimplantisomd5.a $(DESTDIR)/usr/$(LIBDIR) +- install -m 0644 libcheckisomd5.a $(DESTDIR)/usr/$(LIBDIR) ++ install -d -m 0755 $(PREFIX)/include ++ install -d -m 0755 $(PREFIX)/$(LIBDIR) ++ install -o root -g wheel -m 444 libimplantisomd5.h $(PREFIX)/include/ ++ install -o root -g wheel -m 444 libcheckisomd5.h $(PREFIX)/include/ ++ install -s -o root -g wheel -m 444 libimplantisomd5.a $(PREFIX)/$(LIBDIR) ++ install -s -o root -g wheel -m 444 libcheckisomd5.a $(PREFIX)/$(LIBDIR) clean: rm -f *.o *.so *.pyc *.a .depend *~ diff -ruN --exclude=CVS /usr/ports/sysutils/isomd5sum/pkg-plist ./pkg-plist --- /usr/ports/sysutils/isomd5sum/pkg-plist 2009-06-09 06:30:53.000000000 +0800 +++ ./pkg-plist 2012-12-31 00:38:32.000000000 +0800 @@ -1,7 +1,7 @@ -bin/implantisomd5 bin/checkisomd5 -include/libimplantisomd5.h +bin/implantisomd5 include/libcheckisomd5.h -lib/libimplantisomd5.a +include/libimplantisomd5.h lib/libcheckisomd5.a +lib/libimplantisomd5.a %%PYTHON_SITELIBDIR%%/pyisomd5sum.so --- isomd5sum-1.0.7.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20121230164901.C9D82CF001>