Bug 174187 - graphics/darknock: Support CXXFLAGS properly
Summary: graphics/darknock: Support CXXFLAGS properly
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Marcelo Araujo
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-12-05 18:10 UTC by tkato432
Modified: 2013-01-21 03:50 UTC (History)
0 users

See Also:


Attachments
file.diff (3.15 KB, patch)
2012-12-05 18:10 UTC, tkato432
no flags Details | Diff
graphics_darknock.diff (2.95 KB, patch)
2013-01-07 17:55 UTC, tkato432
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description tkato432 2012-12-05 18:10:09 UTC
- Support CXXFLAGS properly
- Support PLIST_FILES
- Add LICENSE

Remove file:
pkg-plist
Comment 1 Marcelo Araujo freebsd_committer freebsd_triage 2012-12-11 11:17:37 UTC
Responsible Changed
From-To: freebsd-ports-bugs->araujo

I'll take it.
Comment 2 tkato432 2013-01-07 17:55:01 UTC
Remake of the patch against current tree.
Comment 3 dfilter service freebsd_committer freebsd_triage 2013-01-21 03:40:44 UTC
Author: araujo
Date: Mon Jan 21 03:40:30 2013
New Revision: 310746
URL: http://svnweb.freebsd.org/changeset/ports/310746

Log:
  - Support CXXFLAGS properly.
  - Support PLIST_FILES.
  - Add LICENSE.
  - Bump PORTREVISION.
  
  PR:		ports/174187
  Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

Deleted:
  head/graphics/darknock/pkg-plist
Modified:
  head/graphics/darknock/Makefile

Modified: head/graphics/darknock/Makefile
==============================================================================
--- head/graphics/darknock/Makefile	Mon Jan 21 03:39:17 2013	(r310745)
+++ head/graphics/darknock/Makefile	Mon Jan 21 03:40:30 2013	(r310746)
@@ -2,26 +2,23 @@
 # $FreeBSD$
 
 PORTNAME=	darknock
-DISTVERSION=	0.3.0
-PORTREVISION=	3
+PORTVERSION=	0.3.0
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Program that can detect edges in images
 
-USE_QT4=	qmake_build moc_build rcc_build uic_build linguist_build gui
+LICENSE=	GPLv2 # (or later)
+
 WRKSRC=		${WRKDIR}/${PORTNAME}
-LRELEASE=	${QT_PREFIX}/bin/lrelease-qt4
-MAKE_JOBS_SAFE=	yes
 
-PORTDOCS=	changelog copyright
+USE_QT4=	gui linguist_build moc_build qmake_build rcc_build uic_build
+MAKE_JOBS_SAFE=	yes
 
-.if !defined(WITHOUT_NLS)
-PLIST_SUB+=	NLS=""
-.else
-PLIST_SUB+=	NLS="@comment "
-.endif
+PORTDOCS=	changelog
+PLIST_FILES=	bin/darknock share/pixmaps/darknock.png
 
 DESKTOP_ENTRIES=	"${PORTNAME}" \
 			"${COMMENT}" \
@@ -30,25 +27,36 @@ DESKTOP_ENTRIES=	"${PORTNAME}" \
 			"Graphics;Qt;" \
 			"false"
 
+LRELEASE=	${QT_PREFIX}/bin/lrelease-qt4
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
+.for lang in fr it pl ro sv tr
+PLIST_FILES+=	%%DATADIR%%/locale/darknock_${lang}.qm
+.endfor
+PLIST_DIRS+=	%%DATADIR%%/locale %%DATADIR%%
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/share/darknock|${DATADIR}|g' \
 		${WRKSRC}/src/main.cpp
 
 pre-build:
 	@${LRELEASE} ${BUILD_WRKSRC}/${PORTNAME}.pro
-	@cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${QMAKE} -spec ${QMAKESPEC}
+	@(cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} ${QMAKEFLAGS})
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	@${INSTALL_DATA} ${WRKSRC}/images/${PORTNAME}.png ${PREFIX}/share/pixmaps
-.if !defined(WITHOUT_NLS)
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/images/${PORTNAME}.png ${PREFIX}/share/pixmaps
+.if ${PORT_OPTIONS:MNLS}
 	@${MKDIR} ${DATADIR}/locale
-	@${INSTALL_DATA} ${WRKSRC}/locale/*.qm ${DATADIR}/locale
+	${INSTALL_DATA} ${WRKSRC}/locale/*.qm ${DATADIR}/locale
 .endif
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for doc in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
 .endfor
 .endif
 
_______________________________________________
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 4 Marcelo Araujo freebsd_committer freebsd_triage 2013-01-21 03:44:11 UTC
State Changed
From-To: open->closed

Committed. Thanks!