Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 19 Dec 2005 17:35:15 +0200
From:      "Ion-Mihai "IOnut" Tetcu" <itetcu@people.tecnik93.com>
To:        "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org>
Subject:   ports/90651: [MAINTAINER] misc/fortune-mod-culmea-culmilor: update
Message-ID:  <1135006515.0@it.buh.tecnik93.com>
Resent-Message-ID: <200512191540.jBJFe3Ho033109@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         90651
>Category:       ports
>Synopsis:       [MAINTAINER] misc/fortune-mod-culmea-culmilor: update
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Dec 19 15:40:02 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Ion-Mihai "IOnut" Tetcu
>Release:        FreeBSD 6.0-STABLE i386
>Organization:
Tecnik'93 
>Environment:


System: FreeBSD 6.0-STABLE #5: Thu Dec  1 02:08:55 EET 2005


>Description:


Let's try again:

Update to include "-o" file.

Move common fortune ports code in Makefile.fortune.
Make -o files code actually work.
Make fortune fiels with comments work.
Drop pkg-message but show where the fortune file is installed.

Future plans:
- add other .ro fortunes ports
- write a send-fortune tool.


>How-To-Repeat:





>Fix:


--- fortune-mod-culmea-culmilor-2005.11.18_to_2005.12.15.diff begins here ---
diff -urN fortune-mod-culmea-culmilor_FPT/Makefile fortune-mod-culmea-culmilor/Makefile
--- fortune-mod-culmea-culmilor_FPT/Makefile	Fri Nov 25 04:47:47 2005
+++ fortune-mod-culmea-culmilor/Makefile	Thu Dec 15 19:48:02 2005
@@ -3,47 +3,16 @@
 # Whom:                Ion-Mihai "IOnut" Tetcu <itetcu@people.tecnik93.com>
 #
 # $FreeBSD: ports/misc/fortune-mod-culmea-culmilor/Makefile,v 1.1 2005/11/25 02:47:47 edwin Exp $
-# $Id: Makefile,v 1.9 2005/11/19 20:35:11 itetcu Rel $
+# $Tecnik: ports/misc/fortune-mod-culmea-culmilor/Makefile,v 1.3 2005/12/15 17:48:02 itetcu Exp $
 #
 
 PORTNAME=	fortune-mod-culmea-culmilor
-PORTVERSION=	2005.11.18
+PORTVERSION=	2005.12.15
 CATEGORIES=	misc 	# should / will (also) be romanian
 MASTER_SITES=	http://people.tecnik93.com/~itetcu/FreeBSD/ports/${PORTNAME}/sources/
 
 MAINTAINER=	itetcu@people.tecnik93.com
 COMMENT=	Romanian "Culmea culmilor" jokes (in romanian)
 
-NO_WRKSUBDIR=	yes
-
-_STRFILE=	/usr/games/strfile
-_FORTUNE_DIR=	share/games/fortune
-FORTUNE_DIR?=	${PREFIX}/${_FORTUNE_DIR}
-FORTUNE_FILE=	${PORTNAME:S/fortune-mod-//}
-FORTUNE_FILE_O=	${FORTUNE_FILE}-o
-
-PLIST_FILES=	${_FORTUNE_DIR}/${FORTUNE_FILE} ${_FORTUNE_DIR}/${FORTUNE_FILE}.dat
-.if exists(${WRKSRC}/${PORTNAME}-o)
-PLIST_FILES+=	${_FORTUNE_DIR}/${FORTUNE_FILE_O} ${_FORTUNE_DIR}/${FORTUNE_FILE_O}.dat
-.endif
-
-SUB_FILES+=	pkg-message
-SUB_LIST+=	FORTUNE_DIR=${FORTUNE_DIR} FORTUNE_FILE=${FORTUNE_FILE}
-
-do-build:
-	cd ${WRKSRC} && ${_STRFILE} ${PORTNAME}
-.	if exists(${WRKSRC}/${PORTNAME}-o)
-		cd ${WRKSRC} && ${_STRFILE} ${PORTNAME}-o
-.	endif
-
-do-install:
-	@${MKDIR} ${FORTUNE_DIR}
-	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME} ${FORTUNE_DIR}/${FORTUNE_FILE}
-	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.dat ${FORTUNE_DIR}/${FORTUNE_FILE}.dat
-.	if exists(${WRKSRC}/${PORTNAME}-o)
-		@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-o ${FORTUNE_DIR}/${FORTUNE_FILE_O}
-		@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-o.dat {FORTUNE_DIR}/${FORTUNE_FILE_O}.dat
-.	endif
-	@${CAT} ${PKGMESSAGE}
-
+.include "${.CURDIR}/../../misc/fortune-mod-culmea-culmilor/Makefile.fortune"
 .include <bsd.port.mk>
