From owner-svn-ports-all@FreeBSD.ORG Sat Dec 28 04:37:39 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9B25D14D; Sat, 28 Dec 2013 04:37:39 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 865A21FD3; Sat, 28 Dec 2013 04:37:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBS4bd5D095303; Sat, 28 Dec 2013 04:37:39 GMT (envelope-from db@svn.freebsd.org) Received: (from db@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBS4bcne095300; Sat, 28 Dec 2013 04:37:38 GMT (envelope-from db@svn.freebsd.org) Message-Id: <201312280437.rBS4bcne095300@svn.freebsd.org> From: Diane Bruce Date: Sat, 28 Dec 2013 04:37:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r337831 - in head/comms/qrq: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Dec 2013 04:37:39 -0000 Author: db Date: Sat Dec 28 04:37:38 2013 New Revision: 337831 URL: http://svnweb.freebsd.org/changeset/ports/337831 Log: - convert to use stage Modified: head/comms/qrq/Makefile head/comms/qrq/files/patch-Makefile head/comms/qrq/pkg-plist Modified: head/comms/qrq/Makefile ============================================================================== --- head/comms/qrq/Makefile Sat Dec 28 04:28:50 2013 (r337830) +++ head/comms/qrq/Makefile Sat Dec 28 04:37:38 2013 (r337831) @@ -12,16 +12,13 @@ COMMENT= Morse telegraphy trainer simila LICENSE= GPLv2 -MAN1= qrq.1 - USE_GMAKE= yes -NO_STAGE= yes post-patch: - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ + @${REINPLACE_CMD} -e 's|%%PREFIX%%|${STAGEDIR}${PREFIX}|g' \ -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g' ${WRKSRC}/Makefile post-install: - ${INSTALL_DATA} ${WRKSRC}/qrq.png ${DATADIR}/qrq.png + ${INSTALL_DATA} ${WRKSRC}/qrq.png ${STAGEDIR}${DATADIR}/qrq.png .include Modified: head/comms/qrq/files/patch-Makefile ============================================================================== --- head/comms/qrq/files/patch-Makefile Sat Dec 28 04:28:50 2013 (r337830) +++ head/comms/qrq/files/patch-Makefile Sat Dec 28 04:37:38 2013 (r337831) @@ -1,11 +1,11 @@ ---- Makefile.bak 2013-01-07 23:13:28.000000000 -0600 -+++ Makefile 2013-01-07 23:14:17.000000000 -0600 +--- Makefile.orig 2013-01-06 09:14:09.000000000 -0500 ++++ Makefile 2013-12-27 23:29:30.000000000 -0500 @@ -1,14 +1,14 @@ # qrq Makefile -- Fabian Kurz, DJ1YFK -- http://fkurz.net/ham/qrq.html VERSION=0.3.1 -DESTDIR?=/usr -+DESTDIR?=%%PREFIX%% ++DSTDIR=%%PREFIX%% # set to YES if you want to use Core Audio # note that you must use Core Audio for OSX @@ -17,26 +17,86 @@ # set to YES if you compile with MINGW32 USE_WIN32=NO -@@ -26,7 +26,7 @@ +@@ -25,8 +25,7 @@ + OSX_BUNDLE=NO endif - CFLAGS:=$(CFLAGS) -D DESTDIR=\"$(DESTDIR)\" -D VERSION=\"$(VERSION)\" -I. +-CFLAGS:=$(CFLAGS) -D DESTDIR=\"$(DESTDIR)\" -D VERSION=\"$(VERSION)\" -I. -CC=gcc -+CC?=gcc ++CFLAGS:=$(CFLAGS) -D DESTDIR=\"$(DSTDIR)\" -D VERSION=\"$(VERSION)\" -I. ifeq ($(USE_CA), YES) OBJECTS=qrq.o coreaudio.o -@@ -96,11 +96,11 @@ +@@ -95,44 +94,44 @@ + else install: qrq - install -d -v $(DESTDIR)/share/qrq/ +- install -d -v $(DESTDIR)/share/qrq/ - install -d -v $(DESTDIR)/share/man/man1/ -+ install -d -v $(DESTDIR)/man/man1/ - install -d -v $(DESTDIR)/bin/ - install -s -m 0755 qrq $(DESTDIR)/bin/ - install -m 0755 qrqscore $(DESTDIR)/bin/ +- install -d -v $(DESTDIR)/bin/ +- install -s -m 0755 qrq $(DESTDIR)/bin/ +- install -m 0755 qrqscore $(DESTDIR)/bin/ - install -m 0644 qrq.1 $(DESTDIR)/share/man/man1/ -+ install -m 0644 qrq.1 $(DESTDIR)/man/man1/ - install -m 0644 callbase.qcb $(DESTDIR)/share/qrq/ - install -m 0644 english.qcb $(DESTDIR)/share/qrq/ - install -m 0644 qrqrc $(DESTDIR)/share/qrq/ +- install -m 0644 callbase.qcb $(DESTDIR)/share/qrq/ +- install -m 0644 english.qcb $(DESTDIR)/share/qrq/ +- install -m 0644 qrqrc $(DESTDIR)/share/qrq/ +- install -m 0644 toplist $(DESTDIR)/share/qrq/ ++ install -d -v $(DSTDIR)/share/qrq/ ++ install -d -v $(DSTDIR)/share/man/man1/ ++ install -d -v $(DSTDIR)/bin/ ++ install -s -m 0755 qrq $(DSTDIR)/bin/ ++ install -m 0755 qrqscore $(DSTDIR)/bin/ ++ install -m 0644 qrq.1 $(DSTDIR)/man/man1/ ++ install -m 0644 callbase.qcb $(DSTDIR)/share/qrq/ ++ install -m 0644 english.qcb $(DSTDIR)/share/qrq/ ++ install -m 0644 qrqrc $(DSTDIR)/share/qrq/ ++ install -m 0644 toplist $(DSTDIR)/share/qrq/ + + + uninstall: +- rm -f $(DESTDIR)/bin/qrq +- rm -f $(DESTDIR)/bin/qrqscore +- rm -f $(DESTDIR)/share/man/man1/qrq.1 +- rm -f $(DESTDIR)/share/qrq/callbase.qcb +- rm -f $(DESTDIR)/share/qrq/english.qcb +- rm -f $(DESTDIR)/share/qrq/qrqrc +- rm -f $(DESTDIR)/share/qrq/toplist +- rmdir $(DESTDIR)/share/qrq/ ++ rm -f $(DSTDIR)/bin/qrq ++ rm -f $(DSTDIR)/bin/qrqscore ++ rm -f $(DSTDIR)/man/man1/qrq.1 ++ rm -f $(DSTDIR)/share/qrq/callbase.qcb ++ rm -f $(DSTDIR)/share/qrq/english.qcb ++ rm -f $(DSTDIR)/share/qrq/qrqrc ++ rm -f $(DSTDIR)/share/qrq/toplist ++ rmdir $(DSTDIR)/share/qrq/ + + endif + + package: qrq + export CODESIGN_ALLOCATE=/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/codesign_allocate; ldid -s qrq + rm -rf qrq-pkg +- install -d -v qrq-pkg/$(DESTDIR)/share/qrq/ +- install -d -v qrq-pkg/$(DESTDIR)/share/man/man1/ +- install -d -v qrq-pkg/$(DESTDIR)/bin/ ++ install -d -v qrq-pkg/$(DSTDIR)/share/qrq/ ++ install -d -v qrq-pkg/$(DSTDIR)/share/man/man1/ ++ install -d -v qrq-pkg/$(DSTDIR)/bin/ + install -d -v qrq-pkg/DEBIAN/ +- install -s -m 0755 qrq qrq-pkg/$(DESTDIR)/bin/ +- install -m 0755 qrqscore qrq-pkg/$(DESTDIR)/bin/ +- install -m 0644 qrq.1 qrq-pkg/$(DESTDIR)/share/man/man1/ +- install -m 0644 callbase.qcb qrq-pkg/$(DESTDIR)/share/qrq/ +- install -m 0644 english.qcb qrq-pkg/$(DESTDIR)/share/qrq/ +- install -m 0644 qrqrc qrq-pkg/$(DESTDIR)/share/qrq/ +- install -m 0644 toplist qrq-pkg/$(DESTDIR)/share/qrq/ ++ install -s -m 0755 qrq qrq-pkg/$(DSTDIR)/bin/ ++ install -m 0755 qrqscore qrq-pkg/$(DSTDIR)/bin/ ++ install -m 0644 qrq.1 qrq-pkg/$(DSTDIR)/share/man/man1/ ++ install -m 0644 callbase.qcb qrq-pkg/$(DSTDIR)/share/qrq/ ++ install -m 0644 english.qcb qrq-pkg/$(DSTDIR)/share/qrq/ ++ install -m 0644 qrqrc qrq-pkg/$(DSTDIR)/share/qrq/ ++ install -m 0644 toplist qrq-pkg/$(DSTDIR)/share/qrq/ + install -m 0644 control qrq-pkg/DEBIAN/ + export COPYFILE_DISABLE=1; export COPY_EXTENDED_ATTRIBUTES_DISABLE=1; dpkg-deb -b qrq-pkg cydiastore_com.kb1ooo.qrq_v$(shell grep ^Version: control | cut -d ' ' -f 2).deb + $(SCP) cydiastore_com.kb1ooo.qrq_v$(shell grep ^Version: control | cut -d ' ' -f 2).deb $(IPHONE_HOST):/tmp Modified: head/comms/qrq/pkg-plist ============================================================================== --- head/comms/qrq/pkg-plist Sat Dec 28 04:28:50 2013 (r337830) +++ head/comms/qrq/pkg-plist Sat Dec 28 04:37:38 2013 (r337831) @@ -1,5 +1,6 @@ bin/qrq bin/qrqscore +man/man1/qrq.1.gz %%DATADIR%%/callbase.qcb %%DATADIR%%/english.qcb %%DATADIR%%/qrqrc