From owner-svn-ports-head@FreeBSD.ORG Thu Sep 25 14:26:53 2014 Return-Path: Delivered-To: svn-ports-head@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 C813CB56; Thu, 25 Sep 2014 14:26:53 +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 B32BC66B; Thu, 25 Sep 2014 14:26:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8PEQrkU002802; Thu, 25 Sep 2014 14:26:53 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8PEQr9O002798; Thu, 25 Sep 2014 14:26:53 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201409251426.s8PEQr9O002798@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Thu, 25 Sep 2014 14:26:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r369258 - in head/french/dico: . 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.18-1 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, 25 Sep 2014 14:26:54 -0000 Author: tijl Date: Thu Sep 25 14:26:52 2014 New Revision: 369258 URL: http://svnweb.freebsd.org/changeset/ports/369258 QAT: https://qat.redports.org/buildarchive/r369258/ Log: Remove patches that added an autotools based build system and instead use do-build and do-install targets Deleted: head/french/dico/files/patch-Makefile.am head/french/dico/files/patch-configure.in head/french/dico/files/patch-lexique-Makefile.am head/french/dico/files/patch-lexique-version.dic head/french/dico/files/patch-manuel-Makefile.am head/french/dico/files/patch-sources-Makefile.am Modified: head/french/dico/Makefile head/french/dico/files/patch-sources-dico.c Modified: head/french/dico/Makefile ============================================================================== --- head/french/dico/Makefile Thu Sep 25 14:18:16 2014 (r369257) +++ head/french/dico/Makefile Thu Sep 25 14:26:52 2014 (r369258) @@ -3,7 +3,7 @@ PORTNAME= dico PORTVERSION= 1.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= french MASTER_SITES= ftp://ftp.supelec.fr/lsi/pub/security/ DISTNAME= le_dico @@ -13,30 +13,27 @@ COMMENT= Interactive dictionary in frenc BROKEN_WWW= http://www.montefiore.ulg.ac.be/cgi-bin-ulg/DICO.html -# Global variables -# - WRKSRC= ${WRKDIR}/${PORTNAME} -USE_AUTOTOOLS= automake14 autoconf -CONFIGURE_ARGS= --mandir=${PREFIX}/man -USES= gmake -AUTOMAKE_ARGS= --add-missing --foreign --include-deps -MAKE_ARGS= prefix=${PREFIX} -REINPLACE_SUB= PREFIX=${PREFIX} - -# Post-patch -# OPTIONS_DEFINE= DOCS -post-patch: - @${REINPLACE_CMD} ${REINPLACE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${WRKSRC}/sources/dico.c +do-build: + (cd ${WRKSRC}/sources && ${CC} ${CFLAGS} ${LDFLAGS} -o dico dico.c) -# Pre-configure -# +do-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/sources/dico ${STAGEDIR}${PREFIX}/bin + ${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/lexique/*.dic ${STAGEDIR}${DATADIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README.TXT ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/manuel/copying.doc ${STAGEDIR}${DOCSDIR} + ${MKDIR} ${STAGEDIR}${MAN1PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/manuel/dico.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 -pre-configure: - @cd ${WRKSRC} && ${ACLOCAL} +post-patch: + @${REINPLACE_CMD} 's,/usr/local,${PREFIX},' \ + ${WRKSRC}/README.TXT ${WRKSRC}/manuel/dico.1 \ + ${WRKSRC}/sources/dico.c .include Modified: head/french/dico/files/patch-sources-dico.c ============================================================================== --- head/french/dico/files/patch-sources-dico.c Thu Sep 25 14:18:16 2014 (r369257) +++ head/french/dico/files/patch-sources-dico.c Thu Sep 25 14:26:52 2014 (r369258) @@ -29,15 +29,6 @@ #ifdef MSDOS /* Systeme d'operation de disque */ #define MYOS "MSDOS" /* Microsoft :-) */ #endif -@@ -49,7 +57,7 @@ - #define ISO_TERM 3 - #define COMMENT_CHAR 35 /* '#' ligne de commentaire */ - --#define DICT_PATH "/usr/local/lib/dico" /* path par defaut unix/dos */ -+#define DICT_PATH "%%PREFIX%%/share/dico" /* path par defaut unix/dos */ - #define DOS_PATH "lexique" /* path par defaut Dos uniquement */ - #define DICT_EXT ".dic" /* extension des fichiers dicos */ - #define VERSION_FILE "version.dic" /* fichier texte version dico */ @@ -58,11 +66,13 @@ #define OK 0 #define MYVBUF 10240 /* pour setvbuf() eventuel */