diff options
| author | jkim <jkim@FreeBSD.org> | 2011-07-13 03:21:03 +0800 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2011-07-13 03:21:03 +0800 |
| commit | 5f09fa95f87d87619e3f7b3d633fe9592144c3ab (patch) | |
| tree | 6d9e8b4122de7b31b6399fd7e9da5ffa60841989 /java/icedtea-web/Makefile | |
| parent | 39ad34ceb904d1c75d66829ba86425e29e017c5e (diff) | |
| download | freebsd-ports-gnome-5f09fa95f87d87619e3f7b3d633fe9592144c3ab.tar.gz freebsd-ports-gnome-5f09fa95f87d87619e3f7b3d633fe9592144c3ab.tar.zst freebsd-ports-gnome-5f09fa95f87d87619e3f7b3d633fe9592144c3ab.zip | |
Fix various build and installation issues.
- Replace various Linuxisms in Makefile with little more portable code.
Remove now unnecessary build dependency of sysutils/coreutils.
- Install launcher wrappers with INSTALL_SCRIPT[1].
- Rename javaws launcher to itweb-javaws throughout. This conflicts with
a symlink created by java/javavmwrapper[2].
PR: ports/158826 [1]
Reported by: glewis [2]
Diffstat (limited to 'java/icedtea-web/Makefile')
| -rw-r--r-- | java/icedtea-web/Makefile | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/java/icedtea-web/Makefile b/java/icedtea-web/Makefile index 3de447567383..b7851b8f786c 100644 --- a/java/icedtea-web/Makefile +++ b/java/icedtea-web/Makefile @@ -24,20 +24,18 @@ OPTIONS= PLUGIN "Enable the browser plug-in" on \ RHINO "Add support for Proxy Auto Config files" off \ TEST "Add support for running regression test" off -MAN1= javaws.1 -PLIST_FILES= bin/itweb-settings bin/javaws \ +MAN1= itweb-javaws.1 +PLIST_FILES= bin/itweb-javaws bin/itweb-settings \ + share/applications/itweb-javaws.desktop \ share/applications/itweb-settings.desktop \ - share/applications/javaws.desktop \ - share/pixmaps/javaws.png + share/pixmaps/itweb-javaws.png PORTDATA= about.jar about.jnlp netx.jar PORTDOCS= netx BUILD_DEPENDS+= ${LOCALBASE}/bin/zip:${PORTSDIR}/archivers/zip \ - ${LOCALBASE}/bin/pkg-config:${PORTSDIR}/devel/pkg-config \ - ${LOCALBASE}/bin/ginstall:${PORTSDIR}/sysutils/coreutils + ${LOCALBASE}/bin/pkg-config:${PORTSDIR}/devel/pkg-config CONFIGURE_ARGS+=--with-ecj=no --with-jdk-home="${JAVA_HOME}" -CONFIGURE_ENV+= INSTALL_DATA="${LOCALBASE}/bin/ginstall" .include <bsd.port.pre.mk> @@ -87,10 +85,13 @@ pre-extract: post-install: ${MKDIR} ${DESKTOPDIR} - ${INSTALL_DATA} ${WRKSRC}/itweb-settings.desktop \ - ${WRKSRC}/javaws.desktop ${DESKTOPDIR} + ${REINPLACE_CMD} -e 's|^Icon=javaws|Icon=itweb-javaws|' \ + ${WRKSRC}/itweb-javaws.desktop ${WRKSRC}/itweb-settings.desktop + ${INSTALL_DATA} ${WRKSRC}/itweb-javaws.desktop \ + ${WRKSRC}/itweb-settings.desktop ${DESKTOPDIR} ${MKDIR} ${PREFIX}/share/pixmaps - ${INSTALL_DATA} ${WRKSRC}/javaws.png ${PREFIX}/share/pixmaps + ${INSTALL_DATA} ${WRKSRC}/javaws.png \ + ${PREFIX}/share/pixmaps/itweb-javaws.png .if defined(WITH_TEST) @${ECHO_MSG} @${ECHO_MSG} "Run \"make test\" to execute regression test." |