[MAINTAINER] misc/fortune-mod-culmea-culmilor: update

	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.

PR:		ports/90651
Submitted by:	Ion-Mihai "IOnut" Tetcu <itetcu@people.tecnik93.com>

5 files changed, 39 insertions, 47 deletions

diff --git a/misc/fortune-mod-culmea-culmilor/Makefile b/misc/fortune-mod-culmea-culmilor/Makefile
index e3df43f30cae..cba194c3ec77 100644
--- a/misc/fortune-mod-culmea-culmilor/Makefile
+++ b/misc/fortune-mod-culmea-culmilor/Makefile
@@ -3,47 +3,16 @@
 # Whom:                Ion-Mihai "IOnut" Tetcu <itetcu@people.tecnik93.com>
 #
 # $FreeBSD$
-# $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 --git a/misc/fortune-mod-culmea-culmilor/Makefile.fortune b/misc/fortune-mod-culmea-culmilor/Makefile.fortune
new file mode 100644
index 000000000000..4b58b75f5987
--- /dev/null
+++ b/misc/fortune-mod-culmea-culmilor/Makefile.fortune
@@ -0,0 +1,33 @@
+# $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
+	${ECHO_CMD} "@unexec rmdir %D/${_FORTUNE_DIR} 2>/dev/null || true" >> ${TMPPLIST}
+	${ECHO_CMD} "@unexec rmdir %D/share/games 2>/dev/null || true" >> ${TMPPLIST}
diff --git a/misc/fortune-mod-culmea-culmilor/distinfo b/misc/fortune-mod-culmea-culmilor/distinfo
index b0d7e7c4c657..a064c6874108 100644
--- a/misc/fortune-mod-culmea-culmilor/distinfo
+++ b/misc/fortune-mod-culmea-culmilor/distinfo
@@ -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 --git a/misc/fortune-mod-culmea-culmilor/files/pkg-message.in b/misc/fortune-mod-culmea-culmilor/files/pkg-message.in
deleted file mode 100644
index 1d891f450749..000000000000
--- a/misc/fortune-mod-culmea-culmilor/files/pkg-message.in
+++ /dev/null
@@ -1,8 +0,0 @@
-* * *
-
-Usage:
-	fortune %%FORTUNE_DIR%%/%%FORTUNE_FILE%%
-If you want the "offensive" ones also:
-	fortune %%FORTUNE_DIR%%/%%FORTUNE_FILE%%-o
-
-* * * 
diff --git a/misc/fortune-mod-culmea-culmilor/pkg-plist b/misc/fortune-mod-culmea-culmilor/pkg-plist
deleted file mode 100644
index ae41d085be7a..000000000000
--- a/misc/fortune-mod-culmea-culmilor/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-@unexec rmdir %D/share/games/fortune 2>/dev/null || true
-@unexec rmdir %D/share/games 2>/dev/null || true