Bug 192234 - lang/squeak support STAGE and unbreak
Summary: lang/squeak support STAGE and unbreak
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: Alexey Dokuchaev
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-07-29 06:45 UTC by Takeshi MUTOH
Modified: 2014-07-30 11:46 UTC (History)
2 users (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Takeshi MUTOH 2014-07-29 06:45:56 UTC
Support STAGE, and use new LIB_DEPENDS syntax.

Fix:
Please apply patch below:

diff -ru /usr/ports/lang/squeak/Makefile squeak/Makefile
--- /usr/ports/lang/squeak/Makefile	2014-03-02 06:23:14.000000000 +0900
+++ squeak/Makefile	2014-07-25 13:49:25.787774241 +0900
@@ -25,12 +25,12 @@
 BUILD_DEPENDS=		${UNZIP_CMD}:${PORTSDIR}/archivers/unzip \
 			cmake:${PORTSDIR}/devel/cmake \
 			v4l_compat>=1.0.20120501:${PORTSDIR}/multimedia/v4l_compat
-LIB_DEPENDS=		audio:${PORTSDIR}/audio/nas \
-			ffi:${PORTSDIR}/devel/libffi \
-			asound:${PORTSDIR}/audio/alsa-lib \
-			pulse-simple:${PORTSDIR}/audio/pulseaudio \
-			gstreamer:${PORTSDIR}/multimedia/gstreamer \
-			v4l2:${PORTSDIR}/multimedia/libv4l
+LIB_DEPENDS=		libaudio.so:${PORTSDIR}/audio/nas \
+			libffi.so:${PORTSDIR}/devel/libffi \
+			libasound.so:${PORTSDIR}/audio/alsa-lib \
+			libpulse-simple.so:${PORTSDIR}/audio/pulseaudio \
+			libgstreamer-0.10.so:${PORTSDIR}/multimedia/gstreamer \
+			libv4l2.so:${PORTSDIR}/multimedia/libv4l
 
 ##################################################
 VM_VERSION=		${PORTVERSION}.${SVNVERSION}
@@ -40,7 +40,6 @@
 SQUEAK_LIB_DIR=		${PORTVERSION}-${SVNVERSION}
 USES=			pkgconfig
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 ##################################################
@@ -56,7 +55,7 @@
 SHAREMODE=		644
 
 # shared Libaries are to be installed in:
-LDCONFIG_DIRS=		${PREFIX}/lib/squeak/${VM_VERSION}
+LDCONFIG_DIRS=		${STAGEDIR}${PREFIX}/lib/squeak/${VM_VERSION}
 
 IMAGES=		Squeak${IMAGEVERSION}/Squeak${IMAGEVERSION}.image \
 		Squeak${IMAGEVERSION}/Squeak${IMAGEVERSION}.changes
@@ -92,11 +91,15 @@
 	@${MKDIR} ${CONFIGURE_WRKSRC}
 
 ##################################################
+pre-install:
+	${MKDIR} -p ${STAGEDIR}${PREFIX}/lib/squeak/${SQUEAK_LIB_DIR}/
+
+##################################################
 post-install:
-	${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/${SQUEAK_SRC}.gz > ${WRKDIR}/${SQUEAK_SRC} && ${INSTALL_DATA} ${WRKDIR}/${SQUEAK_SRC} ${PREFIX}/lib/squeak/${SQUEAK_LIB_DIR}/
+	${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/${SQUEAK_SRC}.gz > ${WRKDIR}/${SQUEAK_SRC} && ${INSTALL_DATA} ${WRKDIR}/${SQUEAK_SRC} ${STAGEDIR}${PREFIX}/lib/squeak/${SQUEAK_LIB_DIR}/
 	(cd ${DISTDIR}/${DIST_SUBDIR} && ${UNZIP_CMD} -u Squeak${IMAGEVERSION}.zip -d ${WRKDIR})
 .for f in ${IMAGES}
-	(cd ${WRKDIR} && ${INSTALL_DATA} ${f} ${PREFIX}/lib/squeak/)
+	(cd ${WRKDIR} && ${INSTALL_DATA} ${f} ${STAGEDIR}${PREFIX}/lib/squeak/)
 .endfor
 	@${CAT} ${PKGMESSAGE}
 
diff -ru /usr/ports/lang/squeak/pkg-plist squeak/pkg-plist
--- /usr/ports/lang/squeak/pkg-plist	2014-01-23 00:16:56.000000000 +0900
+++ squeak/pkg-plist	2014-07-25 10:07:08.653693588 +0900
@@ -31,5 +31,6 @@
 lib/squeak/%%SQUEAK_LIB_DIR%%/SqueakV41.sources
 lib/squeak/Squeak4.3.changes
 lib/squeak/Squeak4.3.image
+man/man1/squeak.1.gz
 @dirrm lib/squeak/%%SQUEAK_LIB_DIR%%
 @dirrm lib/squeak
Comment 1 William Grzybowski freebsd_committer 2014-07-29 12:30:20 UTC
Could you please attach the patch again as a file?

You have to use the web interface as opposed to send-pr.
Comment 2 commit-hook freebsd_committer 2014-07-30 08:03:49 UTC
A commit references this bug:

Author: danfe
Date: Wed Jul 30 08:03:10 UTC 2014
New revision: 363453
URL: http://svnweb.freebsd.org/changeset/ports/363453

Log:
  - Stagify, sort the knobs, remove excessive whitespace and bogus comments
  - Employ USE_GSTREAMER knob instead of depending on libgstreamer.so
  - Use consistent separators in patch files (this also deuglifies them)

  PR:	192234

Changes:
  head/lang/squeak/Makefile
  head/lang/squeak/files/patch-unix__plugins_CameraPlugin_sqCamera-linux.c
  head/lang/squeak/files/patch-unix__plugins_ScratchPlugin_unixSeriaPort2Ops.c
  head/lang/squeak/files/patch-unix__plugins_SerialPlugin_sqUnixSerial.c
  head/lang/squeak/files/patch-unix__plugins_UUIDPlugin_config.cmake
  head/lang/squeak/files/patch-unix__vm__build.cmake
  head/lang/squeak/files/patch-unix_plugins_CameraPlugin_sqCamera-linux.c
  head/lang/squeak/files/patch-unix_plugins_ScratchPlugin_unixSeriaPort2Ops.c
  head/lang/squeak/files/patch-unix_plugins_SerialPlugin_sqUnixSerial.c
  head/lang/squeak/files/patch-unix_plugins_UUIDPlugin_config.cmake
  head/lang/squeak/files/patch-unix_vm_build.cmake
  head/lang/squeak/pkg-plist
Comment 3 Alexey Dokuchaev freebsd_committer 2014-07-30 08:11:00 UTC
I've attempted to stagify this port and cleanup it a bit, but there is more work remains: investigate the problem behind "don't USE_ZIP as this breaks EXTRACT_CMD"; port also has CMake in BUILD_DEPENDS, perhaps it can be converted to USES=cmake?  It would also be nice to make PulseAudio plugin and dependency optional: PA is a heavy port, usually not enabled by default in other ports, and many people hate it.