From owner-svn-ports-head@FreeBSD.ORG Thu Aug 15 09:16:33 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id AE9D373B; Thu, 15 Aug 2013 09:16:33 +0000 (UTC) (envelope-from danfe@FreeBSD.org) 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 9BB0021AC; Thu, 15 Aug 2013 09:16:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7F9GXLi043752; Thu, 15 Aug 2013 09:16:33 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7F9GXr2043748; Thu, 15 Aug 2013 09:16:33 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201308150916.r7F9GXr2043748@svn.freebsd.org> From: Alexey Dokuchaev Date: Thu, 15 Aug 2013 09:16:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r324755 - in head/misc/xtar: . 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-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Aug 2013 09:16:33 -0000 Author: danfe Date: Thu Aug 15 09:16:32 2013 New Revision: 324755 URL: http://svnweb.freebsd.org/changeset/ports/324755 Log: - Do not use imake for the build; use provided Makefile.noimake: this allows to build it with bmake(1) (as well as other implementations) - Unbreak the build against Clang (main() must return int) - Sanitize formatting of the port description while I am here Reported by: marino Modified: head/misc/xtar/Makefile head/misc/xtar/files/patch-ab head/misc/xtar/pkg-descr Modified: head/misc/xtar/Makefile ============================================================================== --- head/misc/xtar/Makefile Thu Aug 15 07:35:19 2013 (r324754) +++ head/misc/xtar/Makefile Thu Aug 15 09:16:32 2013 (r324755) @@ -1,4 +1,4 @@ -# Created by: shanee@augusta.de +# Created by: Andreas Kohout # $FreeBSD$ PORTNAME= xtar @@ -11,11 +11,22 @@ MASTER_SITE_SUBDIR= utilities MAINTAINER= ports@FreeBSD.org COMMENT= View and manipulate contents of a tar file -USES= imake motif +USES= motif USE_XORG= ice sm x11 xext xp xt -MAKE_ARGS= XMLIB="${MOTIFLIB}" +MAKEFILE= Makefile.noimake +ALL_TARGET= ${PORTNAME} +MAKE_ARGS= XINC="-I${LOCALBASE}/include" XMLIB="${MOTIFLIB}" \ + APPDIR="${PREFIX}/lib/X11/app-defaults" \ + BINDIR="${PREFIX}/bin" LIBDIR="${PREFIX}/lib/X11/xtar" \ + MANDIR="${MAN1PREFIX}/man/man1" OPTIMISATION="${CFLAGS}" \ + ANSIFLAG=-ansi CC="${CC}" RANLIB=: + MAN1= xtar.1 PLIST_FILES= bin/xtar lib/X11/xtar/xtar.doc lib/X11/app-defaults/XTar PLIST_DIRS= lib/X11/xtar +post-patch: + @${REINPLACE_CMD} -e 's/pipe\.c/& regexpr.c/' \ + ${WRKSRC}/common/Makefile.noimake + .include Modified: head/misc/xtar/files/patch-ab ============================================================================== --- head/misc/xtar/files/patch-ab Thu Aug 15 07:35:19 2013 (r324754) +++ head/misc/xtar/files/patch-ab Thu Aug 15 09:16:32 2013 (r324755) @@ -1,19 +1,28 @@ -*** xtar.c.orig Wed Jul 31 18:16:22 1996 ---- xtar.c Wed Jul 31 18:15:30 1996 -*************** -*** 1164,1170 **** - static int xtar_attributes(TAR_FILE *tf, char *filename) - { - int retval = 0; -! struct utimbuf utimbuf; - - /* If the file type is not a directory then try and set the access - permissions. We exclude directories because if write permission ---- 1164,1170 ---- - static int xtar_attributes(TAR_FILE *tf, char *filename) - { - int retval = 0; -! struct utimbuf {char utimbuf;} utimbuf; - - /* If the file type is not a directory then try and set the access - permissions. We exclude directories because if write permission +--- xtar.c.orig 1995-07-17 19:44:19.000000000 +0800 ++++ xtar.c 2013-08-15 17:00:58.000000000 +0800 +@@ -33,6 +33,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -408,7 +409,7 @@ + int argc = 1; + char **argv; + #else +-void main(int argc, char *argv[]) ++int main(int argc, char *argv[]) + { + char *mappings; + #endif +@@ -1164,7 +1165,7 @@ + static int xtar_attributes(TAR_FILE *tf, char *filename) + { + int retval = 0; +- struct utimbuf utimbuf; ++ struct utimbuf {char utimbuf;} utimbuf; + + /* If the file type is not a directory then try and set the access + permissions. We exclude directories because if write permission Modified: head/misc/xtar/pkg-descr ============================================================================== --- head/misc/xtar/pkg-descr Thu Aug 15 07:35:19 2013 (r324754) +++ head/misc/xtar/pkg-descr Thu Aug 15 09:16:32 2013 (r324755) @@ -1,4 +1,3 @@ -XTar is a Motif program for viewing and manipulating tar -archives (which may be compressed). The contents of the -archive are displayed in the main window and various -options are available from pulldown and popup menus. +XTar is a Motif program for viewing and manipulating tar archives (which +may be compressed). The contents of the archive are displayed in the main +window and various options are available from pulldown and popup menus.