Date: Sun, 29 Sep 2013 18:07:05 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r328722 - in head/graphics: amide volpack volpack/files Message-ID: <201309291807.r8TI758r055850@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Sun Sep 29 18:07:04 2013 New Revision: 328722 URL: http://svnweb.freebsd.org/changeset/ports/328722 Log: - Support staging - Use options helpers - Convert to new LIB_DEPENDS format Modified: head/graphics/amide/Makefile head/graphics/amide/pkg-plist (contents, props changed) head/graphics/volpack/Makefile head/graphics/volpack/files/patch-Makefile.in (contents, props changed) Modified: head/graphics/amide/Makefile ============================================================================== --- head/graphics/amide/Makefile Sun Sep 29 17:56:04 2013 (r328721) +++ head/graphics/amide/Makefile Sun Sep 29 18:07:04 2013 (r328722) @@ -21,9 +21,7 @@ USES= gettext gmake pkgconfig USE_GNOME= gtk20 libgnomecanvas libgnomeui libxml2 INSTALLS_OMF= yes -MAN1= amide.1 - -OPTIONS_DEFINE= CODEC DCMTK GSL VOLPACK XMEDCON +OPTIONS_DEFINE= CODEC DCMTK GSL NLS VOLPACK XMEDCON OPTIONS_SINGLE= CODEC OPTIONS_SINGLE_CODEC= FFMPEG FAME OPTIONS_DEFAULT= CODEC DCMTK FFMPEG GSL VOLPACK XMEDCON @@ -36,57 +34,20 @@ GSL_DESC= Use gsl VOLPACK_DESC= Use volpack XMEDCON_DESC= Use xmedcon -NO_STAGE= yes -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MDCMTK} -LIB_DEPENDS+= dcmdata:${PORTSDIR}/devel/dcmtk -CONFIGURE_ARGS+= --enable-libdcmdata -.else -CONFIGURE_ARGS+= --disable-libdcmdata -.endif - -.if ${PORT_OPTIONS:MFAME} -LIB_DEPENDS+= fame:${PORTSDIR}/multimedia/libfame -CONFIGURE_ARGS+= --enable-libfame -.else -CONFIGURE_ARGS+= --disable-libfame -.endif - -.if ${PORT_OPTIONS:MFFMPEG} -LIB_DEPENDS+= avcodec:${PORTSDIR}/multimedia/ffmpeg -CONFIGURE_ARGS+= --enable-ffmpeg -.else -CONFIGURE_ARGS+= --disable-ffmpeg -.endif - -.if ${PORT_OPTIONS:MGSL} -LIB_DEPENDS+= gsl:${PORTSDIR}/math/gsl -CONFIGURE_ARGS+= --enable-libgsl -.else -CONFIGURE_ARGS+= --disable-libgsl -.endif - -.if ${PORT_OPTIONS:MVOLPACK} -BUILD_DEPENDS+= ${LOCALBASE}/lib/libvolpack.a:${PORTSDIR}/graphics/volpack -CONFIGURE_ARGS+= --enable-libvolpack -.else -CONFIGURE_ARGS+= --disable-libvolpack -.endif - -.if ${PORT_OPTIONS:MXMEDCON} -LIB_DEPENDS+= mdc:${PORTSDIR}/graphics/xmedcon -CONFIGURE_ARGS+= --enable-libmdc -.else -CONFIGURE_ARGS+= --disable-libmdc -.endif - -.if ${PORT_OPTIONS:MNLS} -PLIST_SUB+= NLS='' -.else -CONFIGURE_ARGS+= --disable-nls -PLIST_SUB+= NLS='@comment ' -.endif +OPTIONS_SUB= yes +DCMTK_CONFIGURE_ENABLE= libdcmdata +DCMTK_LIB_DEPENDS= libdcmdata.so:${PORTSDIR}/devel/dcmtk +FAME_CONFIGURE_ENABLE= libfame +FAME_LIB_DEPENDS= libfame.so:${PORTSDIR}/multimedia/libfame +FFMPEG_CONFIGURE_ENABLE= ffmpeg +FFMPEG_LIB_DEPENDS= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg +GSL_CONFIGURE_ENABLE= libgsl +GSL_LIB_DEPENDS= libgsl.so:${PORTSDIR}/math/gsl +VOLPACK_CONFIGURE_ENABLE= libvolpack +VOLPACK_BUILD_DEPENDS= ${LOCALBASE}/lib/libvolpack.a:${PORTSDIR}/graphics/volpack +XMEDCON_CONFIGURE_ENABLE= libmdc +XMEDCON_LIB_DEPENDS= libmdc.so:${PORTSDIR}/graphics/xmedcon +NLS_CONFIGURE_ENABLE= nls post-patch: @${TOUCH} ${WRKSRC}/aclocal.m4 ${WRKSRC}/Makefile.in \ Modified: head/graphics/amide/pkg-plist ============================================================================== --- head/graphics/amide/pkg-plist Sun Sep 29 17:56:04 2013 (r328721) +++ head/graphics/amide/pkg-plist Sun Sep 29 18:07:04 2013 (r328722) @@ -1,4 +1,5 @@ bin/amide +man/man1/amide.1.gz share/applications/amide.desktop share/gnome/help/amide/C/amide.xml share/gnome/help/amide/C/figures/amide_main_window.png Modified: head/graphics/volpack/Makefile ============================================================================== --- head/graphics/volpack/Makefile Sun Sep 29 17:56:04 2013 (r328721) +++ head/graphics/volpack/Makefile Sun Sep 29 18:07:04 2013 (r328722) @@ -15,31 +15,34 @@ LICENSE= BSD GNU_CONFIGURE= yes MAKE_ARGS= MFLAGS="" # required for bmake(1) and -jX builds -PLIST_FILES= lib/libvolpack.a \ - include/volpack.h +PLIST_FILES= lib/libvolpack.a include/volpack.h \ + man/man3/volpack-BruteForce.3.gz man/man3/volpack-Callback.3.gz \ + man/man3/volpack-ClientData.3.gz man/man3/volpack-ClsfyScalar.3.gz \ + man/man3/volpack-ClsfyScan.3.gz man/man3/volpack-ClsfyTable.3.gz \ + man/man3/volpack-ClsfyVolume.3.gz man/man3/volpack-Context.3.gz \ + man/man3/volpack-CurrentMatrix.3.gz man/man3/volpack-Debug.3.gz \ + man/man3/volpack-DepthCueing.3.gz man/man3/volpack-Enable.3.gz \ + man/man3/volpack-Error.3.gz man/man3/volpack-Extract.3.gz \ + man/man3/volpack-Filter.3.gz man/man3/volpack-FilterTab.3.gz \ + man/man3/volpack-Get.3.gz man/man3/volpack-GetImage.3.gz \ + man/man3/volpack-GetLight.3.gz man/man3/volpack-GetMaterial.3.gz \ + man/man3/volpack-GetMatrix.3.gz man/man3/volpack-Identity.3.gz \ + man/man3/volpack-Image.3.gz man/man3/volpack-Light.3.gz \ + man/man3/volpack-LinAlgebra.3.gz man/man3/volpack-Load.3.gz \ + man/man3/volpack-LookupShader.3.gz man/man3/volpack-Material.3.gz \ + man/man3/volpack-MinMaxOctree.3.gz man/man3/volpack-MultMatrix.3.gz \ + man/man3/volpack-NormalIndex.3.gz man/man3/volpack-OctreeMask.3.gz \ + man/man3/volpack-Ramp.3.gz man/man3/volpack-RawVoxels.3.gz \ + man/man3/volpack-Render.3.gz man/man3/volpack-Resample.3.gz \ + man/man3/volpack-Rotate.3.gz man/man3/volpack-Scale.3.gz \ + man/man3/volpack-ScanNormals.3.gz man/man3/volpack-Set.3.gz \ + man/man3/volpack-SetMatrix.3.gz man/man3/volpack-ShadeTable.3.gz \ + man/man3/volpack-Shadow.3.gz man/man3/volpack-Store.3.gz \ + man/man3/volpack-Timer.3.gz man/man3/volpack-TracePixel.3.gz \ + man/man3/volpack-Translate.3.gz man/man3/volpack-Transpose.3.gz \ + man/man3/volpack-VolPack.3.gz man/man3/volpack-VolumeNormals.3.gz \ + man/man3/volpack-VolumeSize.3.gz man/man3/volpack-VoxelField.3.gz \ + man/man3/volpack-VoxelSize.3.gz man/man3/volpack-Window.3.gz \ + man/man3/volpack-WindowPHIGS.3.gz -MAN3= volpack-BruteForce.3 volpack-Callback.3 \ - volpack-ClientData.3 volpack-ClsfyScalar.3 \ - volpack-ClsfyScan.3 volpack-ClsfyTable.3 \ - volpack-ClsfyVolume.3 volpack-Context.3 \ - volpack-CurrentMatrix.3 volpack-Debug.3 \ - volpack-DepthCueing.3 volpack-Enable.3 volpack-Error.3 \ - volpack-Extract.3 volpack-Filter.3 volpack-FilterTab.3 \ - volpack-Get.3 volpack-GetImage.3 volpack-GetLight.3 \ - volpack-GetMaterial.3 volpack-GetMatrix.3 \ - volpack-Identity.3 volpack-Image.3 volpack-Light.3 \ - volpack-LinAlgebra.3 volpack-Load.3 volpack-LookupShader.3 \ - volpack-Material.3 volpack-MinMaxOctree.3 \ - volpack-MultMatrix.3 volpack-NormalIndex.3 \ - volpack-OctreeMask.3 volpack-Ramp.3 volpack-RawVoxels.3 \ - volpack-Render.3 volpack-Resample.3 volpack-Rotate.3 \ - volpack-Scale.3 volpack-ScanNormals.3 volpack-Set.3 \ - volpack-SetMatrix.3 volpack-ShadeTable.3 volpack-Shadow.3 \ - volpack-Store.3 volpack-Timer.3 volpack-TracePixel.3 \ - volpack-Translate.3 volpack-Transpose.3 volpack-VolPack.3 \ - volpack-VolumeNormals.3 volpack-VolumeSize.3 \ - volpack-VoxelField.3 volpack-VoxelSize.3 volpack-Window.3 \ - volpack-WindowPHIGS.3 - -NO_STAGE= yes .include <bsd.port.mk> Modified: head/graphics/volpack/files/patch-Makefile.in ============================================================================== --- head/graphics/volpack/files/patch-Makefile.in Sun Sep 29 17:56:04 2013 (r328721) +++ head/graphics/volpack/files/patch-Makefile.in Sun Sep 29 18:07:04 2013 (r328722) @@ -1,5 +1,5 @@ --- Makefile.in.orig 1994-12-12 21:21:47.000000000 +0100 -+++ Makefile.in 2013-07-31 15:38:51.000000000 +0800 ++++ Makefile.in 2013-09-24 09:49:45.698631771 +0200 @@ -175,25 +175,13 @@ cc -o makeopts makeopts.c @@ -29,6 +29,43 @@ examples: libvolpack.a cd examples; make +@@ -201,7 +189,7 @@ + install: install-binaries install-include install-man + + install-binaries: libvolpack.a +- @for i in $(LIB_DIR) ; \ ++ @for i in $(DESTDIR)$(LIB_DIR) ; \ + do \ + if [ ! -d $$i ] ; then \ + echo "Making directory $$i"; \ +@@ -211,11 +199,11 @@ + fi; \ + done; + @echo "Installing libvolpack.a" +- @$(INSTALL_DATA) libvolpack.a $(LIB_DIR) +- @$(RANLIB) $(LIB_DIR)/libvolpack.a ++ @$(INSTALL_DATA) libvolpack.a $(DESTDIR)$(LIB_DIR) ++ @$(RANLIB) $(DESTDIR)$(LIB_DIR)/libvolpack.a + + install-include: +- @for i in $(INCLUDE_DIR) ; \ ++ @for i in $(DESTDIR)$(INCLUDE_DIR) ; \ + do \ + if [ ! -d $$i ] ; then \ + echo "Making directory $$i"; \ +@@ -225,10 +213,10 @@ + fi; \ + done; + @echo "Installing volpack.h" +- @$(INSTALL_DATA) volpack.h $(INCLUDE_DIR) ++ @$(INSTALL_DATA) volpack.h $(DESTDIR)$(INCLUDE_DIR) + + install-man: +- @for i in $(MAN_DIR) $(MAN3_DIR) ; \ ++ @for i in $(DESTDIR)$(MAN_DIR) $(DESTDIR)$(MAN3_DIR) ; \ + do \ + if [ ! -d $$i ] ; then \ + echo "Making directory $$i"; \ @@ -239,10 +227,9 @@ done; @cd $(SRC_DIR)/man/src; for i in *.3; \ @@ -38,8 +75,8 @@ - cp $$i $(MAN3_DIR); \ - chmod 444 $(MAN3_DIR)/$$i; \ + echo "Installing man/src/volpack-$$i"; \ -+ cp $$i $(MAN3_DIR)/volpack-$$i; \ -+ chmod 444 $(MAN3_DIR)/volpack-$$i; \ ++ cp $$i $(DESTDIR)$(MAN3_DIR)/volpack-$$i; \ ++ chmod 444 $(DESTDIR)$(MAN3_DIR)/volpack-$$i; \ done; Makefile: $(SRC_DIR)/Makefile.in
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309291807.r8TI758r055850>