diff options
| author | ijliao <ijliao@FreeBSD.org> | 2001-12-19 11:52:40 +0800 |
|---|---|---|
| committer | ijliao <ijliao@FreeBSD.org> | 2001-12-19 11:52:40 +0800 |
| commit | 15c6fd78f68b6ef7725f58303d36c3df86fa674f (patch) | |
| tree | e8305b8ac292a11c5ff764b35a46ba5e4bc4dad8 /devel/bcpp | |
| parent | 438e9059a0755b27b0d7d58295a0ab0be148fc9f (diff) | |
| download | freebsd-ports-gnome-15c6fd78f68b6ef7725f58303d36c3df86fa674f.tar.gz freebsd-ports-gnome-15c6fd78f68b6ef7725f58303d36c3df86fa674f.tar.zst freebsd-ports-gnome-15c6fd78f68b6ef7725f58303d36c3df86fa674f.zip | |
honor prefix & fix warning
PR: 32996
Submitted by: maintainer
Diffstat (limited to 'devel/bcpp')
| -rw-r--r-- | devel/bcpp/Makefile | 4 | ||||
| -rw-r--r-- | devel/bcpp/files/patch-bcpp.cpp | 28 | ||||
| -rw-r--r-- | devel/bcpp/pkg-message | 2 |
3 files changed, 27 insertions, 7 deletions
diff --git a/devel/bcpp/Makefile b/devel/bcpp/Makefile index adc5aeee5947..ffa39ce9f612 100644 --- a/devel/bcpp/Makefile +++ b/devel/bcpp/Makefile @@ -18,10 +18,14 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/code MAKEFILE= makefile ALL_TARGET= ${PORTNAME} +post-patch: + @${PERL5} -pi -e 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/bcpp.cpp + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.cfg \ ${PREFIX}/etc/${PORTNAME}.cfg.sample + .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/txtdocs/hirachy.txt ${DOCSDIR} diff --git a/devel/bcpp/files/patch-bcpp.cpp b/devel/bcpp/files/patch-bcpp.cpp index f270b0c8e252..dd7ea979df9d 100644 --- a/devel/bcpp/files/patch-bcpp.cpp +++ b/devel/bcpp/files/patch-bcpp.cpp @@ -1,20 +1,36 @@ --- bcpp.cpp.orig Tue Aug 10 20:54:52 1999 -+++ bcpp.cpp Wed Nov 7 10:48:27 2001 -@@ -2721,6 +2721,7 @@ ++++ bcpp.cpp Tue Dec 18 20:22:18 2001 +@@ -1431,6 +1431,7 @@ + + } + ++/* + // purge an Indent-stack + static void freeIndentStack(StackList* pImode) + { +@@ -1451,6 +1452,7 @@ + dst -> push(temp); + } + } ++*/ + + // no extra indent immediately after any brace + void resetSingleIndent(StackList* pIMode) +@@ -2721,6 +2723,7 @@ char* pSPath = getenv ("PATH"); char* pEPath = NULL; char* pNameMem = NULL; -+ char* tmpCfgName = new char[ 16 + strlen(pCfgName) + 1]; ++ char* tmpCfgName = new char[strlen("%%PREFIX%%/etc")+strlen(pCfgName)+1]; char sepChar = NULLC; const char* pathSepChar; char backUp; -@@ -2729,6 +2730,13 @@ +@@ -2729,6 +2732,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 /usr/local/etc -+ tmpCfgName = strcat( tmpCfgName, "/usr/local/etc/" ); ++ // 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; diff --git a/devel/bcpp/pkg-message b/devel/bcpp/pkg-message index 95fb7a397d1e..87ab868406bd 100644 --- a/devel/bcpp/pkg-message +++ b/devel/bcpp/pkg-message @@ -1,2 +1,2 @@ -You should modify /usr/local/etc/bcpp.cfg to your liking and +You should modify /usr/local/etc/bcpp.cfg.sample to your liking and copy it to /usr/local/etc/bcpp.cfg |