Date: Mon, 23 Dec 2013 17:57:48 +0900 From: Takefu <takefu@airport.fm> To: freebsd-gnats-submit@freebsd.org Subject: ports/185124: [PATCH] databases/sqlite3: fix StageDir Message-ID: <52B7FB0C.4030703@airport.fm> Resent-Message-ID: <201312230900.rBN9003k002738@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 185124
>Category: ports
>Synopsis: [PATCH] databases/sqlite3: fix StageDir
>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: Mon Dec 23 09:00:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Takefu
>Release: FreeBSD 8.4-RELEASE-p4 i386
>Organization:
FOX Amateur Radio Club
>Environment:
System: FreeBSD RELENG84-ix86.localIPv4.airport.fm 8.4-RELEASE-p4 FreeBSD 8.4-RELEASE-p4 #0: Wed Sep 25 14:55:36 JST 2013
>Description:
fix
StageDir
databases/sqlite3
devel/cdialog
devel/libexecinfo
textproc/expat2
>How-To-Repeat:
>Fix:
diff -ruN /usr/ports/devel/cdialog/Makefile ./Makefile
--- /usr/ports/devel/cdialog/Makefile 2013-09-21 02:03:26.000000000 +0900
+++ ./Makefile 2013-12-23 15:58:26.000000000 +0900
@@ -30,15 +30,16 @@
INSTALL_TARGET= install-strip install-man install-lib
-NO_STAGE= yes
-.if !defined(NOPORTEXAMPLES)
+.include <bsd.port.pre.mk>
+
+.if ${PORT_OPTIONS:MEXAMPLES}
post-patch:
@${FIND} ${WRKSRC}/samples/ -type f -exec ${REINPLACE_CMD} -i "" "s|dialog|cdialog|g" {} \;
post-install:
- @${MKDIR} ${EXAMPLESDIR}
+ @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
cd ${WRKSRC}/samples && ${FIND} . | \
- ${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
+ ${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${EXAMPLESDIR}
.endif
.include <bsd.port.mk>
diff -ruN /usr/ports/devel/libexecinfo/Makefile ./Makefile
--- /usr/ports/devel/libexecinfo/Makefile 2013-09-21 02:13:42.000000000 +0900
+++ ./Makefile 2013-12-23 16:09:34.000000000 +0900
@@ -18,7 +18,6 @@
PORTDOCS= README
-NO_STAGE= yes
.include <bsd.port.pre.mk>
.if ${ARCH} == "amd64"
@@ -26,9 +25,9 @@
.endif
post-install:
-.if !defined(NOPORTDOCS)
- ${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+.if ${PORT_OPTIONS:MDOCS}
+ ${MKDIR} ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
.endif
.include <bsd.port.post.mk>
diff -ruN /usr/ports/databases/sqlite3/Makefile ./Makefile
--- /usr/ports/databases/sqlite3/Makefile 2013-12-12 03:08:52.000000000 +0900
+++ ./Makefile 2013-12-23 17:03:25.000000000 +0900
@@ -45,7 +45,6 @@
THREADSAFE_DESC= Build thread-safe library
EXTENSION_DESC= Allow loadable extensions
-NO_STAGE= yes
.include <bsd.port.options.mk>
PLIST_FILES= bin/sqlite3 include/sqlite3.h include/sqlite3ext.h \
@@ -54,6 +53,7 @@
.if !defined(NO_INSTALL_MANPAGES)
MAN1= sqlite3.1
+PLIST_FILES+= man/man1/sqlite3.1.gz
.endif
# NAME83 "Enable use 8.3 filename for temp files" off \
@@ -166,7 +166,7 @@
post-install:
.if !defined(NO_INSTALL_MANPAGES)
- @${INSTALL_MAN} ${WRKSRC}/sqlite3.1 ${MANPREFIX}/man/man1
+ @${INSTALL_MAN} ${WRKSRC}/sqlite3.1 ${STAGEDIR}${MANPREFIX}/man/man1
.endif
.include <bsd.port.mk>
diff -ruN /usr/ports/textproc/expat2/Makefile ./Makefile
--- /usr/ports/textproc/expat2/Makefile 2013-09-21 08:17:30.000000000 +0900
+++ ./Makefile 2013-12-23 17:06:56.000000000 +0900
@@ -20,7 +20,6 @@
PLIST_SUB= SHLIB_MAJOR="${SHLIB_MAJOR}"
-NO_STAGE= yes
post-patch:
@${REINPLACE_CMD} \
-e 's/@LIBCURRENT.*@/${SHLIB_MAJOR}/' \
diff -ruN /usr/ports/textproc/expat2/pkg-plist ./pkg-plist
--- /usr/ports/textproc/expat2/pkg-plist 2013-07-30 02:12:54.000000000 +0900
+++ ./pkg-plist 2013-12-23 17:09:08.000000000 +0900
@@ -6,3 +6,4 @@
lib/libexpat.so
lib/libexpat.so.%%SHLIB_MAJOR%%
libdata/pkgconfig/expat.pc
+man/man1/xmlwf.1.gz
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?52B7FB0C.4030703>