diff options
| -rw-r--r-- | x11/x3270/Makefile | 15 | ||||
| -rw-r--r-- | x11/x3270/PLIST | 9 | ||||
| -rw-r--r-- | x11/x3270/distinfo | 8 | ||||
| -rw-r--r-- | x11/x3270/options.mk | 18 |
4 files changed, 34 insertions, 16 deletions
diff --git a/x11/x3270/Makefile b/x11/x3270/Makefile index 11a57ac0026..084d89bfc39 100644 --- a/x11/x3270/Makefile +++ b/x11/x3270/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.46 2021/06/26 13:51:20 rhialto Exp $ +# $NetBSD: Makefile,v 1.47 2021/12/29 13:25:47 rhialto Exp $ -DISTNAME= suite3270-4.0ga14-src -PKGNAME= x3270-4.0ga14 +DISTNAME= suite3270-4.1ga11-src +PKGNAME= x3270-4.1ga11 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=x3270/} EXTRACT_SUFX= .tgz @@ -13,13 +13,12 @@ LICENSE= modified-bsd GNU_CONFIGURE= yes -WRKSRC= ${WRKDIR}/suite3270-4.0 +WRKSRC= ${WRKDIR}/suite3270-4.1 USE_TOOLS+= bdftopcf gmake FONTS_DIRS.x11+= ${PREFIX}/share/fonts/X11/misc CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} -CONFIGURE_ARGS+= --with-fontdir=${PREFIX}/share/fonts/X11/misc CONFIGURE_ARGS+= --enable-b3270 CONFIGURE_ARGS+= --enable-pr3287 CONFIGURE_ARGS+= --enable-s3270 @@ -32,6 +31,12 @@ EGDIR= ${PREFIX}/share/examples/x3270 CONF_FILES= ${EGDIR}/ibm_hosts ${PKG_SYSCONFDIR}/ibm_hosts INSTALLATION_DIRS+= ${EGDIR} +SUBST_CLASSES+= share +SUBST_STAGE.share= pre-configure +SUBST_MESSAGE.share= Fixing /usr/share +SUBST_FILES.share= x3270/Makefile.obj.in +SUBST_SED.share+= -e 's;/usr/share;${PREFIX}/share;' + post-install: ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/ibm_hosts ${DESTDIR}/${EGDIR} if [ "${PLIST.tcl}" = "yes" ]; then \ diff --git a/x11/x3270/PLIST b/x11/x3270/PLIST index 2cd965139c5..540d9214b5d 100644 --- a/x11/x3270/PLIST +++ b/x11/x3270/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2021/01/01 13:05:22 rhialto Exp $ +@comment $NetBSD: PLIST,v 1.11 2021/12/29 13:25:47 rhialto Exp $ bin/b3270 ${PLIST.curses}bin/c3270 bin/pr3287 @@ -12,10 +12,10 @@ ${PLIST.curses}man/man1/c3270.1 man/man1/pr3287.1 man/man1/s3270.1 ${PLIST.tcl}man/man1/tcl3270.1 -${PLIST.x11}man/man1/x3270-script.1 ${PLIST.x11}man/man1/x3270.1 ${PLIST.x11}man/man1/x3270if.1 man/man5/ibm_hosts.5 +${PLIST.gtk}share/applications/x3270.desktop ${PLIST.tcl}share/examples/x3270/cms_cmd.tcl3270 share/examples/x3270/ibm_hosts ${PLIST.x11}share/fonts/X11/misc/3270-12.pcf.gz @@ -35,3 +35,8 @@ ${PLIST.x11}share/fonts/X11/misc/3270gt32.pcf.gz ${PLIST.x11}share/fonts/X11/misc/3270gt32b.pcf.gz ${PLIST.x11}share/fonts/X11/misc/3270gt8.pcf.gz ${PLIST.x11}share/fonts/X11/misc/3270h.pcf.gz +${PLIST.gtk}share/icons/hicolor/192x192/apps/x3270.png +${PLIST.gtk}share/icons/hicolor/256x256/apps/x3270.png +${PLIST.gtk}share/icons/hicolor/48x48/apps/x3270.png +${PLIST.gtk}share/icons/hicolor/512x512/apps/x3270.png +${PLIST.gtk}share/icons/hicolor/96x96/apps/x3270.png diff --git a/x11/x3270/distinfo b/x11/x3270/distinfo index 48455f7c986..5d29fb88d51 100644 --- a/x11/x3270/distinfo +++ b/x11/x3270/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.20 2021/10/26 11:34:33 nia Exp $ +$NetBSD: distinfo,v 1.21 2021/12/29 13:25:47 rhialto Exp $ -BLAKE2s (suite3270-4.0ga14-src.tgz) = 10b8672ed9a197c15363b8022b50f1926dfcc44cf526880b2c3ae0cbc48228be -SHA512 (suite3270-4.0ga14-src.tgz) = 0c76946420bbc2a483ab321658350a5b3e1c03e66b65e99f1a8cb4d350e07eedd44f9f24671244f3c374f512e5d211304785b8e44ae125265ce8f71f0a9dcc65 -Size (suite3270-4.0ga14-src.tgz) = 3318277 bytes +BLAKE2s (suite3270-4.1ga11-src.tgz) = 73136a3953dd24c6656a8dd7fc38a8fee0994f3c5cf636928471e4e6b0da3c42 +SHA512 (suite3270-4.1ga11-src.tgz) = 1032a03bf9b24ae9d0e9b9f8b6a7c6319dff2c77db14257f22eb05b52b308e9134d8c6a5080178081f7ba893936e2eca63bb0e04b804d4a7df2507a5b3f625fb +Size (suite3270-4.1ga11-src.tgz) = 3900772 bytes diff --git a/x11/x3270/options.mk b/x11/x3270/options.mk index 9dd8b930012..23b2474dc71 100644 --- a/x11/x3270/options.mk +++ b/x11/x3270/options.mk @@ -1,9 +1,9 @@ -# $NetBSD: options.mk,v 1.3 2021/06/26 13:51:20 rhialto Exp $ +# $NetBSD: options.mk,v 1.4 2021/12/29 13:25:47 rhialto Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.x3270 -PKG_SUPPORTED_OPTIONS= curses x11 tcl -PKG_SUGGESTED_OPTIONS+= curses x11 -PLIST_VARS= curses x11 tcl +PKG_SUPPORTED_OPTIONS= curses x11 tcl gtk +PKG_SUGGESTED_OPTIONS+= curses x11 gtk +PLIST_VARS= curses x11 tcl gtk .include "../../mk/bsd.options.mk" @@ -23,7 +23,15 @@ CONFIGURE_ARGS+= --enable-x3270 CONFIGURE_ARGS+= --enable-x3270if PLIST.x11= yes REPLACE_BASH+= x3270/x3270a.in -USE_TOOLS+= bash:run +USE_TOOLS+= bash:run + +. if !empty(PKG_OPTIONS:Mgtk) +. include "../../graphics/hicolor-icon-theme/buildlink3.mk" +ICON_THEMES= yes +INSTALLATION_DIRS+= ${PREFIX}/share/applications +INSTALLATION_DIRS+= ${PREFIX}/share/icons/hicolor +PLIST.gtk= yes +. endif .else CONFIGURE_ARGS+= --disable-x3270 CONFIGURE_ARGS+= --disable-x3270if |