Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 21 Jan 2008 01:11:42 +0800 (CST)
From:      Kuang-che Wu <kcwu@csie.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        alexbl@FreeBSD.org
Subject:   ports/119830: [PATCH] textproc/highlight: update to 2.6.7
Message-ID:  <200801201711.m0KHBg39069732@kcwu.csie.org>
Resent-Message-ID: <200801201720.m0KHK19q063513@freefall.freebsd.org>

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

>Number:         119830
>Category:       ports
>Synopsis:       [PATCH] textproc/highlight: update to 2.6.7
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jan 20 17:20:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Kuang-che Wu
>Release:        FreeBSD 8.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD kcwu.csie.org 8.0-CURRENT FreeBSD 8.0-CURRENT #5: Sun Nov  4 09:09:38 CST
>Description:
- Update to 2.6.7

Port maintainer (alexbl@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- highlight-2.6.7,1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/textproc/highlight/Makefile /files/home/kcwu/work/ports/x/textproc/highlight/Makefile
--- /usr/ports/textproc/highlight/Makefile	2007-10-10 08:05:19.000000000 +0800
+++ /files/home/kcwu/work/ports/x/textproc/highlight/Makefile	2008-01-21 01:06:10.000000000 +0800
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	highlight
-PORTVERSION=	2.4.8
-PORTREVISION=	1
+PORTVERSION=	2.6.7
 PORTEPOCH=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.andre-simon.de/zip/
@@ -15,16 +14,13 @@
 MAINTAINER=	alexbl@FreeBSD.org
 COMMENT=	Customizable syntax highlighter
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/${PORTNAME}
-
-USE_GCC=	3.4
+USE_GCC=	3.4+
 USE_GETOPT_LONG=	yes
 USE_GMAKE=	yes
 MAKEFILE=	makefile
 MAKE_ARGS=	CXX="${CXX}" \
 		CFLAGS="${CXXFLAGS} ${CPPFLAGS} -DHAVE_DECL_GETOPT" \
 		LDFLAGS="${LDFLAGS}"
-ALL_TARGET=	${PORTNAME}
 
 PLIST_FILES=	bin/highlight
 
@@ -39,35 +35,33 @@
 
 post-patch:
 	@${REINPLACE_CMD} -e \
-		's|/etc/highlight|${DATADIR}|g' ${WRKSRC}/datadir.cpp
-	@${REINPLACE_CMD} -e \
-		's|/usr/share/highlight|${DATADIR}|' ${WRKSRC}/datadir.cpp
+		's|^PREFIX =|PREFIX ?=|' ${WRKSRC}/${MAKEFILE}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/../man/${MAN1}.gz ${MANPREFIX}/man/man1
-	@${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/../filetypes.conf ${DATADIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/man/${MAN1}.gz ${MANPREFIX}/man/man1
+	@${MKDIR} ${ETCDIR}
+	${INSTALL_DATA} ${WRKSRC}/filetypes.conf ${ETCDIR}
 	@${MKDIR} ${DATADIR}/helpmsg
-	${INSTALL_DATA} ${WRKSRC}/../helpmsg/* ${DATADIR}/helpmsg
+	${INSTALL_DATA} ${WRKSRC}/helpmsg/* ${DATADIR}/helpmsg
 	@${MKDIR} ${DATADIR}/langDefs
-	${INSTALL_DATA} ${WRKSRC}/../langDefs/*.lang ${DATADIR}/langDefs
+	${INSTALL_DATA} ${WRKSRC}/langDefs/*.lang ${DATADIR}/langDefs
 	@${MKDIR} ${DATADIR}/themes
-	${INSTALL_DATA} ${WRKSRC}/../themes/* ${DATADIR}/themes
+	${INSTALL_DATA} ${WRKSRC}/themes/* ${DATADIR}/themes
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for i in AUTHORS ChangeLog INSTALL README README_DE README_ES README_INDENT \
 	README_REGEX TODO
-	${INSTALL_DATA} ${WRKSRC}/../${i} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 	@${MKDIR} ${EXAMPLESDIR}
-	${TAR} -C ${WRKSRC}/../examples -cf - . | \
+	${TAR} -C ${WRKSRC}/examples -cf - . | \
 		${TAR} -C  ${EXAMPLESDIR} --unlink -xf -
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
 .endif
 
 post-install:
-.for dir in ${PREFIX}/share/${PORTNAME} ${PREFIX}/share/examples/${PORTNAME}
+.for dir in ${ETCDIR} ${DATADIR} ${EXAMPLESDIR}
 	@${FIND} ${dir} ! -type d | \
 		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
 	@${FIND} ${dir} -type d | ${SORT} -r | \
diff -ruN --exclude=CVS /usr/ports/textproc/highlight/distinfo /files/home/kcwu/work/ports/x/textproc/highlight/distinfo
--- /usr/ports/textproc/highlight/distinfo	2007-04-09 09:37:36.000000000 +0800
+++ /files/home/kcwu/work/ports/x/textproc/highlight/distinfo	2008-01-20 20:50:39.000000000 +0800
@@ -1,3 +1,3 @@
-MD5 (highlight-2.4.8.tar.gz) = 8ffb1d62ef449ecf5ffef1f6931a3d16
-SHA256 (highlight-2.4.8.tar.gz) = e7a627fa8e78c326ad44c81816dbceeb51ff7f4b37c7bbc5d47ba214e828d25f
-SIZE (highlight-2.4.8.tar.gz) = 357067
+MD5 (highlight-2.6.7.tar.gz) = 2200bdc03b47ce94a097fefd9bd5ee33
+SHA256 (highlight-2.6.7.tar.gz) = ba281cb16c63f81861b42c19ecd09ad1162997725e0e7bd18bbe968eed726a84
+SIZE (highlight-2.6.7.tar.gz) = 440627
--- highlight-2.6.7,1.patch ends here ---

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



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