pkgsrc-Bugs archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: pkg/51103: Updates for ski emulator



On Sat, May 14, 2016 at 10:45:01PM +0000, Mathew, Cherry G. wrote:
>  
>  Hi,
>  
>  Could you please post a full patch I could try ?
>  
>  Also, your mailhost doesn't accept email from mine - an alternative
>  email address would be functional to communicate (other than via
>  gnats).
>  
>  -- 
>  ~cherry
>  

Here is a full patch.  Also, I attempted to whitelist your zyx.in email
address, let me know if you still have issues.

Thanks!

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/ski/Makefile,v
retrieving revision 1.17
diff -b -u -r1.17 Makefile
--- Makefile	18 Aug 2015 07:31:07 -0000	1.17
+++ Makefile	14 May 2016 23:03:44 -0000
@@ -2,13 +2,17 @@
 #
 
 DISTNAME=	ski-1.3.2
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ski/}
 
 MAINTAINER=	cherry%zyx.in@localhost
 HOMEPAGE=	http://ski.sourceforge.net/
 COMMENT=	The ia64 instruction set simulator
+LICENSE=	gnu-gpl-v2
+
+.include "../../mk/bsd.prefs.mk"
+.include "options.mk"
 
 BUILD_DEPENDS+= libelf>=0.8.13:../../devel/libelf
 
@@ -22,14 +26,25 @@
 USE_LIBTOOL=	yes
 USE_NCURSES=	yes
  
+SUBST_CLASSES+=		xski-app
+SUBST_STAGE.xski-app=	pre-configure
+SUBST_MESSAGE.xski-app=	Fixing X11 Makefile.am app-default paths.
+SUBST_FILES.xski-app=	Makefile.am
+SUBST_SED.xski-app=	-e 's,/etc/X11/app-defaults,${PREFIX}/lib/X11/app-defaults,g'
+
+SUBST_CLASSES+=		ssx-app
+SUBST_STAGE.ssx-app=	post-patch
+SUBST_MESSAGE.ssx-app=	Fixing X11 ssX.c app-default paths.
+SUBST_FILES.ssx-app=	src/ssX.c
+SUBST_SED.ssx-app=	-e 's,XSKI_RESOURCE_FILE,${PREFIX}/lib/X11/app-defaults/XSki,g'
+
 pre-configure:
 #	cd  ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${SH} ./autogen.sh ${CONFIGURE_ARGS}
 	cd ${WRKSRC} && autoreconf -fi -I macros
 
 post-install:
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/X11/app-defaults
-	${INSTALL_DATA} ${WRKSRC}/src/XSki \
-			${DESTDIR}${PREFIX}/lib/X11/app-defaults/XSki
+	${INSTALL_DATA} ${WRKSRC}/doc/manual/SkiManualMasterDoc.pdf \
+			${DESTDIR}${PREFIX}/share/ski
 
 .include "../../devel/gperf/buildlink3.mk"
 .include "../../devel/libelf/buildlink3.mk"



Home | Main Index | Thread Index | Old Index