Bug 184834

Summary: graphics/chbg: Fix build with clang
Product: Ports & Packages Reporter: tkato432
Component: Individual Port(s)Assignee: Pawel Pekala <pawel>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
file.diff none

Description tkato432 2013-12-16 18:10:08 UTC
- Fix build with clang
Comment 1 Pawel Pekala freebsd_committer freebsd_triage 2013-12-24 21:55:28 UTC
Responsible Changed
From-To: freebsd-ports-bugs->pawel

I'll take it.
Comment 2 dfilter service freebsd_committer freebsd_triage 2013-12-24 22:01:29 UTC
Author: pawel
Date: Tue Dec 24 22:01:22 2013
New Revision: 337392
URL: http://svnweb.freebsd.org/changeset/ports/337392

Log:
  - Fix build with clang
  - Add LICENSE
  - Support staging
  
  PR:		ports/184834
  Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

Modified:
  head/graphics/chbg/Makefile
  head/graphics/chbg/pkg-plist   (contents, props changed)

Modified: head/graphics/chbg/Makefile
==============================================================================
--- head/graphics/chbg/Makefile	Tue Dec 24 21:50:59 2013	(r337391)
+++ head/graphics/chbg/Makefile	Tue Dec 24 22:01:22 2013	(r337392)
@@ -11,23 +11,20 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Change Background Picture with time period
 
-LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
+LICENSE=	GPLv2 # (or later)
 
+LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png
+
+USES=		gmake gettext pathfix
 USE_GNOME=	gdkpixbuf
-USE_GMAKE=	yes
-USES=		gettext
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
-CPPFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS=	--disable-gnome
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-MAN1=		chbg.1
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		's|^guint argc|gint argc|' ${WRKSRC}/src/chbg.c
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/graphics/chbg/pkg-plist
==============================================================================
--- head/graphics/chbg/pkg-plist	Tue Dec 24 21:50:59 2013	(r337391)
+++ head/graphics/chbg/pkg-plist	Tue Dec 24 22:01:22 2013	(r337392)
@@ -1,4 +1,5 @@
 bin/chbg
+man/man1/chbg.1.gz
 share/locale/de/LC_MESSAGES/chbg.mo
 share/locale/fr/LC_MESSAGES/chbg.mo
 share/locale/sk/LC_MESSAGES/chbg.mo
_______________________________________________
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 Pawel Pekala freebsd_committer freebsd_triage 2013-12-24 22:01:36 UTC
State Changed
From-To: open->closed

Committed. Thanks!
Comment 4 dfilter service freebsd_committer freebsd_triage 2013-12-26 13:09:07 UTC
Author: mat
Date: Thu Dec 26 13:08:59 2013
New Revision: 337493
URL: http://svnweb.freebsd.org/changeset/ports/337493

Log:
  MFH: r337392
  
  - Fix build with clang
  - Add LICENSE
  - Support staging
  
  PR:		ports/184834
  Submitted by:	KATO Tsuguru <tkato432@yahoo.com>
  Approved by:	portmgr (implicit)

Modified:
  branches/2014Q1/graphics/chbg/Makefile
  branches/2014Q1/graphics/chbg/pkg-plist   (contents, props changed)
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/graphics/chbg/Makefile
==============================================================================
--- branches/2014Q1/graphics/chbg/Makefile	Thu Dec 26 13:07:54 2013	(r337492)
+++ branches/2014Q1/graphics/chbg/Makefile	Thu Dec 26 13:08:59 2013	(r337493)
@@ -11,23 +11,20 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Change Background Picture with time period
 
-LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
+LICENSE=	GPLv2 # (or later)
 
+LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png
+
+USES=		gmake gettext pathfix
 USE_GNOME=	gdkpixbuf
-USE_GMAKE=	yes
-USES=		gettext
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
-CPPFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS=	--disable-gnome
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-MAN1=		chbg.1
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		's|^guint argc|gint argc|' ${WRKSRC}/src/chbg.c
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: branches/2014Q1/graphics/chbg/pkg-plist
==============================================================================
--- branches/2014Q1/graphics/chbg/pkg-plist	Thu Dec 26 13:07:54 2013	(r337492)
+++ branches/2014Q1/graphics/chbg/pkg-plist	Thu Dec 26 13:08:59 2013	(r337493)
@@ -1,4 +1,5 @@
 bin/chbg
+man/man1/chbg.1.gz
 share/locale/de/LC_MESSAGES/chbg.mo
 share/locale/fr/LC_MESSAGES/chbg.mo
 share/locale/sk/LC_MESSAGES/chbg.mo
_______________________________________________
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"