Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 6 Jan 2013 02:35:19 +0900
From:      KATO Tsuguru <tkato432@yahoo.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/175040: textproc/dixit: Update to version 11.11
Message-ID:  <20130106023519.9d4b4f6566a5616439472bf8@yahoo.com>
Resent-Message-ID: <201301051810.r05IABBb001717@freefall.freebsd.org>

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

>Number:         175040
>Category:       ports
>Synopsis:       textproc/dixit: Update to version 11.11
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 05 18:10:11 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.4-RELEASE-p10 i386
>Organization:
>Environment:
>Description:
- Update to version 11.11

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/textproc/dixit/Makefile textproc/dixit/Makefile
--- /usr/ports/textproc/dixit/Makefile	2012-12-05 05:57:21.000000000 +0900
+++ textproc/dixit/Makefile	2012-12-06 18:17:32.000000000 +0900
@@ -1,27 +1,30 @@
-# New ports collection makefile for:	dixit
-# Date created:				2005-01-11
-# Whom:					Ion-Mihai "IOnut" Tetcu <itetcu@people.tecnik93.com>
-#
+# Created by: Ion-Mihai "IOnut" Tetcu <itetcu@people.tecnik93.com>
 # $FreeBSD: head/textproc/dixit/Makefile 308272 2012-12-04 20:39:22Z zi $
-#
 
 PORTNAME=	dixit
-PORTVERSION=	10.8
-PORTREVISION=	1
+PORTVERSION=	11.11
 CATEGORIES=	textproc
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/:dixit \
-		SF/${PORTNAME}/${PORTNAME}_qdb/:db
-DISTFILES=	${PORTNAME}-${PORTVERSION}.${QT_VER}.tgz:${PORTNAME} \
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} \
+		SF/${PORTNAME}/${PORTNAME}_qdb:db
+DISTFILES=	${PORTNAME}-${PORTVERSION}.${QT_VER}.tgz \
 		${_DB_D}:db
 EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}.${QT_VER}.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Romanian dictionaries databases and query application
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
+LICENSE=	GPLv3 # (or later)
+
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}.${QT_VER}
+
+USE_QT4=	corelib gui network moc_build qmake_build rcc_build
+HAS_CONFIGURE=	yes
+MAKE_JOBS_SAFE=	yes
 
 PLIST_SUB=	_DB=${_DB} DB_DIR=${DB_DIR} _DB_F=${_DB_F}
 
+QT_VER=		4
+
 DB_DIR?=	/var/db/dixit
 DB_OWNER?=	root
 DB_GROUP?=	wheel
@@ -29,59 +32,42 @@
 # DB_DATE is the time of the file in the zip archive, not the time of the last
 # update of the database (which is a little earlier, but TZ makes it appear to
 # be later), but it's all we can do in a makefile.
-DB_DATE=201004010000
+DB_DATE=201204010000
 _DB_D=	${PORTNAME}.qdb.tar.bz2
 _DB_F=	${PORTNAME}.qdb
 _DB=	${DB_DIR}/${_DB_F}
 
-HAS_CONFIGURE=	yes
-
-QT_VER=4
-USE_QT4=	corelib gui network moc_build qmake_build rcc_build
-#USE_GMAKE=	yes
-#MAKE_ENV=	PTHREAD_LIBS=${PTHREAD_LIBS} QTDIR="${QT_PREFIX}"
-
 pre-everything::
