svn commit: r369258 - in head/french/dico: . files

[Tijl Coosemans]

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 <bsd.port.mk>

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         */