diff -urN fortune-mod-culmea-culmilor_FPT/Makefile.fortune fortune-mod-culmea-culmilor/Makefile.fortune
--- fortune-mod-culmea-culmilor_FPT/Makefile.fortune	Thu Jan  1 02:00:00 1970
+++ fortune-mod-culmea-culmilor/Makefile.fortune	Mon Dec 19 17:30:38 2005
@@ -0,0 +1,31 @@
+# $Tecnik: ports/misc/fortune-mod-culmea-culmilor/Makefile.fortune,v 1.6 2005/12/19 15:30:38 itetcu Exp $
+
+NO_WRKSUBDIR=	yes
+
+_STRFILE=		/usr/games/strfile
+_STRFILE_ARGS?=		-C
+_FORTUNE_DIR=		share/games/fortune
+FORTUNE_DIR?=		${PREFIX}/${_FORTUNE_DIR}
+FORTUNE_FILE=		${PORTNAME:S/fortune-mod-//}
+FORTUNE_FILE_O=		${FORTUNE_FILE}-o
+
+PLIST_FILES+=	${_FORTUNE_DIR}/${FORTUNE_FILE} ${_FORTUNE_DIR}/${FORTUNE_FILE}.dat
+
+do-build:
+	@cd ${WRKSRC} && ${_STRFILE} ${_STRFILE_ARGS} ${PORTNAME}
+	@if [ -f ${WRKSRC}/${PORTNAME}-o ]; then \
+		cd ${WRKSRC} && ${_STRFILE} ${_STRFILE_ARGS} ${PORTNAME}-o; \
+	fi
+do-install:
+	@${MKDIR} ${FORTUNE_DIR}
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME} ${FORTUNE_DIR}/${FORTUNE_FILE}
+	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.dat ${FORTUNE_DIR}/${FORTUNE_FILE}.dat
+	@if [ -f ${WRKSRC}/${PORTNAME}-o ]; then \
+		${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-o ${FORTUNE_DIR}/${FORTUNE_FILE_O}; \
+		${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-o.dat ${FORTUNE_DIR}/${FORTUNE_FILE_O}.dat; \
+	fi
+post-install:
+	@if [ -f ${WRKSRC}/${PORTNAME}-o ]; then \
+		${ECHO_CMD} ${_FORTUNE_DIR}/${FORTUNE_FILE_O} >> ${TMPPLIST}; \
+		${ECHO_CMD} ${_FORTUNE_DIR}/${FORTUNE_FILE_O}.dat >> ${TMPPLIST}; \
+	fi
diff -urN fortune-mod-culmea-culmilor_FPT/distinfo fortune-mod-culmea-culmilor/distinfo
--- fortune-mod-culmea-culmilor_FPT/distinfo	Fri Nov 25 04:47:47 2005
+++ fortune-mod-culmea-culmilor/distinfo	Fri Dec 16 03:03:02 2005
@@ -1,3 +1,3 @@
-MD5 (fortune-mod-culmea-culmilor-2005.11.18.tar.gz) = 131e16dd2e90f10fca8df8657edbd7df
-SHA256 (fortune-mod-culmea-culmilor-2005.11.18.tar.gz) = a6579aee9bad4948ed98c9e99728cca5f769485f1859a9658c707bed4f7221e3
-SIZE (fortune-mod-culmea-culmilor-2005.11.18.tar.gz) = 8192
+MD5 (fortune-mod-culmea-culmilor-2005.12.15.tar.gz) = 1464b19b4ff35471e296c3d046c1bc0d
+SHA256 (fortune-mod-culmea-culmilor-2005.12.15.tar.gz) = 2edeb170d5211d2c801cd3ec5529dcaec5d28dd12ddddbba1b6cc228d3233531
+SIZE (fortune-mod-culmea-culmilor-2005.12.15.tar.gz) = 4209
diff -urN fortune-mod-culmea-culmilor_FPT/files/pkg-message.in fortune-mod-culmea-culmilor/files/pkg-message.in
--- fortune-mod-culmea-culmilor_FPT/files/pkg-message.in	Fri Nov 25 04:47:48 2005
+++ fortune-mod-culmea-culmilor/files/pkg-message.in	Thu Jan  1 02:00:00 1970
@@ -1,8 +0,0 @@
-* * *
-
-Usage:
-	fortune %%FORTUNE_DIR%%/%%FORTUNE_FILE%%
-If you want the "offensive" ones also:
-	fortune %%FORTUNE_DIR%%/%%FORTUNE_FILE%%-o
-
-* * * 
--- fortune-mod-culmea-culmilor-2005.11.18_to_2005.12.15.diff ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1135006515.0>