svn commit: r516795 - head/lang/smalltalk

[Alexey Dokuchaev]

Author: danfe
Date: Tue Nov  5 13:32:03 2019
New Revision: 516795
URL: https://svnweb.freebsd.org/changeset/ports/516795

Log:
  - Unbreak packaging when SDL option is disabled [*]
  - Amend LIB_DEPENDS, USE_{XORG,GL} lists per `stage-qa' report
  - Link against libltdl.so:devel/libltdl to fix the following:
      ...
      configure: WARNING: using included copy of libltdl
      configure: WARNING: this is deprecated and will go away
      configure: WARNING: it is suggested to install libltdl
  
  PR:	240070 [*]

Modified:
  head/lang/smalltalk/Makefile
  head/lang/smalltalk/pkg-plist

Modified: head/lang/smalltalk/Makefile
==============================================================================
--- head/lang/smalltalk/Makefile	Tue Nov  5 12:34:42 2019	(r516794)
+++ head/lang/smalltalk/Makefile	Tue Nov  5 13:32:03 2019	(r516795)
@@ -17,19 +17,16 @@ BROKEN_sparc64=		Fails to install
 BUILD_DEPENDS=	zip:archivers/zip \
 		gawk:lang/gawk
 LIB_DEPENDS=	libgdbm.so:databases/gdbm \
-		libcairo.so:graphics/cairo
+		libffi.so:devel/libffi \
+		libltdl.so:devel/libltdl \
+		libcairo.so:graphics/cairo \
+		libexpat.so:textproc/expat2
 
-OPTIONS_DEFINE=	PGSQL SDL
-OPTIONS_DEFAULT=PGSQL SDL
-OPTIONS_SUB=	yes
-PGSQL_USES=	pgsql
-SDL_USE=	SDL=image,mixer,sdl,sound,ttf
-
-USES=		gmake iconv libtool localbase makeinfo pathfix pkgconfig \
-		shebangfix sqlite tar:xz
+USES=		gl gmake gnome iconv libtool makeinfo pathfix pkgconfig \
+		readline shebangfix sqlite tar:xz xorg
+USE_GL=		gl glu glut
 USE_GNOME=	pango
-USE_XORG=	ice xi xmu
-USE_GL=		gl glut
+USE_XORG=	ice sm x11 xi xmu
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_prog_EMACS=no ac_cv_prog_AWK=gawk
 CONFIGURE_ARGS=	--enable-generational-gc=no \
@@ -47,6 +44,13 @@ PLIST_SUB=	VERSION="${PORTVERSION}"
 PORTDATA=	*
 
 INFO=		gst gst-base gst-libs
+
+OPTIONS_DEFINE=	PGSQL SDL
+OPTIONS_DEFAULT=	PGSQL SDL
+OPTIONS_SUB=	yes
+
+PGSQL_USES=	pgsql
+SDL_USE=	SDL=image,mixer,sdl,sound,ttf
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/ia64-\*-\* /&|amd64-*-* /' \

Modified: head/lang/smalltalk/pkg-plist
==============================================================================
--- head/lang/smalltalk/pkg-plist	Tue Nov  5 12:34:42 2019	(r516794)
+++ head/lang/smalltalk/pkg-plist	Tue Nov  5 13:32:03 2019	(r516795)
@@ -40,9 +40,9 @@ lib/smalltalk/i18n.so
 lib/smalltalk/iconv-%%VERSION%%.so
 lib/smalltalk/iconv.a
 lib/smalltalk/iconv.so
-lib/smalltalk/sdl-%%VERSION%%.so
-lib/smalltalk/sdl.a
-lib/smalltalk/sdl.so
+%%SDL%%lib/smalltalk/sdl-%%VERSION%%.so
+%%SDL%%lib/smalltalk/sdl.a
+%%SDL%%lib/smalltalk/sdl.so
 lib/smalltalk/zlib-%%VERSION%%.so
 lib/smalltalk/zlib.a
 lib/smalltalk/zlib.so