cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- re-enable applications link in PATH

Browse Source 
- re-enable the use of plmerge ; this is much needed for proper work
reported by Sebastian Reitenbach <sebastia at l00-bugdead-prods dot de>, thanks!
This commit is contained in:
ajacoutot 2007-12-10 16:22:36 +00:00
parent 98b562b6a0
commit beb10cb013
3 changed files with 3 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
x11/gnustep/make/Makefile
View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.8 2007/11/25 16:16:28 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.9 2007/12/10 16:22:36 ajacoutot Exp $
PKG_ARCH= *
COMMENT= GNUstep makefile package
DISTNAME= gnustep-make-2.0.2
PKGNAME= ${DISTNAME}p0
CATEGORIES= devel x11/gnustep
HOMEPAGE= http://www.gnustep.org/

24
x11/gnustep/make/patches/patch-Instance_application_make
View File

@ -1,24 +0,0 @@
$OpenBSD: patch-Instance_application_make,v 1.1.1.1 2007/05/29 03:00:34 ajacoutot Exp $
--- Instance/application.make.orig Fri Mar 16 06:23:56 2007
+++ Instance/application.make Mon May 28 20:17:38 2007
@@ -277,9 +277,6 @@ $(APP_INFO_PLIST_FILE): $(GNUSTEP_STAMP_DEPEND) $(GNUS
fi; \
echo " NSPrincipalClass = \"$(PRINCIPAL_CLASS)\";"; \
echo "}") >$@$(END_ECHO)
- -$(ECHO_NOTHING)if [ -r "$(GNUSTEP_INSTANCE)Info.plist" ]; then \
- plmerge $@ "$(GNUSTEP_INSTANCE)Info.plist"; \
- fi$(END_ECHO)
endif
$(APP_DIR)/Resources/$(GNUSTEP_INSTANCE).desktop: \
@@ -338,9 +335,7 @@ ifeq ($(HAS_LN_S), yes)
internal-install-app-wrapper: $(GNUSTEP_TOOLS)/$(GNUSTEP_TARGET_LDIR)
$(ECHO_NOTHING)\
cd $(GNUSTEP_TOOLS)/$(GNUSTEP_TARGET_LDIR); \
- $(RM_LN_S) $(GNUSTEP_INSTANCE); \
- $(LN_S) `$(REL_PATH_SCRIPT) $(GNUSTEP_TOOLS)/$(GNUSTEP_TARGET_LDIR) $(APP_INSTALL_DIR)/$(APP_FILE_NAME)` \
- $(GNUSTEP_INSTANCE)$(END_ECHO)
+ $(RM_LN_S) $(GNUSTEP_INSTANCE)$(END_ECHO)
else
# Not sure that we can use relative paths with 'exec' in a portable
# way. We want the stuff to work with DESTDIR, so in this case we use

22
x11/gnustep/make/patches/patch-Instance_bundle_make
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-Instance_bundle_make,v 1.1.1.1 2007/05/29 03:00:34 ajacoutot Exp $
$OpenBSD: patch-Instance_bundle_make,v 1.2 2007/12/10 16:22:37 ajacoutot Exp $
--- Instance/bundle.make.orig Tue May 15 17:29:03 2007
+++ Instance/bundle.make Tue May 15 17:29:09 2007
@@ -83,6 +83,8 @@ ALL_BUNDLE_LIBS = \
@ -10,23 +10,3 @@ $OpenBSD: patch-Instance_bundle_make,v 1.1.1.1 2007/05/29 03:00:34 ajacoutot Exp
endif
endif # OBJ_FILES_TO_LINK
@@ -268,9 +270,6 @@ $(BUNDLE_DIR)/Resources/Info-gnustep.plist: $(BUNDLE_D
echo " NSMainNibFile = \"$(MAIN_MODEL_FILE)\";"; \
echo " NSPrincipalClass = \"$(PRINCIPAL_CLASS)\";"; \
echo "}") >$@$(END_ECHO)
- $(ECHO_NOTHING)if [ -r "$(GNUSTEP_INSTANCE)Info.plist" ]; then \
- plmerge $@ $(GNUSTEP_INSTANCE)Info.plist; \
- fi$(END_ECHO)
else # following code for when no object file is built
# GNUstep bundles
$(BUNDLE_DIR)/Resources/Info-gnustep.plist: $(BUNDLE_DIR)/Resources \
@@ -279,9 +278,6 @@ $(BUNDLE_DIR)/Resources/Info-gnustep.plist: $(BUNDLE_D
$(ECHO_CREATING)(echo "{"; echo ' NOTE = "Automatically generated, do not edit!";'; \
echo " NSMainNibFile = \"$(MAIN_MODEL_FILE)\";"; \
echo "}") >$@$(END_ECHO)
- $(ECHO_NOTHING)if [ -r "$(GNUSTEP_INSTANCE)Info.plist" ]; then \
- plmerge $@ $(GNUSTEP_INSTANCE)Info.plist; \
- fi$(END_ECHO)
endif
endif # FOUNDATION_LIB != apple