Bug 156476 - [MAINTAINER] Fix port: graphics/libprojectm installs broken pkgconfig file
Summary: [MAINTAINER] Fix port: graphics/libprojectm installs broken pkgconfig file
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: Joseph S. Atkinson
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-04-18 18:10 UTC by Chris Rees
Modified: 2011-04-23 03:40 UTC (History)
0 users

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Chris Rees 2011-04-18 18:10:10 UTC
	libprojectM installs a pkgconfig file with a blank libdir= line.

Fix: - Fix blank line output in pkgconfig file
	- Remove make variable from middle of pkgconfig path

	Submitted by: Chris Rees (utisoft_at_gmail.com) (maintainer)



-- 
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.--gcPcCAaAVufMoIQdZTlABcKhmuEEpp87OnMC93etspKWARaC
Content-Type: text/plain; name="libprojectm-fix-pkgconfig.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="libprojectm-fix-pkgconfig.diff"

Index: Makefile
===================================================================
RCS file: /exports/cvsroot-freebsd/ports/graphics/libprojectm/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- Makefile	14 Feb 2011 03:27:15 -0000	1.1
+++ Makefile	18 Apr 2011 16:21:10 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	libprojectM
 PORTVERSION=	2.0.1
+PORTREVISION=	1
 CATEGORIES=	graphics audio
 MASTER_SITES=	SF/${PORTNAME:L:S/lib//}/${PORTVERSION}/
 DISTNAME=	${PORTNAME:S/lib//}-${DISTVERSION}-Source
@@ -27,11 +28,15 @@
 post-patch:
 # Install config.inp.sample instead of overwriting user's file.
 # Needs to be specific enough not to rename config.inp.in too!
+# Also correct pkgconfig destination dir -- fiddly
 	@${REINPLACE_CMD} -e 's/config.inp\([\" ]\)/config.inp.sample\1/' \
-			-e 's#/pkgconfig#data/pkgconfig#' \
+			-e 's#\(/lib\)[^}]*}\(/pkgconfig\)#\1data\2#' \
 		${WRKSRC}/CMakeLists.txt
 	@${REINPLACE_CMD} -e 's#/usr/X11R6#${LOCALBASE}#' \
 		${WRKSRC}/cmake/FindFreetype2.cmake
+# Fix empty libdir in pkgconfig file to stop vlc complaining
+	@${REINPLACE_CMD} -e 's#^\(libdir=\).*#\1${PREFIX}/lib#' \
+		${WRKSRC}/${PORTNAME}.pc.in
 
 post-install:
 	@if [ ! -f ${PREFIX}/share/projectM/config.inp ]; then \
How-To-Repeat: 	Try to compile multimedia/vlc with projectM support (not yet in tree). Build fails with error about spaces between -L and -lprojectM
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2011-04-18 18:10:23 UTC
Class Changed
From-To: sw-bug->maintainer-update

Fix category (submitter is maintainer) (via the GNATS Auto Assign Tool)
Comment 2 Joseph S. Atkinson freebsd_committer freebsd_triage 2011-04-22 08:43:41 UTC
Responsible Changed
From-To: freebsd-ports-bugs->jsa

I'll take it.
Comment 3 dfilter service freebsd_committer freebsd_triage 2011-04-23 03:34:19 UTC
jsa         2011-04-23 02:34:05 UTC

  FreeBSD ports repository

  Modified files:
    graphics/libprojectm Makefile 
  Log:
  Fix pkgconfig.
  
  PR:             ports/156476
  Submitted by:   Chris Rees <utisoft@gmail.com> (maintainer)
  Approved by:    wxs (mentor)
  
  Revision  Changes    Path
  1.2       +6 -1      ports/graphics/libprojectm/Makefile
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
Comment 4 Joseph S. Atkinson freebsd_committer freebsd_triage 2011-04-23 03:34:40 UTC
State Changed
From-To: open->closed

Committed. Thanks!