-	@${ECHO_CMD}
-	@${ECHO_CMD} "Your dictionary database directory is:"
-	@${ECHO_CMD} "DB_DIR=${DB_DIR} (default /var/db/dixit)"
-	@${ECHO_CMD} "You need about 65MB for the dictionary db."
-#	@${ECHO_CMD} "To overwrite the database, irrespectiv of it's last update"
-#	@${ECHO_CMD} "time define DB_OVERWRITE=yes"
-#.ifdef(DB_OVERWRITE)
-#	@${ECHO_CMD} "DB_OVERWRITE is set, the database will be overwritten !!"
-#.endif
-	@${ECHO_CMD}
-	@${ECHO_CMD} "You can allow all users to update (but potentially also delete"
-	@${ECHO_CMD} "or alter) the dictionaries database by setting DB_MODE=0666"
-	@${ECHO_CMD} "DB_OWNER=${DB_OWNER} (default: root)"
-	@${ECHO_CMD} "DB_GROUP=${DB_GROUP} (default: wheel)"
-	@${ECHO_CMD} "DB_MODE=${DB_MODE} (default: 0664)"
-	@${ECHO_CMD}
+	@${ECHO_MSG}
+	@${ECHO_MSG} "Your dictionary database directory is:"
+	@${ECHO_MSG} "DB_DIR=${DB_DIR} (default /var/db/dixit)"
+	@${ECHO_MSG} "You need about 65MB for the dictionary db."
+	@${ECHO_MSG}
+	@${ECHO_MSG} "You can allow all users to update (but potentially also delete"
+	@${ECHO_MSG} "or alter) the dictionaries database by setting DB_MODE=0666"
+	@${ECHO_MSG} "DB_OWNER=${DB_OWNER} (default: root)"
+	@${ECHO_MSG} "DB_GROUP=${DB_GROUP} (default: wheel)"
+	@${ECHO_MSG} "DB_MODE=${DB_MODE} (default: 0664)"
+	@${ECHO_MSG}
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|-O3||' ${WRKSRC}/${PORTNAME}-${PORTVERSION}.${QT_VER}.pro
+	@${REINPLACE_CMD} -e \
+		's|dixit.qdb|${_DB}|' ${WRKSRC}/src/dixit.h
 
 do-configure:
-	@${REINPLACE_CMD} -e "s^dixit.qdb^${_DB}^" ${WRKSRC}/src/dixit.h
-#	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} qmake \
-#		-spec ${LOCALBASE}/share/qt/mkspecs/freebsd-g++ ${PORTNAME}.pro
-	cd ${WRKSRC} && \
-	${SETENV} ${CONFIGURE_ENV} ${QMAKE} -unix PREFIX=${PREFIX} ${PORTNAME}.pro
+	(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS})
 
 do-install:
-	@${MKDIR} ${DB_DIR}
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} ${PREFIX}/bin)
 	@${TOUCH} -t ${DB_DATE} ${WRKSRC}/${_DB_F}
-	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}  ${PREFIX}/bin/${PORTNAME}
-	@${ECHO_CMD} "	===> Installing database ... .. ."
-.ifndef(DB_OVERWRITE)
+	@${ECHO_MSG} "	===> Installing database ... .. ."
 	@if [ ! -e "${_DB}" -o "${_DB}" -ot "${WRKSRC}/${_DB_F}" ]; \
 		then	${TAR} -C ${DB_DIR:S/${PORTNAME}//} -xf ${DISTDIR}/${_DB_D} && \
-			${ECHO_CMD} "	===> ... Done."; \
-		else	${ECHO_CMD} "	===> Exisitng database is newer, skiping";\
+			${ECHO_MSG} "	===> ... Done."; \
+		else	${ECHO_MSG} "	===> Exisitng database is newer, skiping";\
 	fi
-.else
-	@${ECHO_CMD} "	===> DB_OVERWRITE is set, installing database ... .. ."
-	${TAR} -C ${DB_DIR:S/${PORTNAME}//} -xf ${DISTDIR}/${_DB_D}
-	@${ECHO_CMD} "	===> ... Done."
-.endif
 	@${CHOWN} ${DB_OWNER}:${DB_GROUP} ${_DB}
 	@${CHMOD} ${DB_MODE} ${_DB}
 
diff -urN /usr/ports/textproc/dixit/distinfo textproc/dixit/distinfo
--- /usr/ports/textproc/dixit/distinfo	2012-11-08 08:13:42.000000000 +0900
+++ textproc/dixit/distinfo	2012-12-06 17:20:12.000000000 +0900
@@ -1,4 +1,4 @@
-SHA256 (dixit-10.8.4.tgz) = c4ab717e0ee82018d266ad995cd23d934aaac41160b209efd40a6b11241d27cb
-SIZE (dixit-10.8.4.tgz) = 145722
-SHA256 (dixit.qdb.tar.bz2) = d491b87b01d60e0adf8a3ac59d034f29fe58fe288ba1a59bab77638324a41170
-SIZE (dixit.qdb.tar.bz2) = 22028052
+SHA256 (dixit-11.11.4.tgz) = 93ae9a2422a952103a54e5d049072616ef3a27df594fe61d94db980863afc78c
+SIZE (dixit-11.11.4.tgz) = 161307
+SHA256 (dixit.qdb.tar.bz2) = 6e94538c54b5e8e3acf33f8b6b688c636b91275d8b5cef2aab463d71b5f27dbc
+SIZE (dixit.qdb.tar.bz2) = 27220638
>Release-Note:
>Audit-Trail:
>Unformatted:



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