Bug 187746 - math/nauty: Fix build
Summary: math/nauty: Fix build
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: Martin Wilke
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-03-19 18:40 UTC by tkato432
Modified: 2014-05-17 11:00 UTC (History)
0 users

See Also:


Attachments
file.diff (2.18 KB, patch)
2014-03-19 18:40 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 2014-03-19 18:40:03 UTC
- Fix build
- Support PLIST_FILES

Remove file:
pkg-plist
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2014-03-19 18:41:06 UTC
Responsible Changed
From-To: freebsd-ports-bugs->miwi

miwi@ wants this submitter's PRs (via the GNATS Auto Assign Tool)
Comment 2 Martin Wilke freebsd_committer freebsd_triage 2014-05-17 10:51:13 UTC
State Changed
From-To: open->closed

Committed. Thanks!
Comment 3 dfilter service freebsd_committer freebsd_triage 2014-05-17 10:51:14 UTC
Author: miwi
Date: Sat May 17 09:51:11 2014
New Revision: 354303
URL: http://svnweb.freebsd.org/changeset/ports/354303
QAT: https://qat.redports.org/buildarchive/r354303/

Log:
  - Fix build
  - Support PLIST_FILES
  
  PR:		187746
  Submitted by:	Ports Fury

Deleted:
  head/math/nauty/pkg-plist
Modified:
  head/math/nauty/Makefile

Modified: head/math/nauty/Makefile
==============================================================================
--- head/math/nauty/Makefile	Sat May 17 09:49:51 2014	(r354302)
+++ head/math/nauty/Makefile	Sat May 17 09:51:11 2014	(r354303)
@@ -5,34 +5,37 @@ PORTNAME=	nauty
 PORTVERSION=	2.4r2
 CATEGORIES=	math
 MASTER_SITES=	http://cs.anu.edu.au/~bdm/nauty/
-DISTNAME=	${PORTNAME}24r2
+DISTNAME=	${PORTNAME}${PORTVERSION:S!.!!}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Brendan McKay's graph isomorphism tester
 
-WRKSRC=		${WRKDIR}/${PORTNAME}24r2
+USES=		gmake
+GNU_CONFIGURE=	yes
 MAKEFILE=	makefile
-USE_CSTD=	gnu89
-GNU_CONFIGURE=	YES
+
 PORTDOCS=	nug.pdf
+PLIST_FILES=	${PROGRAMS:S!^!bin/!}
+
+OPTIONS_DEFINE=	DOCS
+
+PROGRAMS=	NRswitchg addedgeg amtog biplabg catg complg copyg \
+		countg deledgeg directg dreadnaut dretog genbg geng \
+		genrang gentourng labelg listg multig newedgeg pickg \
+		planarg shortg showg
 
-NO_STAGE=	yes
 post-patch:
-	@${REINPLACE_CMD} -e 's|gcc|${CC}|; s|-O4 -march=i686|${CFLAGS}|' \
-		${WRKSRC}/${MAKEFILE}
+	@${REINPLACE_CMD} -e \
+		's|gcc|$${CC}| ; \
+		 s|-O4 -march=i686|$${CFLAGS}|' ${WRKSRC}/${MAKEFILE}
 
 do-install:
-	cd ${WRKSRC}; ${INSTALL_PROGRAM} dreadnaut copyg listg labelg dretog \
-		amtog geng complg shortg showg NRswitchg biplabg addedgeg \
-		deledgeg countg pickg genrang newedgeg catg genbg directg \
-		multig planarg gentourng ${PREFIX}/bin
-
-post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
+.for i in ${PROGRAMS}
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${i} ${STAGEDIR}${PREFIX}/bin)
+.endfor
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR})
 .endfor
-.endif
 
 .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"