From owner-svn-ports-all@FreeBSD.ORG Thu May 8 10:54:34 2014 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 29CD53CF; Thu, 8 May 2014 10:54:34 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0B7E8D7B; Thu, 8 May 2014 10:54:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s48AsX52050668; Thu, 8 May 2014 10:54:33 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s48AsWff050661; Thu, 8 May 2014 10:54:32 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201405081054.s48AsWff050661@svn.freebsd.org> From: Pawel Pekala Date: Thu, 8 May 2014 10:54:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r353286 - head/editors/thoteditor/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.18 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: Thu, 08 May 2014 10:54:34 -0000 Author: pawel Date: Thu May 8 10:54:32 2014 New Revision: 353286 URL: http://svnweb.freebsd.org/changeset/ports/353286 QAT: https://qat.redports.org/buildarchive/r353286/ Log: - Add staging support, strip binary files - Respect CFLAGS during build - Use REINPLACE_CMD, SUB_FILES to simplify substitutions - Rename patches to proper names - Break lines around 80 characters Added: head/editors/thoteditor/files/patch-Makefile.in - copied, changed from r350457, head/editors/thoteditor/files/patch-ae head/editors/thoteditor/files/patch-batch-Makefile.in - copied, changed from r350457, head/editors/thoteditor/files/patch-ab head/editors/thoteditor/files/patch-configure - copied unchanged from r350457, head/editors/thoteditor/files/patch-aa head/editors/thoteditor/files/patch-thot-Makefile.in - copied, changed from r350457, head/editors/thoteditor/files/patch-ac head/editors/thoteditor/files/patch-thotlib-base-registry.c - copied, changed from r350457, head/editors/thoteditor/files/patch-ag head/editors/thoteditor/files/patch-tools-Makefile.in - copied unchanged from r350457, head/editors/thoteditor/files/patch-ad head/editors/thoteditor/files/thoteditor.in - copied unchanged from r350457, head/editors/thoteditor/files/thoteditor Deleted: head/editors/thoteditor/files/patch-aa head/editors/thoteditor/files/patch-ab head/editors/thoteditor/files/patch-ac head/editors/thoteditor/files/patch-ad head/editors/thoteditor/files/patch-ae head/editors/thoteditor/files/patch-af head/editors/thoteditor/files/patch-ag head/editors/thoteditor/files/thoteditor Copied and modified: head/editors/thoteditor/files/patch-Makefile.in (from r350457, head/editors/thoteditor/files/patch-ae) ============================================================================== --- head/editors/thoteditor/files/patch-ae Mon Apr 7 10:47:45 2014 (r350457, copy source) +++ head/editors/thoteditor/files/patch-Makefile.in Thu May 8 10:54:32 2014 (r353286) @@ -1,5 +1,5 @@ ---- ../Makefile.in.orig Wed Oct 8 04:13:58 1997 -+++ ../Makefile.in Sun Oct 3 23:44:16 1999 +--- ../Makefile.in.orig 1997-10-08 10:13:58.000000000 +0200 ++++ ../Makefile.in 2014-05-08 10:31:05.418730130 +0200 @@ -17,6 +17,7 @@ SUBDIRS = tools tablelib thotlib batch drawlib indexlib thot amaya @@ -12,8 +12,8 @@ do if test -d $$dir ; then cd $$dir ; \ $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" install ; \ cd .. ; fi ;done ) -+ @(set -x;for file in $(BINS);\ -+ do $(INSTALL_BIN) $$file ${bindir}; done ) ++ (for file in $(BINS);\ ++ do $(BSD_INSTALL_PROGRAM) $$file $(DESTDIR)${bindir}; done ) uninstall : @(for dir in $(SUBDIRS) ;\ Copied and modified: head/editors/thoteditor/files/patch-batch-Makefile.in (from r350457, head/editors/thoteditor/files/patch-ab) ============================================================================== --- head/editors/thoteditor/files/patch-ab Mon Apr 7 10:47:45 2014 (r350457, copy source) +++ head/editors/thoteditor/files/patch-batch-Makefile.in Thu May 8 10:54:32 2014 (r353286) @@ -1,6 +1,6 @@ ---- ../batch/Makefile.in.orig Sat Sep 25 11:11:53 1999 -+++ ../batch/Makefile.in Sat Sep 25 11:26:34 1999 -@@ -202,14 +202,14 @@ +--- ../batch/Makefile.in.orig 1997-11-14 18:09:14.000000000 +0100 ++++ ../batch/Makefile.in 2014-05-08 10:17:15.785699396 +0200 +@@ -202,16 +202,16 @@ $(RM) -f *.o dns_daemon install : all @@ -10,15 +10,18 @@ - @(if test ! -d $(datadir)/thot/applis ; then $(MKDIR) $(datadir)/thot/applis ; fi) - @(if test ! -d $(datadir)/thot/applis/bin ; then $(MKDIR) $(datadir)/thot/applis/bin ; fi) - @(for i in $(COMPILERS) ; do \ -+ @(set -x;if test ! -d $(datadir) ; then $(MKDIR) $(datadir) ; fi) -+ @(set -x;if test ! -d $(datadir)/thot ; then $(MKDIR) $(datadir)/thot ; fi) -+ @(set -x;if test ! -d $(datadir)/thot/batch ; then $(MKDIR) $(datadir)/thot/batch ; fi) -+ @(set -x;if test ! -d $(datadir)/thot/applis ; then $(MKDIR) $(datadir)/thot/applis ; fi) -+ @(set -x;if test ! -d $(datadir)/thot/applis/bin ; then $(MKDIR) $(datadir)/thot/applis/bin ; fi) -+ @(set -x;for i in $(COMPILERS) ; do \ - $(INSTALL_BIN) $$i $(datadir)/thot/applis/bin ; done) -- (for i in $(LANGUAGES) ; do \ -+ @(set -x;for i in $(LANGUAGES) ; do \ +- $(INSTALL_BIN) $$i $(datadir)/thot/applis/bin ; done) ++ (if test ! -d $(DESTDIR)$(datadir) ; then $(MKDIR) $(DESTDIR)$(datadir) ; fi) ++ (if test ! -d $(DESTDIR)$(datadir)/thot ; then $(MKDIR) $(DESTDIR)$(datadir)/thot ; fi) ++ (if test ! -d $(DESTDIR)$(datadir)/thot/batch ; then $(MKDIR) $(DESTDIR)$(datadir)/thot/batch ; fi) ++ (if test ! -d $(DESTDIR)$(datadir)/thot/applis ; then $(MKDIR) $(DESTDIR)$(datadir)/thot/applis ; fi) ++ (if test ! -d $(DESTDIR)$(datadir)/thot/applis/bin ; then $(MKDIR) $(DESTDIR)$(datadir)/thot/applis/bin ; fi) ++ (for i in $(COMPILERS) ; do \ ++ $(BSD_INSTALL_PROGRAM) $$i $(DESTDIR)$(datadir)/thot/applis/bin ; done) + (for i in $(LANGUAGES) ; do \ for file in `$(ECHO) $(THOTDIR)/batch/$$i` ; do \ - $(INSTALL_DATA) $$file $(datadir)/thot/batch ; \ +- $(INSTALL_DATA) $$file $(datadir)/thot/batch ; \ ++ $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/thot/batch ; \ done ; done) + + uninstall : Copied: head/editors/thoteditor/files/patch-configure (from r350457, head/editors/thoteditor/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/thoteditor/files/patch-configure Thu May 8 10:54:32 2014 (r353286, copy of r350457, head/editors/thoteditor/files/patch-aa) @@ -0,0 +1,11 @@ +--- ../configure.orig Fri Sep 24 20:16:20 1999 ++++ ../configure Fri Sep 24 20:17:39 1999 +@@ -5200,7 +5200,7 @@ + esac + fi + fi +- ++MOTIF_LIBRARIES="$(MOTIFLIB)" + + + Copied and modified: head/editors/thoteditor/files/patch-thot-Makefile.in (from r350457, head/editors/thoteditor/files/patch-ac) ============================================================================== --- head/editors/thoteditor/files/patch-ac Mon Apr 7 10:47:45 2014 (r350457, copy source) +++ head/editors/thoteditor/files/patch-thot-Makefile.in Thu May 8 10:54:32 2014 (r353286) @@ -1,11 +1,11 @@ ---- ../thot/Makefile.in.orig Wed Nov 19 05:41:49 1997 -+++ ../thot/Makefile.in Sun Oct 3 23:42:28 1999 +--- ../thot/Makefile.in.orig 1997-11-19 11:41:49.000000000 +0100 ++++ ../thot/Makefile.in 2014-05-08 10:28:49.671753071 +0200 @@ -14,7 +14,7 @@ -I@top_srcdir@/drawlib -I@top_srcdir@/drawlib/f LDFLAGS = @LDFLAGS@ -L../indexlib -L../drawlib -L../tablelib -L../thotlib -L.. LIBS = -lThotIndex -lThotDraw -lThotTable -lThotEditor @IMGLIBS@ \ - $(MOTIF_LIBRARIES) -lXm $(X_LIBS) -lXt -lXext $(X_PRE_LIBS) \ -+ %%MOTIFLIB%% -lXm $(X_LIBS) -lXt -lXext $(X_PRE_LIBS) \ ++ %%MOTIFLIB%% -lXm -lXp -lXm $(X_LIBS) -lXt -lXext $(X_PRE_LIBS) \ -lX11 $(X_EXTRA_LIBS) @LIBS@ @EXTRA_LIBS@ -lm prefix = @prefix@ @@ -17,7 +17,7 @@ en-drawdialogue en-grmdialogue en-inddialogue en-itfdialogue \ en-libdialogue en-printdialogue en-prsdialogue en-strdialogue \ en-thotdialogue en-thotmessage en-thotversion en-transdialogue \ -@@ -54,30 +55,32 @@ +@@ -54,31 +55,33 @@ $(RM) *.o EDITORAPP.c EDITOR.A install : all @@ -31,39 +31,40 @@ - @(if test ! -d $(datadir)/schemas ; then $(MKDIR) $(datadir)/schemas ; fi) - $(INSTALL_BIN) ../bin/thot $(datadir)/thot/applis/bin - $(INSTALL_BIN) ../bin/print $(datadir)/thot/applis/bin -- (for i in $(SCHEMAS) ; do \ -+ @(set -x;if test ! -d $(datadir) ; then $(MKDIR) $(datadir) ; fi) -+ @(set -x;if test ! -d $(datadir)/thot ; then $(MKDIR) $(datadir)/thot ; fi) -+ @(set -x;if test ! -d $(datadir)/thot/config ; then $(MKDIR) $(datadir)/thot/config ; fi) -+ @(set -x;if test ! -d $(datadir)/thot/fonts ; then $(MKDIR) $(datadir)/thot/fonts ; fi) -+ @(set -x;if test ! -d $(datadir)/thot/dicopar ; then $(MKDIR) $(datadir)/thot/dicopar ; fi) -+ @(set -x;if test ! -d $(datadir)/thot/applis ; then $(MKDIR) $(datadir)/thot/applis ; fi) -+ @(set -x;if test ! -d $(datadir)/thot/applis/bin ; then $(MKDIR) $(datadir)/thot/applis/bin ; fi) -+ @(set -x;if test ! -d $(datadir)/thot/schemas ; then $(MKDIR) $(datadir)/thot/schemas ; fi) -+ @$(INSTALL_BIN) ../bin/thot $(datadir)/thot/applis/bin -+ @$(INSTALL_BIN) ../bin/print $(datadir)/thot/applis/bin -+ @$(INSTALL_DATA) EDITOR.h $(THOTDIR)/schemas -+ @$(INSTALL_DATA) ExtCss.h $(THOTDIR)/schemas -+ @(set -x;for i in $(SCHEMAS) ; do \ ++ (if test ! -d $(DESTDIR)$(datadir) ; then $(MKDIR) $(DESTDIR)$(datadir) ; fi) ++ (if test ! -d $(DESTDIR)$(datadir)/thot ; then $(MKDIR) $(DESTDIR)$(datadir)/thot ; fi) ++ (if test ! -d $(DESTDIR)$(datadir)/thot/config ; then $(MKDIR) $(DESTDIR)$(datadir)/thot/config ; fi) ++ (if test ! -d $(DESTDIR)$(datadir)/thot/fonts ; then $(MKDIR) $(DESTDIR)$(datadir)/thot/fonts ; fi) ++ (if test ! -d $(DESTDIR)$(datadir)/thot/dicopar ; then $(MKDIR) $(DESTDIR)$(datadir)/thot/dicopar ; fi) ++ (if test ! -d $(DESTDIR)$(datadir)/thot/applis ; then $(MKDIR) $(DESTDIR)$(datadir)/thot/applis ; fi) ++ (if test ! -d $(DESTDIR)$(datadir)/thot/applis/bin ; then $(MKDIR) $(DESTDIR)$(datadir)/thot/applis/bin ; fi) ++ (if test ! -d $(DESTDIR)$(datadir)/thot/schemas ; then $(MKDIR) $(DESTDIR)$(datadir)/thot/schemas ; fi) ++ $(BSD_INSTALL_PROGRAM) ../bin/thot $(DESTDIR)$(datadir)/thot/applis/bin ++ $(BSD_INSTALL_PROGRAM) ../bin/print $(DESTDIR)$(datadir)/thot/applis/bin ++ $(INSTALL_DATA) EDITOR.h $(DESTDIR)$(datadir)/thot/schemas ++ $(INSTALL_DATA) ExtCss.h $(DESTDIR)$(datadir)/thot/schemas + (for i in $(SCHEMAS) ; do \ for file in `$(ECHO) $(THOTDIR)/schemas/$$i` ; do \ - $(INSTALL_DATA) $$file $(datadir)/thot/schemas ; \ +- $(INSTALL_DATA) $$file $(datadir)/thot/schemas ; \ ++ $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/thot/schemas ; \ done ; done) -- (for i in $(CONFIGFILES) ; do \ + (for i in $(CONFIGFILES) ; do \ - for file in `$(ECHO) $(THOTDIR)/thot/config/$$i` ; do \ -+ @(set -x;for i in $(CONFIGFILES) ; do \ +- $(INSTALL_DATA) $$file $(datadir)/thot/config ; \ + for file in `$(ECHO) $(THOTDIR)/config/$$i` ; do \ - $(INSTALL_DATA) $$file $(datadir)/thot/config ; \ ++ $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/thot/config ; \ done ; done) -- (for i in $(DICOFILES) ; do \ + (for i in $(DICOFILES) ; do \ - for file in `$(ECHO) $(THOTDIR)/thot/dicopar/$$i` ; do \ -+ @(set -x;for i in $(DICOFILES) ; do \ +- $(INSTALL_DATA) $$file $(datadir)/thot/dicopar ; \ + for file in `$(ECHO) $(THOTDIR)/dicopar/$$i` ; do \ - $(INSTALL_DATA) $$file $(datadir)/thot/dicopar ; \ ++ $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/thot/dicopar ; \ done ; done) -- (for i in $(FONTSFILES) ; do \ + (for i in $(FONTSFILES) ; do \ - for file in `$(ECHO) $(THOTDIR)/thot/fonts/$$i` ; do \ -+ @(set -x;for i in $(FONTSFILES) ; do \ +- $(INSTALL_DATA) $$file $(datadir)/thot/fonts ; \ + for file in `$(ECHO) $(THOTDIR)/fonts/$$i` ; do \ - $(INSTALL_DATA) $$file $(datadir)/thot/fonts ; \ ++ $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/thot/fonts ; \ done ; done) + uninstall : Copied and modified: head/editors/thoteditor/files/patch-thotlib-base-registry.c (from r350457, head/editors/thoteditor/files/patch-ag) ============================================================================== --- head/editors/thoteditor/files/patch-ag Mon Apr 7 10:47:45 2014 (r350457, copy source) +++ head/editors/thoteditor/files/patch-thotlib-base-registry.c Thu May 8 10:54:32 2014 (r353286) @@ -23,7 +23,7 @@ strcat (filename, THOT_RC_FILENAME); + if (!TtaFileExist (&filename[0])) + { -+ sprintf(homecmd,"/bin/cp /usr/local/share/thot/config/thot.ini %s%s.thotrc\n",home_dir,DIR_STR); ++ sprintf(homecmd,"/bin/cp %%PREFIX%%/share/thot/config/thot.ini %s%s.thotrc\n",home_dir,DIR_STR); + fprintf(stderr,"Copying system thot.ini into ~/.thotrc.\n"); + system(homecmd); + sprintf(homecmd,"/bin/chmod u+w %s%s.thotrc\n",home_dir,DIR_STR); Copied: head/editors/thoteditor/files/patch-tools-Makefile.in (from r350457, head/editors/thoteditor/files/patch-ad) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/thoteditor/files/patch-tools-Makefile.in Thu May 8 10:54:32 2014 (r353286, copy of r350457, head/editors/thoteditor/files/patch-ad) @@ -0,0 +1,11 @@ +--- ../tools/Makefile.in.orig Fri May 16 10:00:20 1997 ++++ ../tools/Makefile.in Sat Sep 25 12:16:00 1999 +@@ -24,7 +24,7 @@ + cd .. ; fi ;done ) + + install : +- @(for dir in $(SUBDIRS) ;\ ++ @(set -x;for dir in $(SUBDIRS) ;\ + do if test -d $$dir ; then cd $$dir ; \ + $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" install ; \ + cd .. ; fi ;done ) Copied: head/editors/thoteditor/files/thoteditor.in (from r350457, head/editors/thoteditor/files/thoteditor) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/thoteditor/files/thoteditor.in Thu May 8 10:54:32 2014 (r353286, copy of r350457, head/editors/thoteditor/files/thoteditor) @@ -0,0 +1,4 @@ +#!/bin/sh +THOTDIR=%%PREFIX%%/share/thot +export THOTDIR +exec %%PREFIX%%/bin/thot