Bug 187511 - devel/allegro - fails to install (patch)
Summary: devel/allegro - fails to install (patch)
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: Rusmir Dusko
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-03-12 21:00 UTC by Volodymyr Kostyrko
Modified: 2014-03-12 23:10 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 Volodymyr Kostyrko 2014-03-12 21:00:00 UTC
Hi again! Long time no see...

Another patch to make this installable without DOCS/EXAMPLES:

Index: Makefile
===================================================================
--- Makefile    (revision 347977)
+++ Makefile    (working copy)
@@ -91,8 +91,13 @@
                ${WRKSRC}/CMakeLists.txt
 .endif

+.if ${PORT_OPTIONS:MEXAMPLES} || ${PORT_OPTIONS:MDOCS}
 post-install:
+.endif
+.if ${PORT_OPTIONS:MDOCS}
        @${INSTALL_MAN} ${WRKSRC}/docs/man/*.3 ${STAGEDIR}${MAN3PREFIX}/man/man3/
+.endif
+.if ${PORT_OPTIONS:MEXAMPLES}
        @(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
 .for l in ex12bit ex3buf ex3d exaccel exalpha exbitmap exblend excamera excolmap \
        exconfig excustom exdata exdbuf exexedat exfixed exflame exflip exfont \
@@ -102,6 +107,7 @@
        extrans2 extruec exunicod exupdate exxfade exzbuf
        ${STRIP_CMD} ${STAGEDIR}${EXAMPLESDIR}/${l}
 .endfor
+.endif

 .if ${PORT_OPTIONS:MDEMOS} && ${PORT_OPTIONS:MEXAMPLES}
        @(cd ${WRKSRC} && ${COPYTREE_SHARE} demos ${STAGEDIR}${EXAMPLESDIR})
Comment 1 Edwin Groothuis freebsd_committer 2014-03-12 21:00:09 UTC
Responsible Changed
From-To: freebsd-ports-bugs->nemysis

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 Rusmir Dusko freebsd_committer 2014-03-12 22:40:34 UTC
Please look

http://wiki.freebsd.org/pkgng

Thanks for your report.

I do not accept full your changes:

Never set MAN as Option, MAN is not DOCS and must always be installed


+.if ${PORT_OPTIONS:MDOCS}
@${INSTALL_MAN} ${WRKSRC}/docs/man/*.3 ${STAGEDIR}${MAN3PREFIX}/man/man3/
+.endif


With pgkng not needed more to be used, only in special examples as here

.if ${PORT_OPTIONS:MDOCS}
...
.endif


.if ${PORT_OPTIONS:MEXAMPLES}
...
.endif


Is not to set in one condition here

post-install:


You have not given a svn diff.

Next time use

svn co svn://svn.FreeBSD.org/ports/head /usr/ports

As Example

cd /usr/local/ports/cat

svn checkout svn://svn.freebsd.org/ports/head/cat/port port

Make there changes and use to make diff

svn diff > ../port.diff


--=20
Best regards,
Rusmir Du=C5=A1ko
Comment 3 Rusmir Dusko freebsd_committer 2014-03-12 22:41:28 UTC
State Changed
From-To: open->closed

Committed, with minor changes. Thanks!
Comment 4 dfilter service freebsd_committer 2014-03-12 23:07:01 UTC
Author: nemysis
Date: Wed Mar 12 23:06:53 2014
New Revision: 348014
URL: http://svnweb.freebsd.org/changeset/ports/348014
QAT: https://qat.redports.org/buildarchive/r348014/

Log:
  - Fix build, without EXAMPLES Option and change pkg-plist
  
  PR:		ports/187511
  Submitted by:	Volodymyr Kostyrko <arcade@b1t.name>

Modified:
  head/devel/allegro/Makefile
  head/devel/allegro/pkg-plist

Modified: head/devel/allegro/Makefile
==============================================================================
--- head/devel/allegro/Makefile	Wed Mar 12 23:00:09 2014	(r348013)
+++ head/devel/allegro/Makefile	Wed Mar 12 23:06:53 2014	(r348014)
@@ -93,15 +93,18 @@ post-patch:
 
 post-install:
 	@${INSTALL_MAN} ${WRKSRC}/docs/man/*.3 ${STAGEDIR}${MAN3PREFIX}/man/man3/
+
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
-.for l in ex12bit ex3buf ex3d exaccel exalpha exbitmap exblend excamera excolmap \
+. for l in ex12bit ex3buf ex3d exaccel exalpha exbitmap exblend excamera excolmap \
 	exconfig excustom exdata exdbuf exexedat exfixed exflame exflip exfont \
 	exgui exhello exjoy exkeys exlights exmem exmidi exmouse expackf expal \
 	expat exquat exrgbhsv exrotscl exsample exscale exscn3d exscroll exshade \
 	exspline exsprite exstars exstream exswitch exsyscur extimer extrans \
 	extrans2 extruec exunicod exupdate exxfade exzbuf
 	${STRIP_CMD} ${STAGEDIR}${EXAMPLESDIR}/${l}
-.endfor
+. endfor
+.endif
 
 .if ${PORT_OPTIONS:MDEMOS} && ${PORT_OPTIONS:MEXAMPLES}
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} demos ${STAGEDIR}${EXAMPLESDIR})

Modified: head/devel/allegro/pkg-plist
==============================================================================
--- head/devel/allegro/pkg-plist	Wed Mar 12 23:00:09 2014	(r348013)
+++ head/devel/allegro/pkg-plist	Wed Mar 12 23:06:53 2014	(r348014)
@@ -8,9 +8,9 @@ bin/grabber
 bin/pack
 bin/pat2dat
 bin/rgbmap
-%%DEMOS%%bin/shooter
-%%DEMOS%%bin/skater
-%%DEMOS%%bin/skater_agl
+%%DEMOS%%%%EXAMPLES%%bin/shooter
+%%DEMOS%%%%EXAMPLES%%bin/skater
+%%DEMOS%%%%EXAMPLES%%bin/skater_agl
 bin/textconv
 include/alleggl.h
 include/allegro.h
@@ -1059,8 +1059,8 @@ man/man3/voice_sweep_pan.3.gz
 man/man3/vsync.3.gz
 man/man3/xor_mode.3.gz
 man/man3/xwin_set_window_name.3.gz
-%%DEMOS%%share/pixmaps/shooter.png
-%%DEMOS%%share/pixmaps/skater.png
+%%DEMOS%%%%EXAMPLES%%share/pixmaps/shooter.png
+%%DEMOS%%%%EXAMPLES%%share/pixmaps/skater.png
 @dirrm lib/allegro/%%SHLIB_VER%%
 @dirrm lib/allegro
 @dirrm include/allegrogl/GLext
_______________________________________________
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"