185514 – graphics/lfview: Fix build on -current

Bug 185514 - graphics/lfview: Fix build on -current

Summary: graphics/lfview: Fix build on -current

Status:	Closed FIXED

Alias:	None

Product:	Ports & Packages
Classification:	Unclassified
Component:	Individual Port(s) (show other bugs)
Version:	Latest
Hardware:	Any Any

Importance:	Normal Affects Only Me
Assignee:	freebsd-ports-bugs (Nobody)

URL:
Keywords:

Depends on:
Blocks:

Reported:	2014-01-05 18:10 UTC by tkato432
Modified:	2014-01-08 18:40 UTC (History)
CC List:	0 users

See Also:

Attachments
file.diff (1.32 KB, patch) 2014-01-05 18:10 UTC, tkato432	no flags	Details \| Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.

Description tkato432 2014-01-05 18:10:05 UTC

- Fix build on -current

Comment 1 dfilter service freebsd_committer

2014-01-08 18:31:47 UTC

Author: antoine
Date: Wed Jan  8 18:31:40 2014
New Revision: 339163
URL: http://svnweb.freebsd.org/changeset/ports/339163

Log:
  - Remove NO_INSTALL_MANPAGES, it's useless with custom do-install target
  - Stage support
  - Fix build on head amd64 (MAKE_ENV was overriden)
  - Add missing OPTIONS_DEFINE
  
  PR:		ports/185514
  Submitted by:	KATO Tsuguru

Modified:
  head/graphics/lfview/Makefile

Modified: head/graphics/lfview/Makefile
==============================================================================
--- head/graphics/lfview/Makefile	Wed Jan  8 18:15:32 2014	(r339162)
+++ head/graphics/lfview/Makefile	Wed Jan  8 18:31:40 2014	(r339163)
@@ -14,23 +14,24 @@ COMMENT=	Graphic viewer for Leaf product
 USES=		imake
 USE_XORG=	x11 xext
 USE_LDCONFIG=	yes
-NO_INSTALL_MANPAGES=	yes
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	DOCS
+DOCSDIR=	${PREFIX}/share/doc/ja/lfview
 
-.if ${ARCH} == "amd64"
+.include <bsd.port.options.mk>
+
+.if ${ARCH} != i386
 CFLAGS+=	-fPIC
-MAKE_ENV=	"SHLIBGLOBALSFLAGS=-fPIC"
+MAKE_ENV+=	SHLIBGLOBALSFLAGS=-fPIC
 .endif
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/lfview ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/plugins/liblfv_leaf.so.1 ${PREFIX}/lib
-	${LN} -s ${PREFIX}/lib/liblfv_leaf.so.1 ${PREFIX}/lib/liblfv_leaf.so
+	${INSTALL_PROGRAM} ${WRKSRC}/lfview ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_LIB} ${WRKSRC}/plugins/liblfv_leaf.so.1 ${STAGEDIR}${PREFIX}/lib
+	${LN} -sf liblfv_leaf.so.1 ${STAGEDIR}${PREFIX}/lib/liblfv_leaf.so
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${PREFIX}/share/doc/ja/lfview
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/ja/lfview
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"

Comment 2 dfilter service freebsd_committer

2014-01-08 18:34:26 UTC

Author: antoine
Date: Wed Jan  8 18:34:19 2014
New Revision: 339164
URL: http://svnweb.freebsd.org/changeset/ports/339164

Log:
  MFH: r339163
  
  - Remove NO_INSTALL_MANPAGES, it's useless with custom do-install target
  - Stage support
  - Fix build on head amd64 (MAKE_ENV was overriden)
  - Add missing OPTIONS_DEFINE
  
  PR:		ports/185514
  Submitted by:	KATO Tsuguru
  Approved by:	portmgr (implicit)

Modified:
  branches/2014Q1/graphics/lfview/Makefile
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/graphics/lfview/Makefile
==============================================================================
--- branches/2014Q1/graphics/lfview/Makefile	Wed Jan  8 18:31:40 2014	(r339163)
+++ branches/2014Q1/graphics/lfview/Makefile	Wed Jan  8 18:34:19 2014	(r339164)
@@ -14,23 +14,24 @@ COMMENT=	Graphic viewer for Leaf product
 USES=		imake
 USE_XORG=	x11 xext
 USE_LDCONFIG=	yes
-NO_INSTALL_MANPAGES=	yes
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	DOCS
+DOCSDIR=	${PREFIX}/share/doc/ja/lfview
 
-.if ${ARCH} == "amd64"
+.include <bsd.port.options.mk>
+
+.if ${ARCH} != i386
 CFLAGS+=	-fPIC
-MAKE_ENV=	"SHLIBGLOBALSFLAGS=-fPIC"
+MAKE_ENV+=	SHLIBGLOBALSFLAGS=-fPIC
 .endif
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/lfview ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/plugins/liblfv_leaf.so.1 ${PREFIX}/lib
-	${LN} -s ${PREFIX}/lib/liblfv_leaf.so.1 ${PREFIX}/lib/liblfv_leaf.so
+	${INSTALL_PROGRAM} ${WRKSRC}/lfview ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_LIB} ${WRKSRC}/plugins/liblfv_leaf.so.1 ${STAGEDIR}${PREFIX}/lib
+	${LN} -sf liblfv_leaf.so.1 ${STAGEDIR}${PREFIX}/lib/liblfv_leaf.so
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${PREFIX}/share/doc/ja/lfview
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/ja/lfview
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"

Comment 3 Antoine Brodin freebsd_committer

2014-01-08 18:34:46 UTC

State Changed
From-To: open->closed

Close: patch committed in head and 2014Q1 branch, thanks!