FreeBSD Bugzilla – Attachment 128091 Details for
Bug 171979
devel/bcpp: Update to version 20120318
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 3.95 KB, created by
tkato432
on 2012-09-25 19:10:15 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
tkato432
Created:
2012-09-25 19:10:15 UTC
Size:
3.95 KB
patch
obsolete
>diff -urN /usr/ports/devel/bcpp/Makefile devel/bcpp/Makefile >--- /usr/ports/devel/bcpp/Makefile 2012-09-22 12:00:28.000000000 +0900 >+++ devel/bcpp/Makefile 2012-09-23 20:45:18.000000000 +0900 >@@ -2,7 +2,7 @@ > # $FreeBSD: ports/devel/bcpp/Makefile,v 1.8 2012/09/22 03:00:28 tabthorpe Exp $ > > PORTNAME= bcpp >-PORTVERSION= 20050725 >+PORTVERSION= 20120318 > CATEGORIES= devel > MASTER_SITES= ftp://invisible-island.net/bcpp/ > EXTRACT_SUFX= .tgz >@@ -10,27 +10,30 @@ > MAINTAINER= ports@FreeBSD.org > COMMENT= A utility similar to indent for C++ code > >-WRKSRC= ${WRKDIR}/${DISTNAME} >-MAKEFILE= makefile >+OPTIONS_DEFINE= DOCS >+ > GNU_CONFIGURE= yes >+MAKEFILE= makefile >+ >+CFLAGS+= -DBCPP_CONFIG_DIR=\\\"${PREFIX}/etc/${PORTNAME}\\\" >+ >+.include <bsd.port.options.mk> > > post-patch: >- @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \ >- ${WRKSRC}/code/bcpp.cpp >+ @${REINPLACE_CMD} -e \ >+ 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/code/bcpp.cpp > > do-install: > ${INSTALL_PROGRAM} ${WRKSRC}/code/${PORTNAME} ${PREFIX}/bin > ${INSTALL_DATA} ${WRKSRC}/code/${PORTNAME}.cfg \ > ${PREFIX}/etc/${PORTNAME}.cfg.sample >- >-post-install: >-.if !defined(NOPORTDOCS) >- @${MKDIR} ${DOCSDIR} >+.if !exists(${PREFIX}/etc/${PORTNAME}.cfg) >+ cd ${PREFIX}/etc && ${CP} -p ${PORTNAME}.cfg.sample ${PORTNAME}.cfg >+.endif >+.if ${PORT_OPTIONS:MDOCS} >+ @@${MKDIR} ${DOCSDIR} > ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/txtdocs/hirachy.txt ${DOCSDIR} > ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/txtdocs/manual.txt ${DOCSDIR} > .endif >- @${ECHO_CMD} >- @${CAT} ${PKGMESSAGE} >- @${ECHO_CMD} > > .include <bsd.port.mk> >diff -urN /usr/ports/devel/bcpp/distinfo devel/bcpp/distinfo >--- /usr/ports/devel/bcpp/distinfo 2011-07-03 23:55:15.000000000 +0900 >+++ devel/bcpp/distinfo 2012-09-23 20:32:37.000000000 +0900 >@@ -1,2 +1,2 @@ >-SHA256 (bcpp-20050725.tgz) = 1a4b5e8e741d6be400eb68b7c4a3eebc6dabe29948a72a7a0bccb1db075eaa2a >-SIZE (bcpp-20050725.tgz) = 132649 >+SHA256 (bcpp-20120318.tgz) = 75a7035da6387ff94111e643ff9efd26f742b52732f0bb8e434c216b8a642507 >+SIZE (bcpp-20120318.tgz) = 147987 >diff -urN /usr/ports/devel/bcpp/files/patch-code__bcpp.cpp devel/bcpp/files/patch-code__bcpp.cpp >--- /usr/ports/devel/bcpp/files/patch-code__bcpp.cpp 2006-04-16 06:13:53.000000000 +0900 >+++ devel/bcpp/files/patch-code__bcpp.cpp 1970-01-01 09:00:00.000000000 +0900 >@@ -1,24 +0,0 @@ >---- code/bcpp.cpp.orig Sat May 18 13:53:27 2002 >-+++ code/bcpp.cpp Fri Jun 7 14:39:33 2002 >-@@ -2755,6 +2757,7 @@ >- char* pSPath = getenv ("PATH"); >- char* pEPath = NULL; >- char* pNameMem = NULL; >-+ char* tmpCfgName = new char[strlen("%%PREFIX%%/etc") + strlen(pCfgName)+1]; >- char sepChar = NULLC; >- const char* pathSepChar; >- char backUp; >-@@ -2763,6 +2766,13 @@ >- // test to see if file is in current directory first ! >- if ((pCfgFile = fopen(pCfgName, "r")) != NULL) >- return; >-+ >-+ // look to see if it's in %%PREFIX%%/etc >-+ tmpCfgName = strcat( tmpCfgName, "%%PREFIX%%/etc/" ); >-+ tmpCfgName = strcat( tmpCfgName, pCfgName ); >-+ if ((pCfgFile = fopen(tmpCfgName, "r")) != NULL) >-+ return; >-+ >- >- // environment variable not found, lord knows what it is ! >- if (pSPath == NULL) >diff -urN /usr/ports/devel/bcpp/pkg-message devel/bcpp/pkg-message >--- /usr/ports/devel/bcpp/pkg-message 2001-12-19 12:52:40.000000000 +0900 >+++ devel/bcpp/pkg-message 1970-01-01 09:00:00.000000000 +0900 >@@ -1,2 +0,0 @@ >-You should modify /usr/local/etc/bcpp.cfg.sample to your liking and >-copy it to /usr/local/etc/bcpp.cfg >diff -urN /usr/ports/devel/bcpp/pkg-plist devel/bcpp/pkg-plist >--- /usr/ports/devel/bcpp/pkg-plist 2006-04-16 06:13:53.000000000 +0900 >+++ devel/bcpp/pkg-plist 2012-09-23 20:47:47.000000000 +0900 >@@ -1,5 +1,7 @@ > bin/bcpp >+@unexec if cmp -s %D/etc/bcpp.cfg %D/etc/bcpp.cfg.sample; then rm -f %D/etc/bcpp.cfg; fi > etc/bcpp.cfg.sample >+@exec if [ ! -f %D/etc/bcpp.cfg ] ; then cp -p %D/etc/bcpp.cfg.sample %D/etc/bcpp.cfg; fi > %%PORTDOCS%%%%DOCSDIR%%/hirachy.txt > %%PORTDOCS%%%%DOCSDIR%%/manual.txt > %%PORTDOCS%%@dirrm %%DOCSDIR%%
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 171979
: 128091